fix(parser/eval): fix for '"s" + ("m"|filter) + "e"'

closes dart-archive#755

Author: vicb

bin/parser_generator_for_spec.dart

@@ -175,6 +175,7 @@ main(arguments) {
       'add(a,b)',
       'notAProperty',
       "'Foo'|uppercase",
+      "'f' + ('o'|uppercase) + 'o'",
       "1|increment:2",
       "'abcd'|substring:1:offset",
       "'abcd'|substring:1:3|uppercase",

lib/core/parser/dynamic_parser.dart

@@ -68,8 +68,7 @@ class DynamicParserBackend extends ParserBackend {
   final ClosureMap _closures;
   DynamicParserBackend(this._closures);
 
-  bool isAssignable(Expression expression)
-      => expression.isAssignable;
+  bool isAssignable(Expression expression) => expression.isAssignable;
 
   Expression newFilter(expression, name, arguments) {
     List allArguments = new List(arguments.length + 1);
@@ -78,58 +77,46 @@ class DynamicParserBackend extends ParserBackend {
     return new Filter(expression, name, arguments, allArguments);
   }
 
-  Expression newChain(expressions)
-      => new Chain(expressions);
-  Expression newAssign(target, value)
-      => new Assign(target, value);
+  Expression newChain(expressions) => new Chain(expressions);
+  Expression newAssign(target, value) => new Assign(target, value);
   Expression newConditional(condition, yes, no)
       => new Conditional(condition, yes, no);
 
-  Expression newAccessKeyed(object, key)
-      => new AccessKeyed(object, key);
+  Expression newAccessKeyed(object, key) => new AccessKeyed(object, key);
   Expression newCallFunction(function, arguments)
       => new CallFunction(function, arguments);
 
-  Expression newPrefixNot(expression)
-      => new PrefixNot(expression);
+  Expression newPrefixNot(expression) => new PrefixNot(expression);
 
   Expression newBinary(operation, left, right)
       => new Binary(operation, left, right);
 
-  Expression newLiteralPrimitive(value)
-      => new LiteralPrimitive(value);
-  Expression newLiteralArray(elements)
-      => new LiteralArray(elements);
-  Expression newLiteralObject(keys, values)
-      => new LiteralObject(keys, values);
-  Expression newLiteralString(value)
-      => new LiteralString(value);
+  Expression newLiteralPrimitive(value) => new LiteralPrimitive(value);
+  Expression newLiteralArray(elements) => new LiteralArray(elements);
+  Expression newLiteralObject(keys, values) => new LiteralObject(keys, values);
+  Expression newLiteralString(value) => new LiteralString(value);
 
 
   Expression newAccessScope(name) {
     Getter getter = _closures.lookupGetter(name);
     Setter setter = _closures.lookupSetter(name);
-    if (getter != null && setter != null) {
-      return new AccessScopeFast(name, getter, setter);
-    } else {
-      return new AccessScope(name);
-    }
+    return (getter != null && setter != null)
+        ? new AccessScopeFast(name, getter, setter)
+        : new AccessScope(name);
   }
 
   Expression newAccessMember(object, name) {
     Getter getter = _closures.lookupGetter(name);
     Setter setter = _closures.lookupSetter(name);
-    if (getter != null && setter != null) {
-      return new AccessMemberFast(object, name, getter, setter);
-    } else {
-      return new AccessMember(object, name);
-    }
+    return (getter != null && setter != null)
+        ? new AccessMemberFast(object, name, getter, setter)
+        : new AccessMember(object, name);
   }
 
   Expression newCallScope(name, arguments) {
     Function constructor = _computeCallConstructor(
         _callScopeConstructors, name, arguments.length);
-    return (constructor != null)
+    return constructor != null
         ? constructor(name, arguments, _closures)
         : new CallScope(name, arguments);
   }

lib/core/parser/dynamic_parser_impl.dart

@@ -210,7 +210,7 @@ class DynamicParserImpl {
 
   parsePrimary() {
     if (optionalCharacter($LPAREN)) {
-      var result = parseExpression();
+      var result = parseFilter();
       expectCharacter($RPAREN);
       return result;
     } else if (peek.isKeywordNull || peek.isKeywordUndefined) {

lib/core/parser/eval.dart

@@ -53,12 +53,12 @@ class Binary extends syntax.Binary {
   Binary(String operation, syntax.Expression left, syntax.Expression right):
       super(operation, left, right);
   eval(scope, [FilterMap filters]) {
-    var left = this.left.eval(scope);
+    var left = this.left.eval(scope, filters);
     switch (operation) {
       case '&&': return toBool(left) && toBool(this.right.eval(scope));
       case '||': return toBool(left) || toBool(this.right.eval(scope));
     }
-    var right = this.right.eval(scope);
+    var right = this.right.eval(scope, filters);
 
     // Null check for the operations.
     if (left == null || right == null) {

lib/core/parser/static_parser.dart

@@ -15,7 +15,7 @@ class StaticParserFunctions {
 class StaticParser implements Parser<Expression> {
   final StaticParserFunctions _functions;
   final DynamicParser _fallbackParser;
-  final Map<String, Expression> _cache = {};
+  final _cache = <String, Expression>{};
   StaticParser(this._functions, this._fallbackParser);
 
   Expression call(String input) {

test/core/parser/parser_spec.dart

@@ -980,6 +980,7 @@ main() {
     describe('filters', () {
       it('should call a filter', () {
         expect(eval("'Foo'|uppercase", filters)).toEqual("FOO");
+        expect(eval("'f' + ('o'|uppercase) + 'o'", filters)).toEqual("fOo");
         expect(eval("'fOo'|uppercase|lowercase", filters)).toEqual("foo");
       });