From 6d6ac0fc741e28e12424d2b3056807c8ce050c63 Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 11 Feb 2015 11:56:14 -0500 Subject: [PATCH] clean up swiftregex --- SwiftIO/SwiftRegex.swift | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/SwiftIO/SwiftRegex.swift b/SwiftIO/SwiftRegex.swift index 6f4db40..68396a7 100644 --- a/SwiftIO/SwiftRegex.swift +++ b/SwiftIO/SwiftRegex.swift @@ -113,14 +113,7 @@ public class SwiftRegex: NSObject, BooleanType { } public func matches(options: NSMatchingOptions = nil) -> [String] { - var returnStr = [String]() - var t = matchResults(options: options).map { self.substring($0.range) } - - for str in t { - returnStr.append(str as! String) - } - - return returnStr + return matchResults(options: options).map { self.substring($0.range) } as [NSString] as! [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 ) if let mutableTarget = target as? NSMutableString { - var str = "" - for char in out as String { - str += String(char) - } - - mutableTarget.setString(str) + mutableTarget.setString(out as String) return mutableTarget } else { SwiftRegex.failure("Modify on non-mutable")