Ternary operator support for polymer_expressions

pkg/polymer_expressions/test/tokenizer_test.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library tokenizer_test;
 
 import 'package:polymer_expressions/tokenizer.dart';
 import 'package:unittest/unittest.dart';
 
 main() {
@@ skipping 40 matching lines @@
           t(IDENTIFIER_TOKEN, 'b')]);
     });
 
     test('should tokenize a logical and operator', () {
       expectTokens('a && b', [
           t(IDENTIFIER_TOKEN, 'a'),
           t(OPERATOR_TOKEN, '&&'),
           t(IDENTIFIER_TOKEN, 'b')]);
     });
 
+    test('should tokenize a ternary operator', () {
+      expectTokens('a ? b : c', [
+          t(IDENTIFIER_TOKEN, 'a'),
+          t(OPERATOR_TOKEN, '?'),
+          t(IDENTIFIER_TOKEN, 'b'),
+          t(COLON_TOKEN, ':'),
+          t(IDENTIFIER_TOKEN, 'c')]);
+    });
+
     test('should tokenize an iterate expression with "in" keyword', () {
       expectTokens('item in items', [
           t(IDENTIFIER_TOKEN, 'item'),
           t(KEYWORD_TOKEN, 'in'),
           t(IDENTIFIER_TOKEN, 'items')]);
     });
 
     test('should tokenize keywords', () {
       expectTokens('in', [t(KEYWORD_TOKEN, 'in')]);
       expectTokens('this', [t(KEYWORD_TOKEN, 'this')]);
@@ skipping 75 matching lines @@
 class MatcherList extends Matcher {
   final List<Matcher> matchers;
 
   MatcherList(this.matchers);
 
   bool matches(List o, Map matchState) {
     if (o.length != matchers.length) return false;
     for (int i = 0; i < o.length; i++) {
       var state = new Map();
       if (!matchers[i].matches(o[i], state)) {
-        matchState = {
+        matchState.addAll({
           'index': i,
           'value': o[i],
           'state': state,
-        };
+        });
         return false;
       }
     }
     return true;
   }
 
   Description describe(Description d) {
     d.add('matches all: ');
     matchers.forEach((m) => m.describe(d));
   }
@@ skipping 10 matching lines @@
     } else {
       if (item.length != matchers.length) {
         mismatchDescription.add('wrong lengths');
       } else {
         mismatchDescription.add('was ').addDescriptionOf(item);
       }
     }
   }
 
 }