From e56741b669891e854adaf793fe0ad5a5ee3719bc Mon Sep 17 00:00:00 2001 From: Erik Little Date: Tue, 19 Jul 2016 15:03:03 -0400 Subject: [PATCH] rename variable --- Source/SocketParsable.swift | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/SocketParsable.swift b/Source/SocketParsable.swift index 47ff845..d5a1b9d 100644 --- a/Source/SocketParsable.swift +++ b/Source/SocketParsable.swift @@ -63,13 +63,13 @@ extension SocketParsable { /// Parses a messsage from the engine. Returning either a string error or a complete SocketPacket func parseString(message: String) -> Either { - 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") } - if !parser.hasNext { + if !reader.hasNext { return .Right(SocketPacket(type: type, nsp: "/")) } @@ -77,37 +77,37 @@ extension SocketParsable { var placeholders = -1 if type == .BinaryEvent || type == .BinaryAck { - if let holders = Int(parser.readUntilStringOccurence("-")) { + if let holders = Int(reader.readUntilStringOccurence("-")) { placeholders = holders } else { return .Left("Invalid packet") } } - if parser.currentCharacter == "/" { - namespace = parser.readUntilStringOccurence(",") ?? parser.readUntilEnd() + if reader.currentCharacter == "/" { + namespace = reader.readUntilStringOccurence(",") ?? reader.readUntilEnd() } - if !parser.hasNext { + if !reader.hasNext { return .Right(SocketPacket(type: type, nsp: namespace, placeholders: placeholders)) } var idString = "" if type == .Error { - parser.advanceIndexBy(-1) + reader.advanceIndexBy(-1) } else { - while parser.hasNext { - if let int = Int(parser.read(1)) { + while reader.hasNext { + if let int = Int(reader.read(1)) { idString += String(int) } else { - parser.advanceIndexBy(-2) + reader.advanceIndexBy(-2) break } } } - let d = message[parser.currentIndex.advancedBy(1)..