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

change pattern matching syntax

Browse Source
This commit is contained in:
Erik 2016-01-03 12:00:37 -05:00
parent 5068986a50
commit 0c8ff90537
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/SocketEngine.swift
View File

@ -83,23 +83,23 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
for option in options { for option in options {
switch option { switch option {
case .SessionDelegate(let delegate): case let .SessionDelegate(delegate):
sessionDelegate = delegate sessionDelegate = delegate
case .ForcePolling(let force): case let .ForcePolling(force):
forcePolling = force forcePolling = force
case .ForceWebsockets(let force): case let .ForceWebsockets(force):
forceWebsockets = force forceWebsockets = force
case .Cookies(let cookies): case let .Cookies(cookies):
self.cookies = cookies self.cookies = cookies
case .Path(let path): case let .Path(path):
socketPath = path socketPath = path
case .ExtraHeaders(let headers): case let .ExtraHeaders(headers):
extraHeaders = headers extraHeaders = headers
case .VoipEnabled(let enable): case let .VoipEnabled(enable):
voipEnabled = enable voipEnabled = enable
case .Secure(let secure): case let .Secure(secure):
self.secure = secure self.secure = secure
case .SelfSigned(let selfSigned): case let .SelfSigned(selfSigned):
self.selfSigned = selfSigned self.selfSigned = selfSigned
default: default:
continue continue

18
Source/SocketIOClient.swift
View File

@ -70,23 +70,23 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
for option in options { for option in options {
switch option { switch option {
case .ConnectParams(let params): case let .ConnectParams(params):
connectParams = params connectParams = params
case .Reconnects(let reconnects): case let .Reconnects(reconnects):
self.reconnects = reconnects self.reconnects = reconnects
case .ReconnectAttempts(let attempts): case let .ReconnectAttempts(attempts):
reconnectAttempts = attempts reconnectAttempts = attempts
case .ReconnectWait(let wait): case let .ReconnectWait(wait):
reconnectWait = abs(wait) reconnectWait = abs(wait)
case .Nsp(let nsp): case let .Nsp(nsp):
self.nsp = nsp self.nsp = nsp
case .Log(let log): case let .Log(log):
DefaultSocketLogger.Logger.log = log DefaultSocketLogger.Logger.log = log
case .Logger(let logger): case let .Logger(logger):
DefaultSocketLogger.Logger = logger DefaultSocketLogger.Logger = logger
case .HandleQueue(let queue): case let .HandleQueue(queue):
handleQueue = queue handleQueue = queue
case .ForceNew(let force): case let .ForceNew(force):
forceNew = force forceNew = force
default: default:
continue continue

8
Source/SocketParser.swift
View File

@ -111,7 +111,7 @@ class SocketParser {
let noPlaceholders = d["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] ~= "\"~~$2\"" let noPlaceholders = d["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] ~= "\"~~$2\""
switch parseData(noPlaceholders) { switch parseData(noPlaceholders) {
case .Left(let err): case let .Left(err):
// If first you don't succeed, try again // If first you don't succeed, try again
if case let .Right(data) = parseData("\([noPlaceholders as AnyObject])") { if case let .Right(data) = parseData("\([noPlaceholders as AnyObject])") {
return .Right(SocketPacket(type: type, data: data, id: Int(idString) ?? -1, return .Right(SocketPacket(type: type, data: data, id: Int(idString) ?? -1,
@ -119,7 +119,7 @@ class SocketParser {
} else { } else {
return .Left(err) return .Left(err)
} }
case .Right(let data): case let .Right(data):
return .Right(SocketPacket(type: type, data: data, id: Int(idString) ?? -1, return .Right(SocketPacket(type: type, data: data, id: Int(idString) ?? -1,
nsp: namespace ?? "/", placeholders: placeholders)) nsp: namespace ?? "/", placeholders: placeholders))
} }
@ -147,9 +147,9 @@ class SocketParser {
DefaultSocketLogger.Logger.log("Parsing %@", type: "SocketParser", args: message) DefaultSocketLogger.Logger.log("Parsing %@", type: "SocketParser", args: message)
switch parseString(message) { switch parseString(message) {
case .Left(let err): case let .Left(err):
DefaultSocketLogger.Logger.error("\(err): %@", type: "SocketParser", args: message) DefaultSocketLogger.Logger.error("\(err): %@", type: "SocketParser", args: message)
case .Right(let pack): case let .Right(pack):
DefaultSocketLogger.Logger.log("Decoded packet as: %@", type: "SocketParser", args: pack.description) DefaultSocketLogger.Logger.log("Decoded packet as: %@", type: "SocketParser", args: pack.description)
handlePacket(pack, withSocket: socket) handlePacket(pack, withSocket: socket)
} }