diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index aaf36ef..623c9e4 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -66,7 +66,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable self.options.insertIgnore(.Secure(true)) } - self.socketURL = socketURL["https?://"] ~= "" + self.socketURL = socketURL["https?://"] <~ "" for option in options { switch option { diff --git a/Source/SocketPacket.swift b/Source/SocketPacket.swift index 43985f7..19eaf74 100644 --- a/Source/SocketPacket.swift +++ b/Source/SocketPacket.swift @@ -106,7 +106,7 @@ struct SocketPacket { type: SocketPacket.logType) } } else if let str = arg as? String { - restOfMessage += "\"" + ((str["\n"] ~= "\\\\n")["\r"] ~= "\\\\r") + "\"," + restOfMessage += "\"" + ((str["\n"] <~ "\\\\n")["\r"] <~ "\\\\r") + "\"," } else if arg is NSNull { restOfMessage += "null," } else { diff --git a/Source/SocketParsable.swift b/Source/SocketParsable.swift index f7304c4..7b8d181 100644 --- a/Source/SocketParsable.swift +++ b/Source/SocketParsable.swift @@ -112,7 +112,7 @@ extension SocketParsable { } let d = message[parser.currentIndex.advancedBy(1).. String? { + private func substring(range: NSRange) -> String? { if range.location != NSNotFound { return (target as NSString).substringWithRange(range) } else { @@ -168,36 +170,9 @@ extension String { } } -func ~= (left: SwiftRegex, right: String) -> String { +func <~ (left: SwiftRegex, right: String) -> String { return left.substituteMatches({match, stop in return left.regex.replacementStringForResult( match, inString: left.target as String, offset: 0, template: right ) }, options: []) } - -func ~= (left: SwiftRegex, right: [String]) -> String { - var matchNumber = 0 - return left.substituteMatches({match, stop -> String in - - if ++matchNumber == right.count { - stop.memory = true - } - - return left.regex.replacementStringForResult( match, - inString: left.target as String, offset: 0, template: right[matchNumber-1] ) - }, options: []) -} - -func ~= (left: SwiftRegex, right: (String) -> String) -> String { - // return right(left.substring(match.range)) - return left.substituteMatches( - {match, stop -> String in - right(left.substring(match.range)!) - }, options: []) -} - -func ~= (left: SwiftRegex, right: ([String]?) -> String) -> String { - return left.substituteMatches({match, stop -> String in - return right(left.groupsForMatch(match)) - }, options: []) -}