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

changes to swiftregex

Browse Source
This commit is contained in:
Erik 2016-01-17 10:10:36 -05:00
parent 0fc70e8be1
commit 5cab7dbb2f
4 changed files with 9 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/SocketIOClient.swift
View File

@ -66,7 +66,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable
self.options.insertIgnore(.Secure(true)) self.options.insertIgnore(.Secure(true))
} }
self.socketURL = socketURL["https?://"] ~= "" self.socketURL = socketURL["https?://"] <~ ""
for option in options { for option in options {
switch option { switch option {

2
Source/SocketPacket.swift
View File

@ -106,7 +106,7 @@ struct SocketPacket {
type: SocketPacket.logType) type: SocketPacket.logType)
} }
} else if let str = arg as? String { } else if let str = arg as? String {
restOfMessage += "\"" + ((str["\n"] ~= "\\\\n")["\r"] ~= "\\\\r") + "\"," restOfMessage += "\"" + ((str["\n"] <~ "\\\\n")["\r"] <~ "\\\\r") + "\","
} else if arg is NSNull { } else if arg is NSNull {
restOfMessage += "null," restOfMessage += "null,"
} else { } else {

2
Source/SocketParsable.swift
View File

@ -112,7 +112,7 @@ extension SocketParsable {
} }
let d = message[parser.currentIndex.advancedBy(1)..<message.endIndex] let d = message[parser.currentIndex.advancedBy(1)..<message.endIndex]
let noPlaceholders = d["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] ~= "\"~~$2\"" let noPlaceholders = d["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] <~ "\"~~$2\""
switch parseData(noPlaceholders) { switch parseData(noPlaceholders) {
case let .Left(err): case let .Left(err):

37
Source/SwiftRegex.swift
View File

@ -13,9 +13,11 @@
import Foundation import Foundation
infix operator <~ { associativity none precedence 130 }
private var swiftRegexCache = [String: NSRegularExpression]() private var swiftRegexCache = [String: NSRegularExpression]()
internal class SwiftRegex: NSObject, BooleanType { internal final class SwiftRegex: NSObject, BooleanType {
var target:String var target:String
var regex: NSRegularExpression var regex: NSRegularExpression
@ -41,11 +43,11 @@ internal class SwiftRegex: NSObject, BooleanType {
fatalError("SwiftRegex: \(message)") fatalError("SwiftRegex: \(message)")
} }
private final var targetRange: NSRange { private var targetRange: NSRange {
return NSRange(location: 0,length: target.utf16.count) return NSRange(location: 0,length: target.utf16.count)
} }
private final func substring(range: NSRange) -> String? { private func substring(range: NSRange) -> String? {
if range.location != NSNotFound { if range.location != NSNotFound {
return (target as NSString).substringWithRange(range) return (target as NSString).substringWithRange(range)
} else { } 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.substituteMatches({match, stop in
return left.regex.replacementStringForResult( match, return left.regex.replacementStringForResult( match,
inString: left.target as String, offset: 0, template: right ) inString: left.target as String, offset: 0, template: right )
}, options: []) }, 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: [])
}