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

use pure swift

Browse Source
This commit is contained in:
Erik 2015-09-13 13:37:43 -04:00
parent 108aa4b08a
commit ca67e9e47e
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SocketIOClientSwift/SocketStringReader.swift
View File

@ -6,8 +6,6 @@
// //
// //
import Foundation
struct SocketStringReader { struct SocketStringReader {
let message: String let message: String
var currentIndex: String.Index var currentIndex: String.Index
@ -37,19 +35,17 @@ struct SocketStringReader {
mutating func readUntilStringOccurence(string: String) -> String { mutating func readUntilStringOccurence(string: String) -> String {
let range = Range<String.Index>(start: currentIndex, end: message.endIndex) let range = Range<String.Index>(start: currentIndex, end: message.endIndex)
let subString = message.substringWithRange(range) as NSString let subString = message.substringWithRange(range)
let foundRange = subString.rangeOfString(string) guard let foundRange = subString.rangeOfString(string) else {
if foundRange.length == 0 {
let restOfString = message[currentIndex...message.endIndex.predecessor()] let restOfString = message[currentIndex...message.endIndex.predecessor()]
currentIndex = message.endIndex currentIndex = message.endIndex
return restOfString return restOfString
} }
advanceIndexBy(foundRange.location + 1) advanceIndexBy(message.startIndex.distanceTo(foundRange.startIndex) + 1)
return subString.substringToIndex(foundRange.location) return subString.substringToIndex(foundRange.startIndex)
} }
mutating func readUntilEnd() -> String { mutating func readUntilEnd() -> String {