Support the literal kind for native classes (ie Console).

frog/leg/native_emitter.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 NativeEmitter {
 
   Compiler compiler;
   bool addedDynamicFunction = false;
   bool addedTypeNameOfFunction = false;
   bool addedDefPropFunction = false;
@@ skipping 189 matching lines @@
     buffer.add('\n');
   }
 
   void addNativePropertyIfNecessary(StringBuffer buffer) {
     if (addedNativeProperty) return;
     addedNativeProperty = true;
     buffer.add(buildNativePropertyCode());
     buffer.add('\n');
   }
 
+  void generateNativeLiteral(

[kasperl, 2012/03/02 13:11:33]

I think we usually put the first parameter on the previous line.

[ngeoffray, 2012/03/05 08:28:00]

Done.

+      ClassElement classElement, StringBuffer buffer) {
+    String nativeCode = classElement.nativeName.slowToString();

[kasperl, 2012/03/02 13:11:33]

String quotedNative = ...;
String nativeCode = quotedNative.substring(2, ...);

[ngeoffray, 2012/03/05 08:28:00]

Done.

+    nativeCode = nativeCode.substring(2, nativeCode.length - 1);
+    String className = compiler.namer.getName(classElement);
+    buffer.add(className);
+    buffer.add(' = ');
+    buffer.add(nativeCode);
+    buffer.add(';\n');
+
+    String attachTo(name) => "$className.$name";
+
+    for (Element member in classElement.members) {
+      if (member.isInstanceMember()) {
+        compiler.emitter.addInstanceMember(
+            member, attachTo, buffer, isNative: true);
+      }
+    }
+  }
+
+  bool isNativeLiteral(String nativeName) {
+    return nativeName[1] === '=';
+  }
+
+  bool isNativeGlobal(String nativeName) {
+    return nativeName[1] === '@';
+  }
 
   void generateNativeClass(ClassElement classElement, StringBuffer buffer) {
     nativeClasses.add(classElement);
 
     assert(classElement.backendMembers.isEmpty());
     String nativeName = classElement.nativeName.slowToString();
-    if (nativeName[1] === '@') {
+    if (isNativeLiteral(nativeName)) {
+      generateNativeLiteral(classElement, buffer);
+      return;
+    } else if (isNativeGlobal(nativeName)) {

[kasperl, 2012/03/02 13:11:33]

I would probably not make this an else if because of the return in the if. It
makes it look like the return is a mistake. I would even add a newline between
the first if (the returning one) and the next one and maybe comment on the
return.

[ngeoffray, 2012/03/05 08:28:00]

Done.

       // Global object, just be like the other types for now.
       nativeName = nativeName.substring(3, nativeName.length - 1);
     } else {
       nativeName = nativeName.substring(2, nativeName.length - 1);
     }
     bool hasUsedSelectors = false;
 
-    String attachTo(name) => "$dynamicName('$name').$nativeName";
+    String attachTo(String name) {
+      hasUsedSelectors = true;
+      addDynamicFunctionIfNecessary(buffer);
+      return "$dynamicName('$name').$nativeName";
+    }
 
     for (Element member in classElement.members) {
       if (member.isInstanceMember()) {
-        String memberName = compiler.namer.getName(member);
-        if (member.kind === ElementKind.FUNCTION
-            || member.kind === ElementKind.GENERATIVE_CONSTRUCTOR_BODY
-            || member.kind === ElementKind.GETTER
-            || member.kind === ElementKind.SETTER) {
-          String codeBlock = compiler.universe.generatedCode[member];
-          if (codeBlock == null) continue;
-          addDynamicFunctionIfNecessary(buffer);
-          hasUsedSelectors = true;
-          buffer.add(
-              "$dynamicName('$memberName').$nativeName = $codeBlock;\n");
-          codeBlock = compiler.universe.generatedBailoutCode[member];
-          if (codeBlock !== null) {
-            String name = compiler.namer.getBailoutName(member);
-            buffer.add("$dynamicName('$name').$nativeName = $codeBlock;\n");
-          }
-          FunctionElement function = member;
-          FunctionParameters parameters = function.computeParameters(compiler);
-          if (!parameters.optionalParameters.isEmpty()) {
-            compiler.emitter.addParameterStubs(
-                member, attachTo, buffer, isNative: true);
-          }
-        } else if (member.kind === ElementKind.FIELD) {
-          if (compiler.universe.invokedSetters.contains(member.name)) {
-            addDynamicFunctionIfNecessary(buffer);
-            hasUsedSelectors = true;
-            String setterName = compiler.namer.setterName(member.name);
-            buffer.add(
-              "$dynamicName('$setterName').$nativeName = function(v){\n" +
-              '  this.${member.name.slowToString()} = v;\n};\n');
-          }
-          if (compiler.universe.invokedGetters.contains(member.name)) {
-            addDynamicFunctionIfNecessary(buffer);
-            hasUsedSelectors = true;
-            String getterName = compiler.namer.getterName(member.name);
-            buffer.add(
-              "$dynamicName('$getterName').$nativeName = function(){\n" +
-              '  return this.${member.name.slowToString()};\n};\n');
-          }
-        } else {
-          compiler.internalError('unexpected kind: "${member.kind}"',
-                                 element: member);
-        }
-        if (member.kind == ElementKind.GETTER
-            || member.kind == ElementKind.FIELD) {
-          Set<Selector> selectors = compiler.universe.invokedNames[member.name];
-          if (selectors !== null && !selectors.isEmpty()) {
-            emitCallStubForGetter(buffer, attachTo, member, selectors);
-          }
-        } else if (member.kind == ElementKind.FUNCTION) {
-          if (compiler.universe.invokedGetters.contains(member.name)) {
-            emitDynamicFunctionGetter(buffer, attachTo, member);
-          }
-        }
+        compiler.emitter.addInstanceMember(
+            member, attachTo, buffer, isNative: true);
       }
     }
 
     addNativePropertyIfNecessary(buffer);
     // Create an object that contains the is checks properties. The
     // object will be used when entering [buildDynamicIsCheckCode].
     buffer.add('${compiler.namer.ISOLATE}.prototype.native.$nativeName = { ');
     List<String> tests = <String>[];
 
     ClassElement objectClass =
@@ skipping 35 matching lines @@
     // For example, for the following Dart method:
     //   foo([x, y, z]);
     // The call:
     //   foo(y: 1)
     // must be turned into a JS call to:
     //   foo(null, y).
 
     List<String> nativeArgumentsBuffer = argumentsBuffer.getRange(
         0, indexOfLastOptionalArgumentInParameters + 1);
 
+    ClassElement classElement = member.enclosingElement;
+    String nativeName = classElement.nativeName.slowToString();
     String nativeArguments = Strings.join(nativeArgumentsBuffer, ",");
 
+    if (isNativeLiteral(nativeName)) {
+      // If it's the native literal, we know there is no subclass, so
+      // we can call the method directly.
+      buffer.add('    return this.${member.name.slowToString()}');
+      buffer.add('($nativeArguments)');
+      return;
+    }
+
     buffer.add('  if (Object.getPrototypeOf(this).hasOwnProperty(');
     buffer.add("'$invocationName')) {\n");
     buffer.add('    return this.${member.name.slowToString()}');
     buffer.add('($nativeArguments)');
     buffer.add('\n  }\n');
     buffer.add('  return Object.prototype.$invocationName.call(this');
     buffer.add(stubParameters == '' ? '' : ', $stubParameters');
     buffer.add(');');
   }
 
@@ skipping 129 matching lines @@
         entries.add("\n    ['$clsName', ${tagDefns[clsName]}]");
       }
       buffer.add(Strings.join(entries, ','));
       buffer.add('];\n');
       buffer.add('$dynamicSetMetadataName(table);\n');
 
       buffer.add('})();\n');
     }
   }
 }