List literals in polymer_expressions

pkg/polymer_expressions/lib/parser.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 polymer_expressions.parser;
 
 import 'tokenizer.dart';
 import 'expression.dart';
 
 const _UNARY_OPERATORS = const ['+', '-', '!'];
@@ skipping 12 matching lines @@
         _astFactory = (astFactory == null) ? new AstFactory() : astFactory;
 
   Expression parse() {
     _tokens = _tokenizer.tokenize();
     _iterator = _tokens.iterator;
     _advance();
     return _parseExpression();
   }
 
   _advance([int kind, String value]) {
-    if ((kind != null && _token.kind != kind)
-        || (value != null && _token.value != value)) {
-      throw new ParseException("Expected $value: $_token");
+    if ((kind != null && (_token == null || _token.kind != kind))
+        || (value != null && (_token == null || _token.value != value))) {
+      throw new ParseException("Expected kind $kind ($value): $_token");
     }
     _iterator.moveNext();
   }
 
   Expression _parseExpression() {
     if (_token == null) return _astFactory.empty();
     var expr = _parseUnary();
     return (expr == null) ? null : _parsePrecedence(expr, 0);
   }
 
@@ skipping 107 matching lines @@
         return _parseString();
       case INTEGER_TOKEN:
         return _parseInteger();
       case DECIMAL_TOKEN:
         return _parseDecimal();
       case GROUPER_TOKEN:
         if (_token.value == '(') {
           return _parseParenthesized();
         } else if (_token.value == '{') {
           return _parseMapLiteral();
+        } else if (_token.value == '[') {
+          return _parseListLiteral();
         }
         return null;
       case COLON_TOKEN:
         // TODO(justinfagnani): We need better errors throughout the parser, and
         // we should be throwing ParseErrors to be caught by the caller
         throw new ArgumentError('unexpected token ":"');
       default:
         return null;
     }
   }
 
+  ListLiteral _parseListLiteral() {
+    var items = [];
+    do {
+      _advance();
+      if (_token.kind == GROUPER_TOKEN && _token.value == ']') {
+        break;
+      }
+      items.add(_parseExpression());
+    } while(_token != null && _token.value == ',');
+    _advance(GROUPER_TOKEN, ']');
+    return new ListLiteral(items);
+  }
+
   MapLiteral _parseMapLiteral() {
     var entries = [];
     do {
       _advance();
       if (_token.kind == GROUPER_TOKEN && _token.value == '}') {
         break;
       }
       entries.add(_parseMapLiteralEntry());
     } while(_token != null && _token.value == ',');
     _advance(GROUPER_TOKEN, '}');
@@ skipping 95 matching lines @@
     return value;
   }
 
   Literal<double> _parseDecimal([String prefix = '']) {
     var value = _astFactory.literal(double.parse('$prefix${_token.value}'));
     _advance();
     return value;
   }
 
 }