feat(spec): Do not fall-thru to the dynamic parser in the static parser spec

Author: jbdeboer

bin/parser_generator_for_spec.dart

@@ -18,7 +18,9 @@ main(arguments) {
   // List generated using:
   // node node_modules/karma/bin/karma run | grep -Eo ":XNAY:.*:XNAY:" | sed -e 's/:XNAY://g' | sed -e "s/^/'/" | sed -e "s/$/',/" | sort | uniq > missing_expressions
   injector.get(isGetter ? ParserGetterSetter : ParserGenerator).generateParser([
-      "foo == 'bar' ||\nbaz"
+      "foo == 'bar' ||\nbaz",
+      "this['a'].b",
+      "const",
       "null",
       "[1, 2].length",
       "doesNotExist",

lib/tools/parser_getter_setter/generator.dart

@@ -1,5 +1,15 @@
 import 'package:angular/core/parser/parser_library.dart';
 
+// TODO(deboer): Remove this duplicated code.
+// From https://www.dartlang.org/docs/spec/latest/dart-language-specification.html#h.huusvrzea3q
+List<String> RESERVED_DART_KEYWORDS = [
+    "assert", "break", "case", "catch", "class", "const", "continue",
+    "default", "do", "else", "enum", "extends", "false", "final",
+    "finally", "for", "if", "in", "is", "new", "null", "rethrow",
+    "return", "super", "switch", "this", "throw", "true", "try",
+    "var", "void", "while", "with"];
+isReserved(String key) => RESERVED_DART_KEYWORDS.contains(key);
+
 class _AST implements ParserAST {
   bool get assignable => true;
 }
@@ -50,7 +60,8 @@ class ParserGetterSetter {
     print(generateCode(backend.identifiers.keys.toList()));
   }
 
-  generateCode(List<String> keys) {
+  generateCode(Iterable<String> keys) {
+    keys = keys.where((key) => !isReserved(key));
     return '''
 class StaticGetterSetter extends GetterSetter {
   Map<String, Function> _getters = ${generateGetterMap(keys)};
@@ -68,12 +79,12 @@ class StaticGetterSetter extends GetterSetter {
 ''';
   }
 
-  generateGetterMap(List<String> keys) {
+  generateGetterMap(Iterable<String> keys) {
     var lines = keys.map((key) => 'r"${key}": (s) => s.$key');
     return '{\n   ${lines.join(",\n    ")}\n  }';
   }
 
-  generateSetterMap(List<String> keys) {
+  generateSetterMap(Iterable<String> keys) {
     var lines = keys.map((key) => 'r"${key}": (s, v) => s.$key = v');
     return '{\n   ${lines.join(",\n    ")}\n  }';
   }

test/core/parser/generated_parser_spec.dart

@@ -4,10 +4,18 @@ import '../../_specs.dart';
 import 'parser_spec.dart' as parser_spec;
 import 'generated_functions.dart' as generated_functions;
 
+class AlwaysThrowError implements DynamicParser {
+  call(String x) { throw "Fall-thru to DynamicParser disabled [$x]"; }
+  primaryFromToken(Token token, parserError) => null;
+}
+
+
 main() {
   describe('generated parser', () {
     beforeEach(module((Module module) {
       module.type(Parser, implementedBy: StaticParser);
+      module.type(DynamicParser, implementedBy: AlwaysThrowError);
+
       module.factory(StaticParserFunctions, (Injector injector) {
         return generated_functions.functions(injector.get(FilterMap));
       });