Make remaining dart2js unit tests pass.

pkg/compiler/lib/src/patch_parser.dart

 // Copyright (c) 2012, 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.
 
 /**
  * This library contains the infrastructure to parse and integrate patch files.
  *
  * Three types of elements can be patched: [LibraryElement], [ClassElement],
  * [FunctionElement]. Patches are introduced in patch libraries which are loaded
  * together with the corresponding origin library. Which libraries that are
@@ skipping 119 matching lines @@
         LibraryElementX,
         MetadataAnnotationX,
         SetterElementX;
 import 'id_generator.dart';
 import 'js_backend/js_backend.dart' show JavaScriptBackend;
 import 'library_loader.dart' show LibraryLoader;
 import 'parser/element_listener.dart' show ElementListener;
 import 'package:dart_parser/dart_parser.dart'
     show Listener, Parser, ParserError;
 import 'parser/member_listener.dart' show MemberListener;
-import 'parser/partial_elements.dart' show PartialClassElement, PartialParser;
+import 'parser/partial_elements.dart'
+    show ClassElementParser, PartialClassElement;
 import 'script.dart';
 import 'package:dart_scanner/dart_scanner.dart' show StringToken, Token;
-import 'parser/diet_parser_task.dart' show DietParser;
+import 'parser/diet_parser_task.dart' show PartialParser;
 
 class PatchParserTask extends CompilerTask {
   final String name = "Patching Parser";
   final Compiler compiler;
   DiagnosticReporter get reporter => compiler.reporter;
 
   PatchParserTask(Compiler compiler)
       : compiler = compiler,
         super(compiler.measurer);
 
@@ skipping 20 matching lines @@
   }
 
   void scanLibraryElements(CompilationUnitElement compilationUnit) {
     measure(() {
       // TODO(johnniwinther): Test that parts and exports are handled correctly.
       Script script = compilationUnit.script;
       Token tokens = compiler.scanner.scanFile(script.file);
       Listener patchListener = new PatchElementListener(
           compiler, compilationUnit, compiler.idGenerator);
       try {
-        new DietParser(patchListener).parseUnit(tokens);
+        new PartialParser(patchListener).parseUnit(tokens);
       } on ParserError catch (e) {
         // No need to recover from a parser error in platform libraries, user
         // will never see this if the libraries are tested correctly.
         reporter.internalError(
             compilationUnit, "Parser error in patch file: $e");
       }
     });
   }
 
   void parsePatchClassNode(PartialClassElement cls) {
     // Parse [PartialClassElement] using a "patch"-aware parser instead
     // of calling its [parseNode] method.
     if (cls.cachedNode != null) return;
 
     measure(() => reporter.withCurrentElement(cls, () {
           MemberListener listener = new PatchMemberListener(compiler, cls);
-          Parser parser = new PartialParser(listener);
+          Parser parser = new ClassElementParser(listener);
           try {
             Token token = parser.parseTopLevelDeclaration(cls.beginToken);
             assert(identical(token, cls.endToken.next));
           } on ParserError catch (e) {
             // No need to recover from a parser error in platform libraries,
             // user will never see this if the libraries are tested correctly.
             reporter.internalError(cls, "Parser error in patch file: $e");
           }
           cls.cachedNode = listener.popNode();
           assert(listener.nodes.isEmpty);
@@ skipping 394 matching lines @@
 
 class PatchVersion {
   final String tag;
 
   const PatchVersion(this.tag);
 
   bool isActive(String patchTag) => tag == null || tag == patchTag;
 
   String toString() => 'PatchVersion($tag)';
 }