frog: better binding of methods.

frog/gen.dart

 // Copyright (c) 2011, 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.
 
 /**
  * Top level generator object for writing code and keeping track of
  * dependencies.
  *
  * Should have two compilation models, but only one implemented so far.
  *
@@ skipping 30 matching lines @@
     if (options.compileAll) {
       markLibrariesUsed(
           [world.coreimpl, world.corelib, main.declaringType.library]);
     } else {
       // TODO(jimhug): Better way to capture hidden control flow.
       world.corelib.types['BadNumberFormatException'].markUsed();
       world.coreimpl.types['NumImplementation'].markUsed();
       world.coreimpl.types['StringImplementation'].markUsed();
       genMethod(
           world.coreimpl.types['StringImplementation'].getMember('contains'));
+      if (world.corelib.types['String'].isUsed) {

[Jennifer Messerly, 2011/12/15 01:13:14]

Can you move this annotation to String.split? in other words:
  List<String> split(Pattern pattern) native { new List<String>(); }

[Siggi Cherem (dart-lang), 2011/12/15 04:35:56]

Done. Just checking - is this safe? I thought we still use the 'native' body to
generate code.

+        // 'String.split' creates a list.
+        world.coreimpl.types['ListFactory'].markUsed();
+      }
     }
 
     // Only include isolate-specific code if isolates are used.
     if (world.corelib.types['Isolate'].isUsed
         || world.coreimpl.types['ReceivePortImpl'].isUsed) {
 
       // Generate callbacks from JS to isolate code if needed
       if (corejs.useWrap0 || corejs.useWrap1) {
         genMethod(world.coreimpl.types['IsolateContext'].getMember('eval'));
         genMethod(world.coreimpl.types['EventLoop'].getMember('run'));
@@ skipping 157 matching lines @@
       // e.g. window.console.log$1
       return '${type.jsname}.$name';
     } else if (type.isHiddenNativeType) {
       corejs.ensureDynamicProto();
       return '\$dynamic("$name").${type.jsname}';
     } else {
       return '${type.jsname}.prototype.$name';
     }
   }
 
+  String _boundMethod(Type type, String name) {

[Jennifer Messerly, 2011/12/15 01:13:14]

nice!

fwiw, I think you could do all of these with:
"this.$name.bind(this);"

or if that doesn't work, it'd be good to understand why

[Siggi Cherem (dart-lang), 2011/12/15 04:35:56]

cool, that seems to work. given that it became so simple, I inlined this back
into _maybeGenerateBoundGetter

+    if (type.isSingletonNative) {
+      return '${type.jsname}.$name.bind(${type.jsname})';
+    } else if (type.isHiddenNativeType) {
+      return 'Object.getPrototype(this).${type.jsname}.bind(this)';
+    } else {
+      return '${type.jsname}.prototype.$name.bind(this)';
+    }
+  }
+
   _maybeIsTest(Type onType, Type checkType) {
     bool isSubtype = onType.isSubtypeOf(checkType);
     if (checkType.isTested) {
       // TODO(jmesserly): cache these functions? they just return true or false.
       writer.writeln(_prototypeOf(onType, 'is\$${checkType.jsname}')
           + ' = function(){return $isSubtype};');
     }
 
     if (checkType.isChecked) {
       String body = 'return this';
@@ skipping 221 matching lines @@
         writer.writeln(property.setter == null ? '' : ',');
       }
       if (property.setter != null) {
         writer.writeln(
           'set: ${property.declaringType.jsname}.prototype.${property.setter.jsname}');
       }
       writer.exitBlock('});');
     }
   }
 
-  _writeMethod(Member method) {
-    if (method.generator != null) {
-      method.generator.writeDefinition(writer, null);
+  _writeMethod(Member m) {
+    if (m.generator != null) {
+      m.generator.writeDefinition(writer, null);
+    } else if (m is MethodMember && m.isNative
+        && m.dynamic._providePropertySyntax && !m.dynamic._provideFieldSyntax) {

[Jennifer Messerly, 2011/12/15 01:13:14]

perhaps put these on member?

[Siggi Cherem (dart-lang), 2011/12/15 04:35:56]

Done.

+      MethodGenerator._maybeGenerateBoundGetter(m, writer);
     }
   }
 
   writeGlobals() {
     if (globals.length > 0) {
       writer.comment('//  ********** Globals **************');
       var list = globals.getValues();
       list.sort((a, b) => a.compareTo(b));
 
       // put all static field initializations in a method
@@ skipping 372 matching lines @@
     }
     if (method.isConstructor && method.constructorName != '') {
       defWriter.writeln(
         '${method.declaringType.jsname}.${method.constructorName}\$ctor.prototype = ' +
         '${method.declaringType.jsname}.prototype;');
     }
 
     _provideOptionalParamInfo(defWriter);
 
     if (method is MethodMember) {
       MethodMember m = method;

[Jennifer Messerly, 2011/12/15 01:13:14]

shouldn't need this line anymore

[Siggi Cherem (dart-lang), 2011/12/15 04:35:56]

Done.

-      if (m._providePropertySyntax) {
-        defWriter.enterBlock('${m.declaringType.jsname}.prototype'
-            + '.get\$${m.jsname} = function() {');
-        // TODO(jimhug): Bind not available in older Safari, need fallback?
-        defWriter.writeln('return ${m.declaringType.jsname}.prototype.'
-            + '${m.jsname}.bind(this);');
-        defWriter.exitBlock('}');
+      _maybeGenerateBoundGetter(m, defWriter);
+    }
+  }
 
-        if (m._provideFieldSyntax) {
-          world.internalError('bound m accessed with field syntax');
-        }
+  static _maybeGenerateBoundGetter(MethodMember m, CodeWriter defWriter) {
+    if (m._providePropertySyntax && !m.declaringType.isSingletonNative) {

[Jennifer Messerly, 2011/12/15 01:13:14]

why are singleton natives excluded?

[Siggi Cherem (dart-lang), 2011/12/15 04:35:56]

nice catch - this was intended to be a temporary check I had while I was working
out a solution in _boundMethod.

+      defWriter.enterBlock(
+          world.gen._prototypeOf(m.declaringType, "get\$" + m.jsname) 
+          + ' = function() {');
+      // TODO(jimhug): Bind not available in older Safari, need fallback?
+      defWriter.writeln('return '
+          + world.gen._boundMethod(m.declaringType, m.jsname));
+      defWriter.exitBlock('}');
+
+      if (m._provideFieldSyntax) {
+        world.internalError('bound "${m.name}" accessed with field syntax',
+            m.definition.span);
       }
     }
   }
 
   /**
    * Generates information about the default/named arguments into the JS code.
    * Only methods that are passed as bound methods to "var" need this. It is
    * generated to support run time stub creation.
    */
   _provideOptionalParamInfo(CodeWriter defWriter) {
@@ skipping 566 matching lines @@
     var item = _scope.create(itemName, itemType, node.item.name.span, isFinal);
     Value listVar = list;
     if (list.needsTemp) {
       listVar = _scope.create('\$list', list.type, null);
       writer.writeln('var ${listVar.code} = ${list.code};');
     }
 
     // Special path for list for readability and perf optimization.
     if (list.type.isList) {
       var tmpi = _scope.create('\$i', world.numType, null);
+      var listLength = listVar.get_(this, 'length', node.list);

[Jennifer Messerly, 2011/12/15 01:13:14]

nice fix. old code was nasty :)

[Siggi Cherem (dart-lang), 2011/12/15 04:35:56]

thx.

       writer.enterBlock('for (var ${tmpi.code} = 0;' +
-          '${tmpi.code} < ${listVar.code}.length; ${tmpi.code}++) {');
+          '${tmpi.code} < ${listLength.code}; ${tmpi.code}++) {');
       var value = listVar.invoke(this, ':index', node.list,
           new Arguments(null, [tmpi]));
       writer.writeln('var ${item.code} = ${value.code};');
     } else {
       _pushBlock();
       var iterator = list.invoke(this, 'iterator', node.list, Arguments.EMPTY);
       var tmpi = _scope.create('\$i', iterator.type, null);
 
       var hasNext = tmpi.invoke(this, 'hasNext', node.list, Arguments.EMPTY);
       var next = tmpi.invoke(this, 'next', node.list, Arguments.EMPTY);
@@ skipping 1056 matching lines @@
       result.add(new Value(world.varType, '\$$i', null, /*needsTemp:*/false));
     }
     for (int i = bareCount; i < length; i++) {
       var name = getName(i);
       if (name == null) name = '\$$i';
       result.add(new Value(world.varType, name, null, /*needsTemp:*/false));
     }
     return new Arguments(nodes, result);
   }
 }