don't fatalerror
This commit is contained in:
parent
2a25027077
commit
3e8ca90e3a
@ -23,11 +23,22 @@ internal final class SwiftRegex: NSObject, BooleanType {
|
|||||||
var regex: NSRegularExpression
|
var regex: NSRegularExpression
|
||||||
|
|
||||||
init(target:String, pattern:String, options:NSRegularExpressionOptions?) {
|
init(target:String, pattern:String, options:NSRegularExpressionOptions?) {
|
||||||
|
self.target = target
|
||||||
|
|
||||||
if dispatch_semaphore_wait(lock, dispatch_time(DISPATCH_TIME_NOW, Int64(10 * NSEC_PER_MSEC))) != 0 {
|
if dispatch_semaphore_wait(lock, dispatch_time(DISPATCH_TIME_NOW, Int64(10 * NSEC_PER_MSEC))) != 0 {
|
||||||
fatalError("This should never happen")
|
do {
|
||||||
|
let regex = try NSRegularExpression(pattern: pattern, options:
|
||||||
|
NSRegularExpressionOptions.DotMatchesLineSeparators)
|
||||||
|
self.regex = regex
|
||||||
|
} catch let error as NSError {
|
||||||
|
SwiftRegex.failure("Error in pattern: \(pattern) - \(error)")
|
||||||
|
self.regex = NSRegularExpression()
|
||||||
|
}
|
||||||
|
|
||||||
|
super.init()
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
self.target = target
|
|
||||||
if let regex = swiftRegexCache[pattern] {
|
if let regex = swiftRegexCache[pattern] {
|
||||||
self.regex = regex
|
self.regex = regex
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user