Skip to content

Commit c25804a

Browse files
mbvreddymbvreddy
committed
Change API names for NSString to match Darwin version
1 parent 5dcaadb commit c25804a

22 files changed

+399
-399
lines changed

‎Foundation/NSCFString.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ internal class _NSCFString : NSMutableString {
4444
return CFStringGetLength(unsafeBitCast(self, to: CFString.self))
4545
}
4646

47-
override func characterAtIndex(_ index: Int) -> unichar {
47+
override func character(at index: Int) -> unichar {
4848
return CFStringGetCharacterAtIndex(unsafeBitCast(self, to: CFString.self), index)
4949
}
5050

51-
override func replaceCharactersInRange(_ range: NSRange, withString aString: String) {
51+
override func replaceCharacters(in range: NSRange, with aString: String) {
5252
CFStringReplace(unsafeBitCast(self, to: CFMutableString.self), CFRangeMake(range.location, range.length), aString._cfObject)
5353
}
5454

@@ -100,11 +100,11 @@ internal final class _NSCFConstantString : _NSCFString {
100100
return Int(_length)
101101
}
102102

103-
override func characterAtIndex(_ index: Int) -> unichar {
103+
override func character(at index: Int) -> unichar {
104104
return unichar(_ptr[index])
105105
}
106106

107-
override func replaceCharactersInRange(_ range: NSRange, withString aString: String) {
107+
override func replaceCharacters(in range: NSRange, with aString: String) {
108108
fatalError()
109109
}
110110

@@ -118,7 +118,7 @@ internal func _CFSwiftStringGetLength(_ string: AnyObject) -> CFIndex {
118118
}
119119

120120
internal func _CFSwiftStringGetCharacterAtIndex(_ str: AnyObject, index: CFIndex) -> UniChar {
121-
return (str as! NSString).characterAtIndex(index)
121+
return (str as! NSString).character(at: index)
122122
}
123123

124124
internal func _CFSwiftStringGetCharacters(_ str: AnyObject, range: CFRange, buffer: UnsafeMutablePointer<UniChar>) {
@@ -164,7 +164,7 @@ internal func _CFSwiftStringGetBytes(_ str: AnyObject, encoding: CFStringEncodin
164164
}
165165

166166
internal func _CFSwiftStringCreateWithSubstring(_ str: AnyObject, range: CFRange) -> Unmanaged<AnyObject> {
167-
return Unmanaged<AnyObject>.passRetained((str as! NSString).substringWithRange(NSMakeRange(range.location, range.length))._nsObject)
167+
return Unmanaged<AnyObject>.passRetained((str as! NSString).substring(with: NSMakeRange(range.location, range.length))._nsObject)
168168
}
169169

170170

@@ -193,23 +193,23 @@ internal func _CFSwiftStringIsUnicode(_ str: AnyObject) -> Bool {
193193
}
194194

195195
internal func _CFSwiftStringInsert(_ str: AnyObject, index: CFIndex, inserted: AnyObject) {
196-
(str as! NSMutableString).insertString((inserted as! NSString)._swiftObject, atIndex: index)
196+
(str as! NSMutableString).insert((inserted as! NSString)._swiftObject, at: index)
197197
}
198198

199199
internal func _CFSwiftStringDelete(_ str: AnyObject, range: CFRange) {
200-
(str as! NSMutableString).deleteCharactersInRange(NSMakeRange(range.location, range.length))
200+
(str as! NSMutableString).deleteCharacters(in: NSMakeRange(range.location, range.length))
201201
}
202202

203203
internal func _CFSwiftStringReplace(_ str: AnyObject, range: CFRange, replacement: AnyObject) {
204-
(str as! NSMutableString).replaceCharactersInRange(NSMakeRange(range.location, range.length), withString: (replacement as! NSString)._swiftObject)
204+
(str as! NSMutableString).replaceCharacters(in: NSMakeRange(range.location, range.length), with: (replacement as! NSString)._swiftObject)
205205
}
206206

207207
internal func _CFSwiftStringReplaceAll(_ str: AnyObject, replacement: AnyObject) {
208208
(str as! NSMutableString).setString((replacement as! NSString)._swiftObject)
209209
}
210210

211211
internal func _CFSwiftStringAppend(_ str: AnyObject, appended: AnyObject) {
212-
(str as! NSMutableString).appendString((appended as! NSString)._swiftObject)
212+
(str as! NSMutableString).append((appended as! NSString)._swiftObject)
213213
}
214214

215215
internal func _CFSwiftStringAppendCharacters(_ str: AnyObject, chars: UnsafePointer<UniChar>, length: CFIndex) {

‎Foundation/NSConcreteValue.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ internal class NSConcreteValue : NSValue {
105105
}
106106

107107
override var objCType : UnsafePointer<Int8> {
108-
return NSString(self._typeInfo.name).UTF8String! // XXX leaky
108+
return NSString(self._typeInfo.name).utf8String! // XXX leaky
109109
}
110110

111111
override var classForCoder: AnyClass {

‎Foundation/NSFileManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ internal class NSPathDirectoryEnumerator: NSDirectoryEnumerator {
884884
guard let url = o as? NSURL else {
885885
return nil
886886
}
887-
let path = url.path!.stringByReplacingOccurrencesOfString(baseURL.path!+"/", withString: "")
887+
let path = url.path!.replacingOccurrences(of: baseURL.path!+"/", with: "")
888888
return NSString(string: path)
889889
}
890890

‎Foundation/NSJSONSerialization.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public class NSJSONSerialization : NSObject {
109109
pretty: opt.contains(.PrettyPrinted),
110110
writer: { (str: String?) in
111111
if let str = str {
112-
result.append(str.bridge().cStringUsingEncoding(NSUTF8StringEncoding)!, length: str.lengthOfBytesUsingEncoding(NSUTF8StringEncoding))
112+
result.append(str.bridge().cString(using: NSUTF8StringEncoding)!, length: str.lengthOfBytes(using: NSUTF8StringEncoding))
113113
}
114114
}
115115
)

‎Foundation/NSKeyedUnarchiver.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ public class NSKeyedUnarchiver : NSCoder {
828828
break
829829
case .CharPtr:
830830
if let ns = decodeObject() as? NSString {
831-
let string = ns.UTF8String! // XXX leaky
831+
let string = ns.utf8String! // XXX leaky
832832
unsafeBitCast(addr, to: UnsafeMutablePointer<UnsafePointer<Int8>>.self).pointee = string
833833
}
834834
break

‎Foundation/NSObjCRuntime.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ private let _SwiftFoundationModuleName = "Foundation"
249249
*/
250250
public func NSStringFromClass(_ aClass: AnyClass) -> String {
251251
let aClassName = String(reflecting: aClass).bridge()
252-
let components = aClassName.componentsSeparatedByString(".")
252+
let components = aClassName.components(separatedBy: ".")
253253

254254
guard components.count == 2 else {
255255
fatalError("NSStringFromClass: \(String(reflecting: aClass)) is not a top-level class")
@@ -272,7 +272,7 @@ public func NSStringFromClass(_ aClass: AnyClass) -> String {
272272
*/
273273
public func NSClassFromString(_ aClassName: String) -> AnyClass? {
274274
let aClassNameWithPrefix : String
275-
let components = aClassName.bridge().componentsSeparatedByString(".")
275+
let components = aClassName.bridge().components(separatedBy: ".")
276276

277277
switch components.count {
278278
case 1:

‎Foundation/NSPathUtilities.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ public extension NSString {
497497
if caseSensetive {
498498
return { $0 != nil && $0!.hasPrefix(thePrefix) }
499499
} else {
500-
return { $0 != nil && $0!.bridge().rangeOfString(thePrefix, options: .CaseInsensitiveSearch).location == 0 }
500+
return { $0 != nil && $0!.bridge().range(of: thePrefix, options: .caseInsensitiveSearch).location == 0 }
501501
}
502502
}
503503

‎Foundation/NSRegularExpression.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ extension NSRegularExpression {
247247
let replacement = replacementString(for: result, in: string._swiftObject, offset: offset, template: templ)
248248
currentRnage.location += offset
249249

250-
string.replaceCharactersInRange(currentRnage, withString: replacement)
250+
string.replaceCharacters(in: currentRnage, with: replacement)
251251
offset += replacement.length - currentRnage.length
252252
count += 1
253253
}
@@ -262,7 +262,7 @@ extension NSRegularExpression {
262262
static let characterSet = NSCharacterSet(charactersInString: "\\$")
263263
}
264264
let template = templ._nsObject
265-
var range = template.rangeOfCharacterFromSet(once.characterSet)
265+
var range = template.rangeOfCharacter(from: once.characterSet)
266266
if range.length > 0 {
267267
var numberOfDigits = 1
268268
var orderOfMagnitude = 10
@@ -274,16 +274,16 @@ extension NSRegularExpression {
274274
orderOfMagnitude *= 10
275275
}
276276
while range.length > 0 {
277-
var c = str.characterAtIndex(range.location)
277+
var c = str.character(at: range.location)
278278
if c == unichar(unicodeScalarLiteral: "\\") {
279-
str.deleteCharactersInRange(range)
279+
str.deleteCharacters(in: range)
280280
length -= range.length
281281
range.length = 1
282282
} else if c == unichar(unicodeScalarLiteral: "$") {
283283
var groupNumber: Int = NSNotFound
284284
var idx = NSMaxRange(range)
285285
while idx < length && idx < NSMaxRange(range) + numberOfDigits {
286-
c = str.characterAtIndex(idx)
286+
c = str.character(at: idx)
287287
if c < unichar(unicodeScalarLiteral: "0") || c > unichar(unicodeScalarLiteral: "9") {
288288
break
289289
}
@@ -311,7 +311,7 @@ extension NSRegularExpression {
311311
let max = start.advanced(by: substringRange.location + substringRange.length)
312312
substring = String(string.utf16[min..<max])
313313
}
314-
str.replaceCharactersInRange(rangeToReplace, withString: substring)
314+
str.replaceCharacters(in: rangeToReplace, with: substring)
315315

316316
length += substringRange.length - rangeToReplace.length
317317
range.length = substringRange.length
@@ -320,7 +320,7 @@ extension NSRegularExpression {
320320
if NSMaxRange(range) > length {
321321
break
322322
}
323-
range = str.rangeOfCharacterFromSet(once.characterSet, options: [], range: NSMakeRange(NSMaxRange(range), length - NSMaxRange(range)))
323+
range = str.rangeOfCharacter(from: once.characterSet, options: [], range: NSMakeRange(NSMaxRange(range), length - NSMaxRange(range)))
324324
}
325325
return str._swiftObject
326326
}

‎Foundation/NSScanner.swift

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ extension NSScanner {
497497
var stringLoc = scanLocation
498498
let stringLen = string.length
499499
if let invSet = invertedSkipSet {
500-
let range = string._nsObject.rangeOfCharacterFromSet(invSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
500+
let range = string._nsObject.rangeOfCharacter(from: invSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
501501
stringLoc = range.length > 0 ? range.location : stringLen
502502
}
503503
return stringLoc == stringLen
@@ -627,17 +627,17 @@ extension NSScanner {
627627
let str = self.string._bridgeToObject()
628628
var stringLoc = scanLocation
629629
let stringLen = str.length
630-
let options: NSStringCompareOptions = [caseSensitive ? [] : NSStringCompareOptions.CaseInsensitiveSearch, NSStringCompareOptions.AnchoredSearch]
630+
let options: NSStringCompareOptions = [caseSensitive ? [] : NSStringCompareOptions.caseInsensitiveSearch, NSStringCompareOptions.anchoredSearch]
631631

632632
if let invSkipSet = charactersToBeSkipped?.invertedSet {
633-
let range = str.rangeOfCharacterFromSet(invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
633+
let range = str.rangeOfCharacter(from: invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
634634
stringLoc = range.length > 0 ? range.location : stringLen
635635
}
636636

637-
let range = str.rangeOfString(searchString, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
637+
let range = str.range(of: searchString, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
638638
if range.length > 0 {
639639
/* ??? Is the range below simply range? 99.9% of the time, and perhaps even 100% of the time... Hmm... */
640-
let res = str.substringWithRange(NSMakeRange(stringLoc, range.location + range.length - stringLoc))
640+
let res = str.substring(with: NSMakeRange(stringLoc, range.location + range.length - stringLoc))
641641
scanLocation = range.location + range.length
642642
return res
643643
}
@@ -648,17 +648,17 @@ extension NSScanner {
648648
let str = self.string._bridgeToObject()
649649
var stringLoc = scanLocation
650650
let stringLen = str.length
651-
let options: NSStringCompareOptions = caseSensitive ? [] : NSStringCompareOptions.CaseInsensitiveSearch
651+
let options: NSStringCompareOptions = caseSensitive ? [] : NSStringCompareOptions.caseInsensitiveSearch
652652
if let invSkipSet = charactersToBeSkipped?.invertedSet {
653-
let range = str.rangeOfCharacterFromSet(invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
653+
let range = str.rangeOfCharacter(from: invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
654654
stringLoc = range.length > 0 ? range.location : stringLen
655655
}
656-
var range = str.rangeOfCharacterFromSet(set.invertedSet, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
656+
var range = str.rangeOfCharacter(from: set.invertedSet, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
657657
if range.length == 0 {
658658
range.location = stringLen
659659
}
660660
if stringLoc != range.location {
661-
let res = str.substringWithRange(NSMakeRange(stringLoc, range.location - stringLoc))
661+
let res = str.substring(with: NSMakeRange(stringLoc, range.location - stringLoc))
662662
scanLocation = range.location
663663
return res
664664
}
@@ -669,17 +669,17 @@ extension NSScanner {
669669
let str = self.string._bridgeToObject()
670670
var stringLoc = scanLocation
671671
let stringLen = str.length
672-
let options: NSStringCompareOptions = caseSensitive ? [] : NSStringCompareOptions.CaseInsensitiveSearch
672+
let options: NSStringCompareOptions = caseSensitive ? [] : NSStringCompareOptions.caseInsensitiveSearch
673673
if let invSkipSet = charactersToBeSkipped?.invertedSet {
674-
let range = str.rangeOfCharacterFromSet(invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
674+
let range = str.rangeOfCharacter(from: invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
675675
stringLoc = range.length > 0 ? range.location : stringLen
676676
}
677-
var range = str.rangeOfString(string, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
677+
var range = str.range(of: string, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
678678
if range.length == 0 {
679679
range.location = stringLen
680680
}
681681
if stringLoc != range.location {
682-
let res = str.substringWithRange(NSMakeRange(stringLoc, range.location - stringLoc))
682+
let res = str.substring(with: NSMakeRange(stringLoc, range.location - stringLoc))
683683
scanLocation = range.location
684684
return res
685685
}
@@ -690,17 +690,17 @@ extension NSScanner {
690690
let str = self.string._bridgeToObject()
691691
var stringLoc = scanLocation
692692
let stringLen = str.length
693-
let options: NSStringCompareOptions = caseSensitive ? [] : NSStringCompareOptions.CaseInsensitiveSearch
693+
let options: NSStringCompareOptions = caseSensitive ? [] : NSStringCompareOptions.caseInsensitiveSearch
694694
if let invSkipSet = charactersToBeSkipped?.invertedSet {
695-
let range = str.rangeOfCharacterFromSet(invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
695+
let range = str.rangeOfCharacter(from: invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
696696
stringLoc = range.length > 0 ? range.location : stringLen
697697
}
698-
var range = str.rangeOfCharacterFromSet(set, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
698+
var range = str.rangeOfCharacter(from: set, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
699699
if range.length == 0 {
700700
range.location = stringLen
701701
}
702702
if stringLoc != range.location {
703-
let res = str.substringWithRange(NSMakeRange(stringLoc, range.location - stringLoc))
703+
let res = str.substring(with: NSMakeRange(stringLoc, range.location - stringLoc))
704704
scanLocation = range.location
705705
return res
706706
}

‎Foundation/NSSpecialValue.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ internal class NSSpecialValue : NSValue {
121121

122122
override var objCType : UnsafePointer<Int8> {
123123
let typeName = NSSpecialValue._objCTypeFromType(_value.dynamicType)
124-
return typeName!.bridge().UTF8String! // leaky
124+
return typeName!.bridge().utf8String! // leaky
125125
}
126126

127127
override var classForCoder: AnyClass {

0 commit comments

Comments
 (0)