Move helpers and interceptors to own library.

dart/frog/leg/compiler.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.
 
 class WorkItem {
   final Element element;
   TreeElements resolutionTree;
   Function run;
   Map<int, BailoutInfo> bailouts = null;
   bool allowSpeculativeOptimization = true;
@@ skipping 29 matching lines @@
   Queue<WorkItem> worklist;
   Universe universe;
   String assembledCode;
   Namer namer;
   Types types;
   final String currentDirectory;
 
   CompilerTask measuredTask;
   Element _currentElement;
   LibraryElement coreLibrary;
+  LibraryElement coreImplLibrary;
+  LibraryElement jsHelperLibrary;
   LibraryElement mainApp;
 
   Element get currentElement() => _currentElement;
   withCurrentElement(Element element, f()) {
     Element old = currentElement;
     _currentElement = element;
     try {
       return f();
     } finally {
       _currentElement = old;
@@ skipping 76 matching lines @@
     // writes directly into a file.
     if (GENERATE_SSA_TRACE) {
       print("------------------");
       print(new HTracer.singleton());
       print("------------------");
     }
     log('compilation succeeded');
     return true;
   }
 
-  void scanCoreLibrary() {
-    String fileName = io.join([legDirectory, 'lib', 'core.dart']);
+  LibraryElement scanBuiltinLibrary(String filename) {
+    String fileName = io.join([legDirectory, 'lib', filename]);
     Uri cwd = new Uri(scheme: 'file', path: currentDirectory);
     Uri uri = cwd.resolve(fileName);
-    Script script = readScript(uri);
-    coreLibrary = new LibraryElement(script);
-    withCurrentElement(coreLibrary, () => scanner.scan(currentElement));
+    LibraryElement library = scanner.loadLibrary(uri, null);
     // Make our special function a foreign kind.
-    coreLibrary.define(new ForeignElement(
-        const SourceString('JS'), coreLibrary), this);
-    coreLibrary.define(new ForeignElement(
-        const SourceString('UNINTERCEPTED'), coreLibrary), this);
-    coreLibrary.define(new ForeignElement(
-        const SourceString('JS_HAS_EQUALS'), coreLibrary), this);
+    library.define(new ForeignElement(
+        const SourceString('JS'), library), this);
+    library.define(new ForeignElement(
+        const SourceString('UNINTERCEPTED'), library), this);
+    library.define(new ForeignElement(
+        const SourceString('JS_HAS_EQUALS'), library), this);

[ngeoffray, 2012/02/10 08:51:44]

We're defining those guys in all (core, coreimpl, helper) libraries, and I don't
think that's what we want. Can't you just define them in helper?

[ahe, 2012/02/14 12:55:26]

It's not immediately obvious how to do so. I'll try to land this change and
discuss this with you in person. For now, I'm adding a TODO.

+    return library;
+  }
+
+  void scanBuiltinLibraries() {
+    coreLibrary = scanBuiltinLibrary('core.dart');
+    coreImplLibrary = scanBuiltinLibrary('coreimpl.dart');
+    jsHelperLibrary = scanBuiltinLibrary('js_helper.dart');
     // TODO(ngeoffray): Lazily add this method.
     universe.invokedNames[NO_SUCH_METHOD] =
         new Set<Invocation>.from(<Invocation>[new Invocation(2)]);
   }
 
   void enqueueInvokedInstanceMethods() {
     // TODO(floitsch): find a more efficient way of doing this.
     // Run through the classes and see if we need to compile methods.
     for (ClassElement classElement in universe.instantiatedClasses) {
       for (ClassElement currentClass = classElement;
@@ skipping 22 matching lines @@
              if (universe.invokedSetters.contains(member.name)) {
               addToWorklist(member);
             }
           }
         }
       }
     }
   }
 
   void runCompiler(Script script) {
-    scanCoreLibrary();
+    scanBuiltinLibraries();
     mainApp = new LibraryElement(script);
     Element element;
     withCurrentElement(mainApp, () {
         scanner.scan(currentElement);
         element = mainApp.find(MAIN);
         if (element === null) cancel('Could not find $MAIN');
       });
     worklist.add(new WorkItem.toCompile(element));
     do {
       while (!worklist.isEmpty()) {
@@ skipping 93 matching lines @@
   reportWarning(Node node, var message) {}
   reportError(Node node, var message) {}
 
   Script readScript(Uri uri) {
     unimplemented('Compiler.readScript');
   }
 
   String get legDirectory() {
     unimplemented('Compiler.legDirectory');
   }
+
+  Element findHelper(SourceString name) => jsHelperLibrary.find(name);
 }
 
 class CompilerTask {
   final Compiler compiler;
   final Stopwatch watch;
 
   CompilerTask(this.compiler) : watch = new Stopwatch();
 
   String get name() => 'Unknown task';
   int get timing() => watch.elapsedInMs();
@@ skipping 14 matching lines @@
 
 class CompilerCancelledException implements Exception {
   final String reason;
   CompilerCancelledException(this.reason);
 
   String toString() {
     String banner = 'compiler cancelled';
     return (reason !== null) ? '$banner: $reason' : '$banner';
   }
 }