Skip to content

NSString API name change #332

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 2 commits into from
Apr 27, 2016
Merged

NSString API name change #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c25804a
Change API names for NSString to match Darwin version
mbvreddy Apr 18, 2016
e3f3ff0
change Swift.Void to Void to make it consistent with other API declar…
mbvreddy Apr 18, 2016
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
20 changes: 10 additions & 10 deletions Foundation/NSCFString.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ internal class _NSCFString : NSMutableString {
return CFStringGetLength(unsafeBitCast(self, to: CFString.self))
}

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

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

Expand Down Expand Up @@ -100,11 +100,11 @@ internal final class _NSCFConstantString : _NSCFString {
return Int(_length)
}

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

override func replaceCharactersInRange(_ range: NSRange, withString aString: String) {
override func replaceCharacters(in range: NSRange, with aString: String) {
fatalError()
}

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

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

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

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


Expand Down Expand Up @@ -193,23 +193,23 @@ internal func _CFSwiftStringIsUnicode(_ str: AnyObject) -> Bool {
}

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

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

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

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

internal func _CFSwiftStringAppend(_ str: AnyObject, appended: AnyObject) {
(str as! NSMutableString).appendString((appended as! NSString)._swiftObject)
(str as! NSMutableString).append((appended as! NSString)._swiftObject)
}

internal func _CFSwiftStringAppendCharacters(_ str: AnyObject, chars: UnsafePointer<UniChar>, length: CFIndex) {
Expand Down
2 changes: 1 addition & 1 deletion Foundation/NSConcreteValue.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ internal class NSConcreteValue : NSValue {
}

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

override var classForCoder: AnyClass {
Expand Down
2 changes: 1 addition & 1 deletion Foundation/NSFileManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ internal class NSPathDirectoryEnumerator: NSDirectoryEnumerator {
guard let url = o as? NSURL else {
return nil
}
let path = url.path!.stringByReplacingOccurrencesOfString(baseURL.path!+"/", withString: "")
let path = url.path!.replacingOccurrences(of: baseURL.path!+"/", with: "")
return NSString(string: path)
}

Expand Down
2 changes: 1 addition & 1 deletion Foundation/NSJSONSerialization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public class NSJSONSerialization : NSObject {
pretty: opt.contains(.PrettyPrinted),
writer: { (str: String?) in
if let str = str {
result.append(str.bridge().cStringUsingEncoding(NSUTF8StringEncoding)!, length: str.lengthOfBytesUsingEncoding(NSUTF8StringEncoding))
result.append(str.bridge().cString(using: NSUTF8StringEncoding)!, length: str.lengthOfBytes(using: NSUTF8StringEncoding))
}
}
)
Expand Down
2 changes: 1 addition & 1 deletion Foundation/NSKeyedUnarchiver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ public class NSKeyedUnarchiver : NSCoder {
break
case .CharPtr:
if let ns = decodeObject() as? NSString {
let string = ns.UTF8String! // XXX leaky
let string = ns.utf8String! // XXX leaky
unsafeBitCast(addr, to: UnsafeMutablePointer<UnsafePointer<Int8>>.self).pointee = string
}
break
Expand Down
4 changes: 2 additions & 2 deletions Foundation/NSObjCRuntime.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ private let _SwiftFoundationModuleName = "Foundation"
*/
public func NSStringFromClass(_ aClass: AnyClass) -> String {
let aClassName = String(reflecting: aClass).bridge()
let components = aClassName.componentsSeparatedByString(".")
let components = aClassName.components(separatedBy: ".")

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

switch components.count {
case 1:
Expand Down
2 changes: 1 addition & 1 deletion Foundation/NSPathUtilities.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ public extension NSString {
if caseSensetive {
return { $0 != nil && $0!.hasPrefix(thePrefix) }
} else {
return { $0 != nil && $0!.bridge().rangeOfString(thePrefix, options: .CaseInsensitiveSearch).location == 0 }
return { $0 != nil && $0!.bridge().range(of: thePrefix, options: .caseInsensitiveSearch).location == 0 }
}
}

Expand Down
14 changes: 7 additions & 7 deletions Foundation/NSRegularExpression.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ extension NSRegularExpression {
let replacement = replacementString(for: result, in: string._swiftObject, offset: offset, template: templ)
currentRnage.location += offset

string.replaceCharactersInRange(currentRnage, withString: replacement)
string.replaceCharacters(in: currentRnage, with: replacement)
offset += replacement.length - currentRnage.length
count += 1
}
Expand All @@ -262,7 +262,7 @@ extension NSRegularExpression {
static let characterSet = NSCharacterSet(charactersInString: "\\$")
}
let template = templ._nsObject
var range = template.rangeOfCharacterFromSet(once.characterSet)
var range = template.rangeOfCharacter(from: once.characterSet)
if range.length > 0 {
var numberOfDigits = 1
var orderOfMagnitude = 10
Expand All @@ -274,16 +274,16 @@ extension NSRegularExpression {
orderOfMagnitude *= 10
}
while range.length > 0 {
var c = str.characterAtIndex(range.location)
var c = str.character(at: range.location)
if c == unichar(unicodeScalarLiteral: "\\") {
str.deleteCharactersInRange(range)
str.deleteCharacters(in: range)
length -= range.length
range.length = 1
} else if c == unichar(unicodeScalarLiteral: "$") {
var groupNumber: Int = NSNotFound
var idx = NSMaxRange(range)
while idx < length && idx < NSMaxRange(range) + numberOfDigits {
c = str.characterAtIndex(idx)
c = str.character(at: idx)
if c < unichar(unicodeScalarLiteral: "0") || c > unichar(unicodeScalarLiteral: "9") {
break
}
Expand Down Expand Up @@ -311,7 +311,7 @@ extension NSRegularExpression {
let max = start.advanced(by: substringRange.location + substringRange.length)
substring = String(string.utf16[min..<max])
}
str.replaceCharactersInRange(rangeToReplace, withString: substring)
str.replaceCharacters(in: rangeToReplace, with: substring)

length += substringRange.length - rangeToReplace.length
range.length = substringRange.length
Expand All @@ -320,7 +320,7 @@ extension NSRegularExpression {
if NSMaxRange(range) > length {
break
}
range = str.rangeOfCharacterFromSet(once.characterSet, options: [], range: NSMakeRange(NSMaxRange(range), length - NSMaxRange(range)))
range = str.rangeOfCharacter(from: once.characterSet, options: [], range: NSMakeRange(NSMaxRange(range), length - NSMaxRange(range)))
}
return str._swiftObject
}
Expand Down
34 changes: 17 additions & 17 deletions Foundation/NSScanner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ extension NSScanner {
var stringLoc = scanLocation
let stringLen = string.length
if let invSet = invertedSkipSet {
let range = string._nsObject.rangeOfCharacterFromSet(invSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
let range = string._nsObject.rangeOfCharacter(from: invSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
stringLoc = range.length > 0 ? range.location : stringLen
}
return stringLoc == stringLen
Expand Down Expand Up @@ -627,17 +627,17 @@ extension NSScanner {
let str = self.string._bridgeToObject()
var stringLoc = scanLocation
let stringLen = str.length
let options: NSStringCompareOptions = [caseSensitive ? [] : NSStringCompareOptions.CaseInsensitiveSearch, NSStringCompareOptions.AnchoredSearch]
let options: NSStringCompareOptions = [caseSensitive ? [] : NSStringCompareOptions.caseInsensitiveSearch, NSStringCompareOptions.anchoredSearch]

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

let range = str.rangeOfString(searchString, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
let range = str.range(of: searchString, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
if range.length > 0 {
/* ??? Is the range below simply range? 99.9% of the time, and perhaps even 100% of the time... Hmm... */
let res = str.substringWithRange(NSMakeRange(stringLoc, range.location + range.length - stringLoc))
let res = str.substring(with: NSMakeRange(stringLoc, range.location + range.length - stringLoc))
scanLocation = range.location + range.length
return res
}
Expand All @@ -648,17 +648,17 @@ extension NSScanner {
let str = self.string._bridgeToObject()
var stringLoc = scanLocation
let stringLen = str.length
let options: NSStringCompareOptions = caseSensitive ? [] : NSStringCompareOptions.CaseInsensitiveSearch
let options: NSStringCompareOptions = caseSensitive ? [] : NSStringCompareOptions.caseInsensitiveSearch
if let invSkipSet = charactersToBeSkipped?.invertedSet {
let range = str.rangeOfCharacterFromSet(invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
let range = str.rangeOfCharacter(from: invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
stringLoc = range.length > 0 ? range.location : stringLen
}
var range = str.rangeOfCharacterFromSet(set.invertedSet, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
var range = str.rangeOfCharacter(from: set.invertedSet, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
if range.length == 0 {
range.location = stringLen
}
if stringLoc != range.location {
let res = str.substringWithRange(NSMakeRange(stringLoc, range.location - stringLoc))
let res = str.substring(with: NSMakeRange(stringLoc, range.location - stringLoc))
scanLocation = range.location
return res
}
Expand All @@ -669,17 +669,17 @@ extension NSScanner {
let str = self.string._bridgeToObject()
var stringLoc = scanLocation
let stringLen = str.length
let options: NSStringCompareOptions = caseSensitive ? [] : NSStringCompareOptions.CaseInsensitiveSearch
let options: NSStringCompareOptions = caseSensitive ? [] : NSStringCompareOptions.caseInsensitiveSearch
if let invSkipSet = charactersToBeSkipped?.invertedSet {
let range = str.rangeOfCharacterFromSet(invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
let range = str.rangeOfCharacter(from: invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
stringLoc = range.length > 0 ? range.location : stringLen
}
var range = str.rangeOfString(string, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
var range = str.range(of: string, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
if range.length == 0 {
range.location = stringLen
}
if stringLoc != range.location {
let res = str.substringWithRange(NSMakeRange(stringLoc, range.location - stringLoc))
let res = str.substring(with: NSMakeRange(stringLoc, range.location - stringLoc))
scanLocation = range.location
return res
}
Expand All @@ -690,17 +690,17 @@ extension NSScanner {
let str = self.string._bridgeToObject()
var stringLoc = scanLocation
let stringLen = str.length
let options: NSStringCompareOptions = caseSensitive ? [] : NSStringCompareOptions.CaseInsensitiveSearch
let options: NSStringCompareOptions = caseSensitive ? [] : NSStringCompareOptions.caseInsensitiveSearch
if let invSkipSet = charactersToBeSkipped?.invertedSet {
let range = str.rangeOfCharacterFromSet(invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
let range = str.rangeOfCharacter(from: invSkipSet, options: [], range: NSMakeRange(stringLoc, stringLen - stringLoc))
stringLoc = range.length > 0 ? range.location : stringLen
}
var range = str.rangeOfCharacterFromSet(set, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
var range = str.rangeOfCharacter(from: set, options: options, range: NSMakeRange(stringLoc, stringLen - stringLoc))
if range.length == 0 {
range.location = stringLen
}
if stringLoc != range.location {
let res = str.substringWithRange(NSMakeRange(stringLoc, range.location - stringLoc))
let res = str.substring(with: NSMakeRange(stringLoc, range.location - stringLoc))
scanLocation = range.location
return res
}
Expand Down
2 changes: 1 addition & 1 deletion Foundation/NSSpecialValue.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ internal class NSSpecialValue : NSValue {

override var objCType : UnsafePointer<Int8> {
let typeName = NSSpecialValue._objCTypeFromType(_value.dynamicType)
return typeName!.bridge().UTF8String! // leaky
return typeName!.bridge().utf8String! // leaky
}

override var classForCoder: AnyClass {
Expand Down
Loading