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

removed unneeded code

Browse Source
This commit is contained in:
Ilya Puchka
2017-12-27 13:32:03 +01:00
parent a165a6715f
commit 4bfdb73175
2 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Sources/Errors.swift
View File

@@ -70,15 +70,3 @@ open class SimpleErrorReporter: ErrorReporter {
} }
} }
extension Range where Bound == String.Index {
internal static var unknown: Range {
return "".range
}
}
extension String {
var range: Range<String.Index> {
return startIndex..<endIndex
}
}

16
Sources/Lexer.swift
View File

@@ -17,25 +17,20 @@ struct Lexer {
return String(string[start..<end]).trim(character: " ") return String(string[start..<end]).trim(character: " ")
} }
if string.hasPrefix("{{") { if string.hasPrefix("{{") || string.hasPrefix("{%") || string.hasPrefix("{#") {
let value = strip() let value = strip()
let range = templateString.range(of: value, range: range) ?? range let range = templateString.range(of: value, range: range) ?? range
let line = templateString.rangeLine(range) let line = templateString.rangeLine(range)
let sourceMap = SourceMap(filename: templateName, line: line) let sourceMap = SourceMap(filename: templateName, line: line)
if string.hasPrefix("{{") {
return .variable(value: value, at: sourceMap) return .variable(value: value, at: sourceMap)
} else if string.hasPrefix("{%") { } else if string.hasPrefix("{%") {
let value = strip()
let range = templateString.range(of: value, range: range) ?? range
let line = templateString.rangeLine(range)
let sourceMap = SourceMap(filename: templateName, line: line)
return .block(value: value, at: sourceMap) return .block(value: value, at: sourceMap)
} else if string.hasPrefix("{#") { } else if string.hasPrefix("{#") {
let value = strip()
let range = templateString.range(of: value, range: range) ?? range
let line = templateString.rangeLine(range)
let sourceMap = SourceMap(filename: templateName, line: line)
return .comment(value: value, at: sourceMap) return .comment(value: value, at: sourceMap)
} }
}
let line = templateString.rangeLine(range) let line = templateString.rangeLine(range)
let sourceMap = SourceMap(filename: templateName, line: line) let sourceMap = SourceMap(filename: templateName, line: line)
@@ -57,7 +52,6 @@ struct Lexer {
while !scanner.isEmpty { while !scanner.isEmpty {
if let text = scanner.scan(until: ["{{", "{%", "{#"]) { if let text = scanner.scan(until: ["{{", "{%", "{#"]) {
if !text.1.isEmpty { if !text.1.isEmpty {
let line = templateString.rangeLine(scanner.range)
tokens.append(createToken(string: text.1, at: scanner.range)) tokens.append(createToken(string: text.1, at: scanner.range))
} }
@@ -65,7 +59,6 @@ struct Lexer {
let result = scanner.scan(until: end, returnUntil: true) let result = scanner.scan(until: end, returnUntil: true)
tokens.append(createToken(string: result, at: scanner.range)) tokens.append(createToken(string: result, at: scanner.range))
} else { } else {
let line = templateString.rangeLine(scanner.range)
tokens.append(createToken(string: scanner.content, at: scanner.range)) tokens.append(createToken(string: scanner.content, at: scanner.range))
scanner.content = "" scanner.content = ""
} }
@@ -120,7 +113,6 @@ class Scanner {
} }
content = "" content = ""
range = "".range
return "" return ""
} }