Add a conversion to/from CFRange and NSRange that handles not found

Author: phausler

Foundation/NSRange.swift

@@ -7,6 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
+import CoreFoundation
 
 public struct _NSRange {
     public var location: Int
@@ -20,6 +21,18 @@ public struct _NSRange {
         self.location = location
         self.length = length
     }
+    
+    internal init(_ range: CFRange) {
+        location = range.location == kCFNotFound ? NSNotFound : range.location
+        length = range.length
+    }
+}
+
+extension CFRange {
+    internal init(_ range: NSRange) {
+        location = range.location == NSNotFound ? kCFNotFound : range.location
+        length = range.length
+    }
 }
 
 extension _NSRange {

Foundation/NSString.swift

@@ -380,9 +380,9 @@ extension NSString {
     public func compare(string: String, options mask: NSStringCompareOptions, range compareRange: NSRange, locale: AnyObject?) -> NSComparisonResult {
         var res: CFComparisonResult
         if let loc = locale {
-            res = CFStringCompareWithOptionsAndLocale(_cfObject, string._cfObject, CFRangeMake(compareRange.location, compareRange.length), mask._cfValue(true), (loc as! NSLocale)._cfObject)
+            res = CFStringCompareWithOptionsAndLocale(_cfObject, string._cfObject, CFRange(compareRange), mask._cfValue(true), (loc as! NSLocale)._cfObject)
         } else {
-            res = CFStringCompareWithOptionsAndLocale(_cfObject, string._cfObject, CFRangeMake(compareRange.location, compareRange.length), mask._cfValue(true), nil)
+            res = CFStringCompareWithOptionsAndLocale(_cfObject, string._cfObject, CFRange(compareRange), mask._cfValue(true), nil)
         }
         return NSComparisonResult._fromCF(res)
     }
@@ -520,9 +520,9 @@ extension NSString {
         var result = CFRange()
         let res = withUnsafeMutablePointer(&result) { (rangep: UnsafeMutablePointer<CFRange>) -> Bool in
             if let loc = locale {
-                return CFStringFindWithOptionsAndLocale(_cfObject, searchString._cfObject, CFRangeMake(searchRange.location, searchRange.length), mask._cfValue(true), loc._cfObject, rangep)
+                return CFStringFindWithOptionsAndLocale(_cfObject, searchString._cfObject, CFRange(searchRange), mask._cfValue(true), loc._cfObject, rangep)
             } else {
-                return CFStringFindWithOptionsAndLocale(_cfObject, searchString._cfObject, CFRangeMake(searchRange.location, searchRange.length), mask._cfValue(true), nil, rangep)
+                return CFStringFindWithOptionsAndLocale(_cfObject, searchString._cfObject, CFRange(searchRange), mask._cfValue(true), nil, rangep)
             }
         }
         if res {
@@ -547,7 +547,7 @@ extension NSString {
 
         var result = CFRange()
         let res = withUnsafeMutablePointer(&result) { (rangep: UnsafeMutablePointer<CFRange>) -> Bool in
-            return CFStringFindCharacterFromSet(_cfObject, searchSet._cfObject, CFRangeMake(searchRange.location, searchRange.length), mask._cfValue(), rangep)
+            return CFStringFindCharacterFromSet(_cfObject, searchSet._cfObject, CFRange(searchRange), mask._cfValue(), rangep)
         }
         if res {
             return NSMakeRange(result.location, result.length)
@@ -1361,11 +1361,11 @@ extension NSMutableString {
         }
 
 
-        if let findResults = CFStringCreateArrayWithFindResults(kCFAllocatorSystemDefault, _cfObject, target._cfObject, CFRangeMake(searchRange.location, searchRange.length), options._cfValue(true)) {
+        if let findResults = CFStringCreateArrayWithFindResults(kCFAllocatorSystemDefault, _cfObject, target._cfObject, CFRange(searchRange), options._cfValue(true)) {
             let numOccurrences = CFArrayGetCount(findResults)
             for cnt in 0..<numOccurrences {
                 let range = UnsafePointer<CFRange>(CFArrayGetValueAtIndex(findResults, backwards ? cnt : numOccurrences - cnt - 1))
-                replaceCharactersInRange(NSMakeRange(range.memory.location, range.memory.length), withString: replacement)
+                replaceCharactersInRange(NSRange(range.memory), withString: replacement)
             }
             return numOccurrences
         } else {

Foundation/NSURL.swift

@@ -701,40 +701,36 @@ public class NSURLComponents : NSObject, NSCopying {
 
     /* These properties return the character range of a component in the URL string returned by -[NSURLComponents string]. If the component does not exist in the NSURLComponents object, {NSNotFound, 0} is returned. Note: Zero length components are legal. For example, the URL string "scheme://:@/?#" has a zero length user, password, host, query and fragment; the URL strings "scheme:" and "" both have a zero length path.
     */
-    private final func _convertRange(r : CFRange) -> NSRange {
-        return NSMakeRange(r.location == kCFNotFound ? NSNotFound : r.location, r.length)
-    }
-    
     public var rangeOfScheme: NSRange {
-        return _convertRange(_CFURLComponentsGetRangeOfScheme(_components))
+        return NSRange(_CFURLComponentsGetRangeOfScheme(_components))
     }
 
     public var rangeOfUser: NSRange {
-        return _convertRange(_CFURLComponentsGetRangeOfUser(_components))
+        return NSRange(_CFURLComponentsGetRangeOfUser(_components))
     }
 
     public var rangeOfPassword: NSRange {
-        return _convertRange(_CFURLComponentsGetRangeOfPassword(_components))
+        return NSRange(_CFURLComponentsGetRangeOfPassword(_components))
     }
 
     public var rangeOfHost: NSRange {
-        return _convertRange(_CFURLComponentsGetRangeOfHost(_components))
+        return NSRange(_CFURLComponentsGetRangeOfHost(_components))
     }
 
     public var rangeOfPort: NSRange {
-        return _convertRange(_CFURLComponentsGetRangeOfPort(_components))
+        return NSRange(_CFURLComponentsGetRangeOfPort(_components))
     }
 
     public var rangeOfPath: NSRange {
-        return _convertRange(_CFURLComponentsGetRangeOfPath(_components))
+        return NSRange(_CFURLComponentsGetRangeOfPath(_components))
     }
 
     public var rangeOfQuery: NSRange {
-        return _convertRange(_CFURLComponentsGetRangeOfQuery(_components))
+        return NSRange(_CFURLComponentsGetRangeOfQuery(_components))
     }
 
     public var rangeOfFragment: NSRange {
-        return _convertRange(_CFURLComponentsGetRangeOfFragment(_components))
+        return NSRange(_CFURLComponentsGetRangeOfFragment(_components))
     }
 
     // The getter method that underlies the queryItems property parses the query string based on these delimiters and returns an NSArray containing any number of NSURLQueryItem objects, each of which represents a single key-value pair, in the order in which they appear in the original query string.  Note that a name may appear more than once in a single query string, so the name values are not guaranteed to be unique. If the NSURLComponents object has an empty query component, queryItems returns an empty NSArray. If the NSURLComponents object has no query component, queryItems returns nil.