From 34f440c25d10c1440af0f1e9687ac2fc9ad8309a Mon Sep 17 00:00:00 2001 From: Ian Partridge Date: Thu, 23 Mar 2017 16:38:02 +0000 Subject: [PATCH] NSRegularExpression: Add default value to init() `options` parameter --- Foundation/NSRegularExpression.swift | 2 +- TestFoundation/TestNSRegularExpression.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Foundation/NSRegularExpression.swift b/Foundation/NSRegularExpression.swift index a5e304eddc..ec4a88e67b 100644 --- a/Foundation/NSRegularExpression.swift +++ b/Foundation/NSRegularExpression.swift @@ -75,7 +75,7 @@ open class NSRegularExpression: NSObject, NSCopying, NSCoding { /* An instance of NSRegularExpression is created from a regular expression pattern and a set of options. If the pattern is invalid, nil will be returned and an NSError will be returned by reference. The pattern syntax currently supported is that specified by ICU. */ - public init(pattern: String, options: Options) throws { + public init(pattern: String, options: Options = []) throws { var error: Unmanaged? #if os(OSX) || os(iOS) let opt = _CFRegularExpressionOptions(rawValue: options.rawValue) diff --git a/TestFoundation/TestNSRegularExpression.swift b/TestFoundation/TestNSRegularExpression.swift index 5e5eb77997..8b115cc328 100644 --- a/TestFoundation/TestNSRegularExpression.swift +++ b/TestFoundation/TestNSRegularExpression.swift @@ -35,7 +35,7 @@ class TestNSRegularExpression : XCTestCase { do { let str = NSString(string: searchString) var range = NSMakeRange(0, str.length) - let regex = try NSRegularExpression(pattern: patternString, options: []) + let regex = try NSRegularExpression(pattern: patternString) do { let lookingRange = regex.rangeOfFirstMatch(in: searchString, options: .anchored, range: range) let matchRange = regex.rangeOfFirstMatch(in: searchString, options: [], range: range)