swiftstencil/swiftpm-stencil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed Scanner property for original content

Browse Source
This commit is contained in:
Ilya Puchka
2017-10-08 00:07:10 +02:00
parent 079fdf39b8
commit 7688326204
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/Lexer.swift
View File

@@ -78,12 +78,12 @@ protocol Lexeme {
} }
class Scanner { class Scanner {
let _content: String //stores original content let originalContent: String
var content: String var content: String
var range: Range<String.Index> var range: Range<String.Index>
init(_ content: String) { init(_ content: String) {
self._content = content self.originalContent = content
self.content = content self.content = content
range = content.startIndex..<content.startIndex range = content.startIndex..<content.startIndex
} }
@@ -107,7 +107,7 @@ class Scanner {
let result = content.substring(to: index) let result = content.substring(to: index)
if returnUntil { if returnUntil {
range = range.lowerBound..<_content.index(range.upperBound, offsetBy: until.count) range = range.lowerBound..<originalContent.index(range.upperBound, offsetBy: until.count)
content = substring.substring(from: until.endIndex) content = substring.substring(from: until.endIndex)
return result + until return result + until
} }
@@ -117,7 +117,7 @@ class Scanner {
} }
index = content.index(after: index) index = content.index(after: index)
range = range.lowerBound..<_content.index(after: range.upperBound) range = range.lowerBound..<originalContent.index(after: range.upperBound)
} }
content = "" content = ""
@@ -143,7 +143,7 @@ class Scanner {
} }
index = content.index(after: index) index = content.index(after: index)
range = range.lowerBound..<_content.index(after: range.upperBound) range = range.lowerBound..<originalContent.index(after: range.upperBound)
} }
return nil return nil