fixed iterating over template lines on linux
This commit is contained in:
@@ -87,7 +87,7 @@ class ForNode : NodeType {
|
||||
var values: [Any]
|
||||
|
||||
if let dictionary = resolved as? [String: Any], !dictionary.isEmpty {
|
||||
values = dictionary.map { ($0.key, $0.value) }
|
||||
values = dictionary.map { ($0.key, $0.value) } as [(String, Any)]
|
||||
} else if let array = resolved as? [Any] {
|
||||
values = array
|
||||
} else if let range = resolved as? CountableClosedRange<Int> {
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import Foundation
|
||||
|
||||
struct Lexer {
|
||||
let templateString: String
|
||||
|
||||
@@ -59,15 +61,16 @@ struct Lexer {
|
||||
var offset = 0
|
||||
var lineContent = ""
|
||||
|
||||
templateString.enumerateLines { (line, stop) in
|
||||
for line in templateString.components(separatedBy: CharacterSet.newlines) {
|
||||
lineNumber += 1
|
||||
lineContent = line
|
||||
if let rangeOfLine = self.templateString.range(of: line), rangeOfLine.contains(lexeme.range.lowerBound) {
|
||||
offset = self.templateString.distance(from: rangeOfLine.lowerBound, to:
|
||||
if let rangeOfLine = templateString.range(of: line), rangeOfLine.contains(lexeme.range.lowerBound) {
|
||||
offset = templateString.distance(from: rangeOfLine.lowerBound, to:
|
||||
lexeme.range.lowerBound)
|
||||
stop = true
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
return (lineContent, lineNumber, offset)
|
||||
}
|
||||
|
||||
|
||||
@@ -39,7 +39,6 @@ func testEnvironment() {
|
||||
error.lexeme = Token.block(value: token, at: template.templateString.range(of: token)!)
|
||||
let context = ErrorReporterContext(template: template)
|
||||
error = environment.errorReporter.contextAwareError(error, context: context) as! TemplateSyntaxError
|
||||
print(error)
|
||||
return error
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user