Merge branch 'pr/335'

Author: parkera

Foundation/NSRegularExpression.swift

@@ -140,7 +140,7 @@ internal func _NSRegularExpressionMatch(_ context: UnsafeMutablePointer<Void>?,
 
 extension NSRegularExpression {
 
-    /* The fundamental matching method on NSRegularExpression is a block iterator.  There are several additional convenience methods, for returning all matches at once, the number of matches, the first match, or the range of the first match.  Each match is specified by an instance of NSTextCheckingResult (of type NSTextCheckingTypeRegularExpression) in which the overall match range is given by the range property (equivalent to rangeAtIndex:0) and any capture group ranges are given by rangeAtIndex: for indexes from 1 to numberOfCaptureGroups.  {NSNotFound, 0} is used if a particular capture group does not participate in the match.
+    /* The fundamental matching method on NSRegularExpression is a block iterator.  There are several additional convenience methods, for returning all matches at once, the number of matches, the first match, or the range of the first match.  Each match is specified by an instance of NSTextCheckingResult (of type NSTextCheckingTypeRegularExpression) in which the overall match range is given by the range property (equivalent to range at:0) and any capture group ranges are given by range at: for indexes from 1 to numberOfCaptureGroups.  {NSNotFound, 0} is used if a particular capture group does not participate in the match.
     */
 
     public func enumerateMatches(in string: String, options: NSMatchingOptions, range: NSRange, using block: (NSTextCheckingResult?, NSMatchingFlags, UnsafeMutablePointer<ObjCBool>) -> Swift.Void) {
@@ -300,7 +300,7 @@ extension NSRegularExpression {
                         var substringRange = NSMakeRange(NSNotFound, 0)
                         var substring = ""
                         if groupNumber < numberOfRanges {
-                            substringRange = result.rangeAtIndex(groupNumber)
+                            substringRange = result.range(at: groupNumber)
                         }
                         if substringRange.location != NSNotFound {
                             substringRange.location += offset

Foundation/NSTextCheckingResult.swift

@@ -45,9 +45,9 @@ public class NSTextCheckingResult : NSObject, NSCopying, NSCoding {
 
     /* Mandatory properties, used with all types of results. */
     public var resultType: NSTextCheckingType { NSUnimplemented() }
-    public var range: NSRange { return rangeAtIndex(0) }
+    public var range: NSRange { return range(at: 0) }
     /* A result must have at least one range, but may optionally have more (for example, to represent regular expression capture groups).  The range at index 0 always matches the range property.  Additional ranges, if any, will have indexes from 1 to numberOfRanges-1. */
-    public func rangeAtIndex(_ idx: Int) -> NSRange { NSUnimplemented() }
+    public func range(at idx: Int) -> NSRange { NSUnimplemented() }
     public var regularExpression: NSRegularExpression? { return nil }
     public var numberOfRanges: Int { return 1 }
 }
@@ -69,7 +69,7 @@ internal class _NSRegularExpressionTextCheckingResultResult : NSTextCheckingResu
     }
 
     override var resultType: NSTextCheckingType { return .RegularExpression }
-    override func rangeAtIndex(_ idx: Int) -> NSRange { return _ranges[idx] }
+    override func range(at idx: Int) -> NSRange { return _ranges[idx] }
     override var numberOfRanges: Int { return _ranges.count }
     override var regularExpression: NSRegularExpression? { return _regularExpression }
 }

TestFoundation/TestNSRegularExpression.swift

@@ -221,12 +221,12 @@ class TestNSRegularExpression : XCTestCase {
             if let first = firstResult where matches.count > 0 {
                 XCTAssertTrue(NSEqualRanges(first.range, firstMatchOverallRange), "Complex regex \(patternString) in \(searchString) match range \(NSStringFromRange(first.range)) should be \(NSStringFromRange(firstMatchOverallRange))", file: file, line: line)
                 if captureCount > 0 {
-                    XCTAssertTrue(NSEqualRanges(first.rangeAtIndex(1), firstMatchFirstCaptureRange), "Complex regex \(patternString) in \(searchString) match range \(first.rangeAtIndex(1)) should be \(NSStringFromRange(firstMatchFirstCaptureRange))", file: file, line: line)
+                    XCTAssertTrue(NSEqualRanges(first.range(at: 1), firstMatchFirstCaptureRange), "Complex regex \(patternString) in \(searchString) match range \(first.range(at: 1)) should be \(NSStringFromRange(firstMatchFirstCaptureRange))", file: file, line: line)
                 } else {
                     XCTAssertTrue(NSEqualRanges(firstMatchFirstCaptureRange, NSMakeRange(NSNotFound, 0)), "Complex regex \(patternString) in \(searchString) no captures should be \(NSStringFromRange(firstMatchFirstCaptureRange))", file: file, line: line)
                 }
                 if captureCount > 1 {
-                    XCTAssertTrue(NSEqualRanges(first.rangeAtIndex(captureCount), firstMatchLastCaptureRange), "Complex regex \(patternString) in \(searchString)  last capture range \(NSStringFromRange(first.rangeAtIndex(captureCount))) should be \(NSStringFromRange(firstMatchLastCaptureRange))", file: file, line: line)
+                    XCTAssertTrue(NSEqualRanges(first.range(at: captureCount), firstMatchLastCaptureRange), "Complex regex \(patternString) in \(searchString)  last capture range \(NSStringFromRange(first.range(at: captureCount))) should be \(NSStringFromRange(firstMatchLastCaptureRange))", file: file, line: line)
                 }
             }
         } catch {