Skip to content

Added CVarArg support to NSString and String #2821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 3, 2020
Merged

Added CVarArg support to NSString and String #2821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e039ff
Added CVarArg support to NSString and String
Molanda Jun 9, 2020
0cf72bc
Implemented _CVarArgObject protocol to retain the NSString
Molanda Jun 11, 2020
2260aef
_CVarArgObject is currently only available on platforms without ObjC …
Molanda Sep 12, 2020
b7c4b8c
Return a pointer using AnyObject instead of CFString
Molanda Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions Sources/Foundation/NSString.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,3 +1644,24 @@ extension NSString : _StructTypeBridgeable {
return _StructType._unconditionallyBridgeFromObjectiveC(self)
}
}

extension NSString : CVarArg {
@inlinable // c-abi
public var _cVarArgEncoding: [Int] {
return _encodeBitsAsWords(unsafeBitCast(self, to: AnyObject.self))
}
}

#if !_runtime(_ObjC)
extension String : CVarArg, _CVarArgObject {
@inlinable // c-abi
public var _cVarArgObject: CVarArg {
return NSString(string: self)
}

@inlinable // c-abi
public var _cVarArgEncoding: [Int] {
fatalError("_cVarArgEncoding must be called on NSString instead")
}
}
#endif
10 changes: 10 additions & 0 deletions Tests/Foundation/Tests/TestNSString.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,15 @@ class TestNSString: LoopbackServerTest {
}
}

func test_initializeWithFormat4() {
let argument: [CVarArg] = ["One", "Two", "Three"]
withVaList(argument) {
pointer in
let string = NSString(format: "Testing %@ %@ %@", arguments: pointer)
XCTAssertEqual(string, "Testing One Two Three")
}
}

func test_appendingPathComponent() {
do {
let path: NSString = "/tmp"
Expand Down Expand Up @@ -1677,6 +1686,7 @@ class TestNSString: LoopbackServerTest {
("test_initializeWithFormat", test_initializeWithFormat),
("test_initializeWithFormat2", test_initializeWithFormat2),
("test_initializeWithFormat3", test_initializeWithFormat3),
("test_initializeWithFormat4", test_initializeWithFormat4),
("test_appendingPathComponent", test_appendingPathComponent),
("test_deletingLastPathComponent", test_deletingLastPathComponent),
("test_getCString_simple", test_getCString_simple),
Expand Down