Merge branch 'master' into errors-logs-improvements

2018-08-12 22:08:13 +01:00
parent b54292788f 4f14b4b044
commit 3a4cd8aa27
28 changed files with 1145 additions and 134 deletions
--- a/Sources/IfTag.swift
+++ b/Sources/IfTag.swift
@@ -111,7 +111,7 @@ final class IfExpressionParser {
        }
      }

-      return .variable(try tokenParser.compileFilter(component, containedIn: token))
+      return .variable(try tokenParser.compileResolvable(component, containedIn: token))
    }
  }