replaced Lexeme protocol with Token

This commit is contained in:
Ilya Puchka
2017-12-26 15:28:46 +01:00
parent 218822fcb0
commit 8d68edd725
7 changed files with 35 additions and 54 deletions

View File

@@ -161,7 +161,7 @@ class BlockNode : NodeType {
let baseError = context.errorReporter.reportError(error)
throw TemplateSyntaxError(
reason: (baseError as? TemplateSyntaxError)?.reason ?? "\(baseError)",
lexeme: blockSuperNode.token,
token: blockSuperNode.token,
template: child.template,
parentError: baseError)
}
@@ -178,7 +178,7 @@ class BlockNode : NodeType {
// unless it's already set
if var error = error as? TemplateSyntaxError {
error.template = error.template ?? child.template
error.lexeme = error.lexeme ?? child.node.token
error.token = error.token ?? child.node.token
throw error
} else {
throw error