Internal libraries supported.

sdk/lib/_internal/compiler/implementation/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 118 matching lines @@
 
   /**
    * Scans a library patch file, applies the method patches and
    * injections to the library, and returns a list of class
    * patches.
    */
   void patchLibrary(leg.LibraryDependencyHandler handler,
                     Uri patchUri, LibraryElement originLibrary) {
 
     leg.Script script = compiler.readScript(patchUri, null);
-    var patchLibrary = new LibraryElementX(script, patchUri, originLibrary);
-    handler.registerNewLibrary(patchLibrary);
-    LinkBuilder<tree.LibraryTag> imports = new LinkBuilder<tree.LibraryTag>();
-    compiler.withCurrentElement(patchLibrary.entryCompilationUnit, () {
-      // This patches the elements of the patch library into [library].
-      // Injected elements are added directly under the compilation unit.
-      // Patch elements are stored on the patched functions or classes.
-      scanLibraryElements(patchLibrary.entryCompilationUnit, imports);
+    var patchLibrary =
+        new LibraryElementX(script, originLibrary.uri, originLibrary);
+    compiler.withCurrentElement(patchLibrary, () {
+      handler.registerNewLibrary(patchLibrary);
+      LinkBuilder<tree.LibraryTag> imports = new LinkBuilder<tree.LibraryTag>();
+      compiler.withCurrentElement(patchLibrary.entryCompilationUnit, () {
+        // This patches the elements of the patch library into [library].
+        // Injected elements are added directly under the compilation unit.
+        // Patch elements are stored on the patched functions or classes.
+        scanLibraryElements(patchLibrary.entryCompilationUnit, imports);
+      });
+      // After scanning declarations, we handle the import tags in the patch.
+      // TODO(lrn): These imports end up in the original library and are in
+      // scope for the original methods too. This should be fixed.
+      compiler.importHelperLibrary(originLibrary);
+      for (tree.LibraryTag tag in imports.toLink()) {
+        compiler.libraryLoader.registerLibraryFromTag(handler, patchLibrary, tag);

[ngeoffray, 2013/01/16 15:40:57]

line too long

[Johnni Winther, 2013/01/21 09:27:54]

Done.

+      }
     });
-    // After scanning declarations, we handle the import tags in the patch.
-    // TODO(lrn): These imports end up in the original library and are in
-    // scope for the original methods too. This should be fixed.
-    compiler.importHelperLibrary(originLibrary);
-    for (tree.LibraryTag tag in imports.toLink()) {
-      compiler.libraryLoader.registerLibraryFromTag(handler, patchLibrary, tag);
-    }
   }
 
   void scanLibraryElements(
         CompilationUnitElement compilationUnit,
         LinkBuilder<tree.LibraryTag> imports) {
     measure(() {
       // TODO(lrn): Possibly recursively handle #source directives in patch.
       leg.Script script = compilationUnit.script;
       Token tokens = new StringScanner(script.text).tokenize();
       Function idGenerator = compiler.getNextFreeClassId;
@@ skipping 334 matching lines @@
 }
 
 // TODO(ahe): Get rid of this class.
 class PatchMetadataAnnotation extends MetadataAnnotationX {
   final leg.Constant value = null;
 
   PatchMetadataAnnotation() : super(STATE_DONE);
 
   Token get beginToken => null;
 }