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

clean up swiftregex

Browse Source
This commit is contained in:
Erik 2015-02-11 11:56:14 -05:00
parent ca00926647
commit 6d6ac0fc74
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SwiftIO/SwiftRegex.swift
View File

@ -113,14 +113,7 @@ public class SwiftRegex: NSObject, BooleanType {
} }
public func matches(options: NSMatchingOptions = nil) -> [String] { public func matches(options: NSMatchingOptions = nil) -> [String] {
var returnStr = [String]() return matchResults(options: options).map { self.substring($0.range) } as [NSString] as! [String]
var t = matchResults(options: options).map { self.substring($0.range) }
for str in t {
returnStr.append(str as! String)
}
return returnStr
} }
public func allGroups(options: NSMatchingOptions = nil) -> [[String]] { public func allGroups(options: NSMatchingOptions = nil) -> [[String]] {
@ -153,12 +146,7 @@ public class SwiftRegex: NSObject, BooleanType {
out.appendString( substring( NSRange(location:pos, length:targetRange.length-pos) ) as! String ) out.appendString( substring( NSRange(location:pos, length:targetRange.length-pos) ) as! String )
if let mutableTarget = target as? NSMutableString { if let mutableTarget = target as? NSMutableString {
var str = "" mutableTarget.setString(out as String)
for char in out as String {
str += String(char)
}
mutableTarget.setString(str)
return mutableTarget return mutableTarget
} else { } else {
SwiftRegex.failure("Modify on non-mutable") SwiftRegex.failure("Modify on non-mutable")