cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix weird optimization bug

Browse Source
This commit is contained in:
Erik 2015-02-13 18:16:09 -05:00
parent b53d22f3a2
commit f826ca4b8e
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SwiftIO/SwiftRegex.swift
View File

@ -93,7 +93,7 @@ public class SwiftRegex: NSObject, BooleanType {
} }
set(newValue) { set(newValue) {
if let mutableTarget = target as? NSMutableString { if let mutableTarget = target as? NSMutableString {
for match in matchResults().reverse() { for match in matchResults()!.reverse() {
let replacement = regex.replacementStringForResult( match, let replacement = regex.replacementStringForResult( match,
inString: target as! String, offset: 0, template: newValue ) inString: target as! String, offset: 0, template: newValue )
mutableTarget.replaceCharactersInRange(match.rangeAtIndex(groupno), withString: replacement) mutableTarget.replaceCharactersInRange(match.rangeAtIndex(groupno), withString: replacement)
@ -104,25 +104,32 @@ public class SwiftRegex: NSObject, BooleanType {
} }
} }
func matchResults(options: NSMatchingOptions = nil) -> [NSTextCheckingResult] { func matchResults(options: NSMatchingOptions = nil) -> [NSTextCheckingResult]? {
return regex.matchesInString(target as! String, options: options, range: targetRange) as! [NSTextCheckingResult] let matches = regex.matchesInString(target as! String, options: options, range: targetRange)
as? [NSTextCheckingResult]
if matches != nil {
return matches!
} else {
return nil
}
} }
public func ranges(options: NSMatchingOptions = nil) -> [NSRange] { public func ranges(options: NSMatchingOptions = nil) -> [NSRange] {
return matchResults(options: options).map { $0.range } return matchResults(options: options)!.map { $0.range }
} }
public func matches(options: NSMatchingOptions = nil) -> [String] { public func matches(options: NSMatchingOptions = nil) -> [String] {
return matchResults(options: options).map { self.substring($0.range) } as [NSString] as! [String] return matchResults(options: options)!.map( { self.substring($0.range) as String } )
} }
public func allGroups(options: NSMatchingOptions = nil) -> [[String]] { public func allGroups(options: NSMatchingOptions = nil) -> [[String]] {
return matchResults(options: options).map { self.groupsForMatch($0) } return matchResults(options: options)!.map { self.groupsForMatch($0) }
} }
public func dictionary(options: NSMatchingOptions = nil) -> Dictionary<String,String> { public func dictionary(options: NSMatchingOptions = nil) -> Dictionary<String,String> {
var out = Dictionary<String,String>() var out = Dictionary<String,String>()
for match in matchResults(options: options) { for match in matchResults(options: options)! {
out[substring(match.rangeAtIndex(1)) as! String] = out[substring(match.rangeAtIndex(1)) as! String] =
substring(match.rangeAtIndex(2)) as? String substring(match.rangeAtIndex(2)) as? String
} }