Add availability annotations to run with DarwinCompatibilityTests

Author: nevil

CoreFoundation/String.subproj/CFRegularExpression.h

@@ -57,7 +57,7 @@ _CFRegularExpressionRef _Nullable _CFRegularExpressionCreate(CFAllocatorRef allo
 void _CFRegularExpressionDestroy(_CFRegularExpressionRef regex);
 
 CFIndex _CFRegularExpressionGetNumberOfCaptureGroups(_CFRegularExpressionRef regex);
-CFIndex _CFRegularExpressionGetCaptureGroupNumberWithName(_CFRegularExpressionRef regex, CFStringRef groupName);
+CFIndex _CFRegularExpressionGetCaptureGroupNumberWithName(_CFRegularExpressionRef regex, CFStringRef groupName) API_AVAILABLE(macosx(10.13), ios(11.0), watchos(4.0), tvos(11.0));
 void _CFRegularExpressionEnumerateMatchesInString(_CFRegularExpressionRef regexObj, CFStringRef string, _CFRegularExpressionMatchingOptions options, CFRange range, void *_Nullable context, _CFRegularExpressionMatch match);
 
 CFStringRef _CFRegularExpressionGetPattern(_CFRegularExpressionRef regex);

Foundation/NSRegularExpression.swift

@@ -107,6 +107,7 @@ open class NSRegularExpression: NSObject, NSCopying, NSCoding {
         return _CFRegularExpressionGetNumberOfCaptureGroups(_internal)
     }
 
+    @available(macOS 10.13, iOS 11.0, watchOS 4.0, tvOS 11.0, *)
     internal func _captureGroupNumber(withName name: String) -> Int {
         return _CFRegularExpressionGetCaptureGroupNumberWithName(_internal, name._cfObject)
     }

Foundation/NSTextCheckingResult.swift

@@ -54,6 +54,7 @@ open class NSTextCheckingResult: NSObject, NSCopying, NSCoding {
     open 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. */
     open func range(at idx: Int) -> NSRange { NSRequiresConcreteImplementation() }
+    @available(macOS 10.13, iOS 11.0, watchOS 4.0, tvOS 11.0, *)
     open func range(withName: String) -> NSRange { NSRequiresConcreteImplementation() }
     open var regularExpression: NSRegularExpression? { return nil }
     open var numberOfRanges: Int { return 1 }
@@ -83,6 +84,7 @@ internal class _NSRegularExpressionNSTextCheckingResultResult : NSTextCheckingRe
     override var resultType: CheckingType { return .RegularExpression }
     override func range(at idx: Int) -> NSRange { return _ranges[idx] }
 
+    @available(macOS 10.13, iOS 11.0, watchOS 4.0, tvOS 11.0, *)
     override func range(withName name: String) -> NSRange {
         let idx = _regularExpression._captureGroupNumber(withName: name)
         if idx != kCFNotFound, idx < numberOfRanges {

TestFoundation/TestNSTextCheckingResult.swift

@@ -40,19 +40,25 @@ class TestNSTextCheckingResult: XCTestCase {
            XCTAssertEqual(result.range(at: 0).location, 6)
            XCTAssertEqual(result.range(at: 1).location, NSNotFound)
            XCTAssertEqual(result.range(at: 2).location, 6)
-           XCTAssertEqual(result.range(withName: "aname").location, 6)
+           if #available(OSX 10.13, iOS 11.0, watchOS 4.0, tvOS 11.0, *) {
+               XCTAssertEqual(result.range(withName: "aname").location, 6)
+           }
            //Negative offset
            result = match.adjustingRanges(offset: -2)
            XCTAssertEqual(result.range(at: 0).location, 3)
            XCTAssertEqual(result.range(at: 1).location, NSNotFound)
            XCTAssertEqual(result.range(at: 2).location, 3)
-           XCTAssertEqual(result.range(withName: "aname").location, 3)
+           if #available(OSX 10.13, iOS 11.0, watchOS 4.0, tvOS 11.0, *) {
+               XCTAssertEqual(result.range(withName: "aname").location, 3)
+           }
            //ZeroOffset
            result = match.adjustingRanges(offset: 0)
            XCTAssertEqual(result.range(at: 0).location, 5)
            XCTAssertEqual(result.range(at: 1).location, NSNotFound)
            XCTAssertEqual(result.range(at: 2).location, 5)
-           XCTAssertEqual(result.range(withName: "aname").location, 5)
+           if #available(OSX 10.13, iOS 11.0, watchOS 4.0, tvOS 11.0, *) {
+               XCTAssertEqual(result.range(withName: "aname").location, 5)
+           }
        } catch {
             XCTFail("Unable to build regular expression for pattern \(patternString)")
        }
@@ -71,18 +77,27 @@ class TestNSTextCheckingResult: XCTestCase {
             XCTAssertEqual(matches[0].range, NSRange(location: 0, length: 6))
             XCTAssertEqual(matches[0].range(at: 0), NSRange(location: 0, length: 6))
             XCTAssertEqual(matches[0].range(at: 1), NSRange(location: 0, length: 5))
-            XCTAssertEqual(matches[0].range(withName: "name"), NSRange(location: 0, length: 5))
+            if #available(OSX 10.13, iOS 11.0, watchOS 4.0, tvOS 11.0, *) {
+                XCTAssertEqual(matches[0].range(withName: "name"), NSRange(location: 0, length: 5))
+            }
             XCTAssertEqual(matches[1].numberOfRanges, 2)
             XCTAssertEqual(matches[1].range, NSRange(location: 7, length: 6))
             XCTAssertEqual(matches[1].range(at: 0), NSRange(location: 7, length: 6))
             XCTAssertEqual(matches[1].range(at: 1), NSRange(location: 7, length: 5))
-            XCTAssertEqual(matches[1].range(withName: "name"), NSRange(location: 7, length: 5))
+            if #available(OSX 10.13, iOS 11.0, watchOS 4.0, tvOS 11.0, *) {
+                XCTAssertEqual(matches[1].range(withName: "name"), NSRange(location: 7, length: 5))
+            }
         } catch {
             XCTFail("Unable to build regular expression for pattern \(patternString)")
         }
     }
 
+
     func test_rangeWithName() {
+        guard #available(OSX 10.13, iOS 11.0, watchOS 4.0, tvOS 11.0, *) else {
+            return
+        }
+
         let patternString = "(?<name1>hel)lo, (?<name2>worl)d"
 
         do {