solve merge conflict issues

2018-10-01 21:59:03 +01:00
parent 0269052d6a
commit dbb5e14e9f
10 changed files with 63 additions and 65 deletions
--- a/Sources/ForTag.swift
+++ b/Sources/ForTag.swift
@@ -31,7 +31,7 @@ class ForNode : NodeType {
    let resolvable = try parser.compileResolvable(components[3], containedIn: token)

    let `where` = hasToken("where", at: 4)
-      ? try parseExpression(components: Array(components.suffix(from: 5)), tokenParser: parser, token: token)
+      ? try parser.compileExpression(components: Array(components.suffix(from: 5)), token: token)
      : nil

    let forNodes = try parser.parse(until(["endfor", "empty"]))