don't need to specifiy get
This commit is contained in:
parent
ec200e78bb
commit
5d9a8e88bf
@ -12,20 +12,18 @@ struct SocketGenericParser {
|
|||||||
let message: String
|
let message: String
|
||||||
var currentIndex: Int
|
var currentIndex: Int
|
||||||
var messageCharacters: [Character] {
|
var messageCharacters: [Character] {
|
||||||
get {
|
return Array(message.characters)
|
||||||
return Array(message.characters)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
var currentCharacter: String? {
|
|
||||||
get{
|
|
||||||
if currentIndex >= messageCharacters.count {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return String(messageCharacters[currentIndex])
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mutating func read(characterLength:Int) -> String? {
|
var currentCharacter: String? {
|
||||||
|
if currentIndex >= messageCharacters.count {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return String(messageCharacters[currentIndex])
|
||||||
|
}
|
||||||
|
|
||||||
|
mutating func read(characterLength: Int) -> String? {
|
||||||
let startIndex = message.startIndex.advancedBy(currentIndex)
|
let startIndex = message.startIndex.advancedBy(currentIndex)
|
||||||
let range = Range<String.Index>(start: startIndex, end: startIndex.advancedBy(characterLength))
|
let range = Range<String.Index>(start: startIndex, end: startIndex.advancedBy(characterLength))
|
||||||
currentIndex = currentIndex + characterLength
|
currentIndex = currentIndex + characterLength
|
||||||
@ -33,7 +31,7 @@ struct SocketGenericParser {
|
|||||||
return message.substringWithRange(range)
|
return message.substringWithRange(range)
|
||||||
}
|
}
|
||||||
|
|
||||||
mutating func readUntilStringOccurence(string:String) -> String? {
|
mutating func readUntilStringOccurence(string: String) -> String? {
|
||||||
let startIndex = message.startIndex.advancedBy(currentIndex)
|
let startIndex = message.startIndex.advancedBy(currentIndex)
|
||||||
let range = Range<String.Index>(start: startIndex, end: message.endIndex)
|
let range = Range<String.Index>(start: startIndex, end: message.endIndex)
|
||||||
let subString = message.substringWithRange(range) as NSString
|
let subString = message.substringWithRange(range) as NSString
|
||||||
@ -46,7 +44,7 @@ struct SocketGenericParser {
|
|||||||
return subString.substringToIndex(foundRange.location)
|
return subString.substringToIndex(foundRange.location)
|
||||||
}
|
}
|
||||||
|
|
||||||
mutating func readUntilEnd() ->String {
|
mutating func readUntilEnd() -> String {
|
||||||
return read(messageCharacters.count - currentIndex)!
|
return read(messageCharacters.count - currentIndex)!
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user