Begin refactoring compiler out of diet parser and scanner

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 112 matching lines @@
 import 'dart_types.dart' show DartType;
 import 'elements/elements.dart';
 import 'elements/modelx.dart'
     show
         BaseFunctionElementX,
         ClassElementX,
         GetterElementX,
         LibraryElementX,
         MetadataAnnotationX,
         SetterElementX;
+import 'id_generator.dart';
 import 'js_backend/js_backend.dart' show JavaScriptBackend;
 import 'library_loader.dart' show LibraryLoader;
 import 'options.dart' show ParserOptions;
 import 'parser/listener.dart' show Listener, ParserError;
 import 'parser/element_listener.dart' show ElementListener;
 import 'parser/member_listener.dart' show MemberListener;
 import 'parser/partial_elements.dart' show PartialClassElement;
 import 'parser/partial_parser.dart' show PartialParser;
 import 'parser/parser.dart' show Parser;
 import 'scanner/scanner.dart' show Scanner;
@@ skipping 26 matching lines @@
         return loader.processLibraryTags(patchLibrary);
       });
     });
   }
 
   void scanLibraryElements(CompilationUnitElement compilationUnit) {
     measure(() {
       // TODO(johnniwinther): Test that parts and exports are handled correctly.
       Script script = compilationUnit.script;
       Token tokens = new Scanner(script.file).tokenize();
-      Function idGenerator = compiler.getNextFreeClassId;
       Listener patchListener =
-          new PatchElementListener(compiler, compilationUnit, idGenerator);
+          new PatchElementListener(compiler, compilationUnit, compiler);
       try {
         new PartialParser(patchListener, parserOptions).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");
       }
     });
   }
@@ skipping 60 matching lines @@
 
   Token parseClassBody(Token token) => fullParseClassBody(token);
 }
 
 /**
  * Extension of [ElementListener] for parsing patch files.
  */
 class PatchElementListener extends ElementListener implements Listener {
   final Compiler compiler;
 
-  PatchElementListener(
-      Compiler compiler, CompilationUnitElement patchElement, int idGenerator())
+  PatchElementListener(Compiler compiler, CompilationUnitElement patchElement,
+      IdGenerator idGenerator)
       : this.compiler = compiler,
         super(compiler.parsing.getScannerOptionsFor(patchElement),
             compiler.reporter, patchElement, idGenerator);
 
   @override
   void pushElement(Element patch) {
     popMetadata(patch);
 
     PatchVersion patchVersion = getPatchVersion(compiler, patch);
     if (patchVersion != null) {
@@ skipping 338 matching lines @@
 
 class PatchVersion {
   final String tag;
 
   const PatchVersion(this.tag);
 
   bool isActive(String patchTag) => tag == null || tag == patchTag;
 
   String toString() => 'PatchVersion($tag)';
 }