Refactor resolution of foreign calls.

pkg/compiler/lib/src/native/enqueue.dart

 // Copyright (c) 2014, 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.
 
 part of native;
 
 /**
  * This could be an abstract class but we use it as a stub for the dart_backend.
  */
 class NativeEnqueuer {
@@ skipping 16 matching lines @@
   void registerFieldLoad(Element field) {}
 
   /// Computes types instantiated due to setting a native field.
   void registerFieldStore(Element field) {}
 
   NativeBehavior getNativeBehaviorOf(Send node) => new NativeBehavior();
 
   /// Returns whether native classes are being used.
   bool hasInstantiatedNativeClasses() => false;
 
-  /**
-   * Handles JS-calls, which can be an instantiation point for types.
-   *
-   * For example, the following code instantiates and returns native classes
-   * that are `_DOMWindowImpl` or a subtype.
-   *
-   *     JS('_DOMWindowImpl', 'window')
-   *
-   */
-  // TODO(sra): The entry from codegen will not have a resolver.
-  void registerJsCall(Send node, ResolverVisitor resolver) {}
-
-  /**
-   * Handles JS-embedded global calls, which can be an instantiation point for
-   * types.
-   *
-   * For example, the following code instantiates and returns a String class
-   *
-   *     JS_EMBEDDED_GLOBAL('String', 'foo')
-   *
-   */
-  // TODO(sra): The entry from codegen will not have a resolver.
-  void registerJsEmbeddedGlobalCall(Send node, ResolverVisitor resolver) {}
-
-  /**
-   * Handles JS-compiler builtin calls, which can be an instantiation point for
-   * types.
-   *
-   * For example, the following code instantiates and returns a String class
-   *
-   *     JS_BUILTIN('String', 'int2string', 0)
-   *
-   */
-  // TODO(sra): The entry from codegen will not have a resolver.
-  void registerJsBuiltinCall(Send node, ResolverVisitor resolver) {}
-
   /// Emits a summary information using the [log] function.
   void logSummary(log(message)) {}
 
   // Do not use annotations in dart2dart.
   ClassElement get annotationCreatesClass => null;
   ClassElement get annotationReturnsClass => null;
   ClassElement get annotationJsNameClass => null;
 }
 
 
@@ skipping 399 matching lines @@
   }
 
   void registerFieldLoad(Element field) {
     registerNativeBehavior(NativeBehavior.ofFieldLoad(field, compiler), field);
   }
 
   void registerFieldStore(Element field) {
     registerNativeBehavior(NativeBehavior.ofFieldStore(field, compiler), field);
   }
 
-  void registerJsCall(Send node, ResolverVisitor resolver) {
-    NativeBehavior behavior = NativeBehavior.ofJsCall(node, compiler, resolver);
-    registerNativeBehavior(behavior, node);
-    nativeBehaviors[node] = behavior;
-  }
-
-  void registerJsEmbeddedGlobalCall(Send node, ResolverVisitor resolver) {
-    NativeBehavior behavior =
-        NativeBehavior.ofJsEmbeddedGlobalCall(node, compiler, resolver);
-    registerNativeBehavior(behavior, node);
-    nativeBehaviors[node] = behavior;
-  }
-
-  void registerJsBuiltinCall(Send node, ResolverVisitor resolver) {
-    NativeBehavior behavior =
-        NativeBehavior.ofJsBuiltinCall(node, compiler, resolver);
-    registerNativeBehavior(behavior, node);
-    nativeBehaviors[node] = behavior;
-  }
-
   NativeBehavior getNativeBehaviorOf(Send node) => nativeBehaviors[node];
 
   processNativeBehavior(NativeBehavior behavior, cause) {
     // TODO(ahe): Is this really a global dependency?
     Registry registry = compiler.globalDependencies;
     bool allUsedBefore = unusedClasses.isEmpty;
     for (var type in behavior.typesInstantiated) {
       if (matchedTypeConstraints.contains(type)) continue;
       matchedTypeConstraints.add(type);
       if (type is SpecialType) {
@@ skipping 93 matching lines @@
       } else {
         tagOwner[tag] = classElement;
       }
     }
   }
 
   void logSummary(log(message)) {
     log('Resolved ${registeredClasses.length} native elements used, '
         '${unusedClasses.length} native elements dead.');
   }
+
+  /**
+   * Handles JS-calls, which can be an instantiation point for types.
+   *
+   * For example, the following code instantiates and returns native classes
+   * that are `_DOMWindowImpl` or a subtype.
+   *
+   *     JS('_DOMWindowImpl', 'window')
+   *
+   */
+  void registerJsCall(Send node, ForeignResolver resolver) {
+    NativeBehavior behavior = NativeBehavior.ofJsCall(node, compiler, resolver);
+    registerNativeBehavior(behavior, node);
+    nativeBehaviors[node] = behavior;
+  }
+
+
+  /**
+   * Handles JS-embedded global calls, which can be an instantiation point for
+   * types.
+   *
+   * For example, the following code instantiates and returns a String class
+   *
+   *     JS_EMBEDDED_GLOBAL('String', 'foo')
+   *
+   */
+  void registerJsEmbeddedGlobalCall(Send node, ForeignResolver resolver) {
+    NativeBehavior behavior =
+        NativeBehavior.ofJsEmbeddedGlobalCall(node, compiler, resolver);
+    registerNativeBehavior(behavior, node);
+    nativeBehaviors[node] = behavior;
+  }
+
+
+  /**
+   * Handles JS-compiler builtin calls, which can be an instantiation point for
+   * types.
+   *
+   * For example, the following code instantiates and returns a String class
+   *
+   *     JS_BUILTIN('String', 'int2string', 0)
+   *
+   */
+  void registerJsBuiltinCall(Send node, ForeignResolver resolver) {
+    NativeBehavior behavior =
+        NativeBehavior.ofJsBuiltinCall(node, compiler, resolver);
+    registerNativeBehavior(behavior, node);
+    nativeBehaviors[node] = behavior;
+  }
 }
 
 
 class NativeCodegenEnqueuer extends NativeEnqueuerBase {
 
   final CodeEmitterTask emitter;
 
   final Set<ClassElement> doneAddSubtypes = new Set<ClassElement>();
 
   NativeCodegenEnqueuer(Enqueuer world, Compiler compiler, this.emitter)
@@ skipping 48 matching lines @@
         superclass,
         () => <ClassElement>[]);
     directSubtypes.add(cls);
   }
 
   void logSummary(log(message)) {
     log('Compiled ${registeredClasses.length} native classes, '
         '${unusedClasses.length} native classes omitted.');
   }
 }