Revert revision 33053

third_party/pkg/angular/lib/tools/parser_generator/dart_code_gen.dart

Index: third_party/pkg/angular/lib/tools/parser_generator/dart_code_gen.dart
===================================================================
--- third_party/pkg/angular/lib/tools/parser_generator/dart_code_gen.dart	(revision 33054)
+++ third_party/pkg/angular/lib/tools/parser_generator/dart_code_gen.dart	(working copy)
@@ -1,6 +1,6 @@
 library dart_code_gen;
 
-import 'package:angular/utils.dart' show isReservedWord;
+import 'package:angular/tools/reserved_dart_keywords.dart';
 import 'package:angular/core/parser/syntax.dart';
 
 escape(String s) => s.replaceAllMapped(new RegExp(r'(\"|\$|\n)'), (m) {
@@ -44,13 +44,10 @@
   String lookupSetter(String key) => setters.lookup(key);
 
   String lookupAccessor(String key) {
-    if (state == STATE_EVAL) {
-      return lookupGetter(key);
-    } else if (state == STATE_EVAL_HOLDER) {
-      return lookupHolder(key);
-    } else {
-      assert(state == STATE_ASSIGN);
-      return lookupSetter(key);
+    switch (state) {
+      case STATE_EVAL: return lookupGetter(key);
+      case STATE_EVAL_HOLDER: return lookupHolder(key);
+      case STATE_ASSIGN: return lookupSetter(key);
     }
   }
 
@@ -229,7 +226,7 @@
   String lookup(String key) {
     String name = _computeName(key);
     if (helpers.containsKey(key)) return name;
-    helpers[key] = isReservedWord(key)
+    helpers[key] = isReserved(key)
         ? templateForReserved(name, key)
         : template(name, key);
     return name;