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

rename variable

Browse Source
This commit is contained in:
Erik Little 2016-07-19 15:03:03 -04:00
parent 559fbc0286
commit e56741b669
No known key found for this signature in database
GPG Key ID: 62F837E56F4E9320
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/SocketParsable.swift
View File

@ -63,13 +63,13 @@ extension SocketParsable {
/// Parses a messsage from the engine. Returning either a string error or a complete SocketPacket /// Parses a messsage from the engine. Returning either a string error or a complete SocketPacket
func parseString(message: String) -> Either<String, SocketPacket> { func parseString(message: String) -> Either<String, SocketPacket> {
var parser = SocketStringReader(message: message) var reader = SocketStringReader(message: message)
guard let type = SocketPacket.PacketType(rawValue: Int(parser.read(1)) ?? -1) else { guard let type = SocketPacket.PacketType(rawValue: Int(reader.read(1)) ?? -1) else {
return .Left("Invalid packet type") return .Left("Invalid packet type")
} }
if !parser.hasNext { if !reader.hasNext {
return .Right(SocketPacket(type: type, nsp: "/")) return .Right(SocketPacket(type: type, nsp: "/"))
} }
@ -77,37 +77,37 @@ extension SocketParsable {
var placeholders = -1 var placeholders = -1
if type == .BinaryEvent || type == .BinaryAck { if type == .BinaryEvent || type == .BinaryAck {
if let holders = Int(parser.readUntilStringOccurence("-")) { if let holders = Int(reader.readUntilStringOccurence("-")) {
placeholders = holders placeholders = holders
} else { } else {
return .Left("Invalid packet") return .Left("Invalid packet")
} }
} }
if parser.currentCharacter == "/" { if reader.currentCharacter == "/" {
namespace = parser.readUntilStringOccurence(",") ?? parser.readUntilEnd() namespace = reader.readUntilStringOccurence(",") ?? reader.readUntilEnd()
} }
if !parser.hasNext { if !reader.hasNext {
return .Right(SocketPacket(type: type, nsp: namespace, placeholders: placeholders)) return .Right(SocketPacket(type: type, nsp: namespace, placeholders: placeholders))
} }
var idString = "" var idString = ""
if type == .Error { if type == .Error {
parser.advanceIndexBy(-1) reader.advanceIndexBy(-1)
} else { } else {
while parser.hasNext { while reader.hasNext {
if let int = Int(parser.read(1)) { if let int = Int(reader.read(1)) {
idString += String(int) idString += String(int)
} else { } else {
parser.advanceIndexBy(-2) reader.advanceIndexBy(-2)
break break
} }
} }
} }
let d = message[parser.currentIndex.advancedBy(1)..<message.endIndex] let d = message[reader.currentIndex.advancedBy(1)..<message.endIndex]
switch parseData(d) { switch parseData(d) {
case let .Left(err): case let .Left(err):