Revert "JS templates"

sdk/lib/_internal/compiler/implementation/ssa/codegen.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.
 
 part of ssa;
 
 class SsaCodeGeneratorTask extends CompilerTask {
 
   final JavaScriptBackend backend;
 
@@ skipping 1631 matching lines @@
         TypeMask receiverType = new TypeMask.nonNullExact(superClass);
         selector = new TypedSelector(receiverType, selector);
         // TODO(floitsch): we know the target. We shouldn't register a
         // dynamic getter.
         world.registerDynamicGetter(selector);
         world.registerGetterForSuperMethod(node.element);
         methodName = backend.namer.invocationName(selector);
       } else {
         methodName = backend.namer.getNameOfInstanceMember(superMethod);
       }
-      push(js.js('#.prototype.#.call(#)', [
-          backend.namer.elementAccess(superClass),
-          methodName, visitArguments(node.inputs, start: 0)]),
-          node);
+      js.PropertyAccess method =
+          backend.namer.elementAccess(superClass)['prototype'][methodName];
+      push(jsPropertyCall(
+          method, "call", visitArguments(node.inputs, start: 0)), node);
     }
   }
 
   visitFieldGet(HFieldGet node) {
     use(node.receiver);
     Element element = node.element;
     if (node.isNullCheck) {
       // We access a JavaScript member we know all objects besides
       // null and undefined have: V8 does not like accessing a member
       // that does not exist.
@@ skipping 52 matching lines @@
     nativeBehavior.typesReturned.forEach((type) {
       if (type is DartType) {
         world.registerInstantiatedType(type, work.resolutionTree);
       }
     });
   }
 
   visitForeign(HForeign node) {
     List<HInstruction> inputs = node.inputs;
     if (node.isJsStatement()) {
-      List<js.Expression> interpolatedExpressions = <js.Expression>[];
-      for (int i = 0; i < inputs.length; i++) {
-        use(inputs[i]);
-        interpolatedExpressions.add(pop());
+      if (!inputs.isEmpty) {
+        compiler.internalError(node, "Foreign statement with inputs.");
       }
-      pushStatement(node.codeTemplate.instantiate(interpolatedExpressions));
+      pushStatement(node.codeAst, node);
     } else {
-      List<js.Expression> interpolatedExpressions = <js.Expression>[];
-      for (int i = 0; i < inputs.length; i++) {
-        use(inputs[i]);
-        interpolatedExpressions.add(pop());
+      if (!inputs.isEmpty) {
+        List<js.Expression> interpolatedExpressions = <js.Expression>[];
+        for (int i = 0; i < inputs.length; i++) {
+          use(inputs[i]);
+          interpolatedExpressions.add(pop());
+        }
+        var visitor = new js.UninterpolateJSExpression(interpolatedExpressions);
+        push(visitor.visit(node.codeAst), node);
+      } else {
+        push(node.codeAst, node);
       }
-      push(node.codeTemplate.instantiate(interpolatedExpressions));
     }
 
     // TODO(sra): Tell world.nativeEnqueuer about the types created here.
     registerForeignTypes(node);
   }
 
   visitForeignNew(HForeignNew node) {
     String jsClassReference = backend.namer.isolateAccess(node.element);
     List<js.Expression> arguments = visitArguments(node.inputs, start: 0);
     // TODO(floitsch): jsClassReference is an Access. We shouldn't treat it
@@ skipping 862 matching lines @@
     }
 
     if (namedParameters.isEmpty) {
       var arguments = [returnType];
       if (!parameterTypes.isEmpty || !optionalParameterTypes.isEmpty) {
         arguments.add(new js.ArrayInitializer.from(parameterTypes));
       }
       if (!optionalParameterTypes.isEmpty) {
         arguments.add(new js.ArrayInitializer.from(optionalParameterTypes));
       }
-      push(js.js('#(#)', [accessHelper('buildFunctionType'), arguments]));
+      push(accessHelper('buildFunctionType')(arguments));
     } else {
       var arguments = [
           returnType,
           new js.ArrayInitializer.from(parameterTypes),
           new js.ObjectInitializer(namedParameters)];
-      push(js.js('#(#)', [accessHelper('buildNamedFunctionType'), arguments]));
+      push(accessHelper('buildNamedFunctionType')(arguments));
     }
   }
 
   void visitReadTypeVariable(HReadTypeVariable node) {
     TypeVariableElement element = node.dartType.element;
     Element helperElement = compiler.findHelper('convertRtiToRuntimeType');
     world.registerStaticUse(helperElement);
 
     use(node.inputs[0]);
     if (node.hasReceiver) {
       if (backend.isInterceptorClass(element.getEnclosingClass())) {
         int index = RuntimeTypes.getTypeVariableIndex(element);
         js.Expression receiver = pop();
         js.Expression helper = backend.namer.elementAccess(helperElement);
-        push(js.js(r'#(#.$builtinTypeInfo && #.$builtinTypeInfo[#])',
-                [helper, receiver, receiver, js.js.number(index)]));
+        push(helper(js.js(r'#.$builtinTypeInfo && #.$builtinTypeInfo[#]',
+                          [receiver, receiver, js.js.toExpression(index)])));
       } else {
         backend.emitter.registerReadTypeVariable(element);
-        push(js.js('#.#()',
-                [pop(), backend.namer.readTypeVariableName(element)]));
+        push(
+            js.js('#.${backend.namer.readTypeVariableName(element)}()', pop()));
       }
     } else {
-      push(js.js('#(#)', [
+      push(
           backend.namer.elementAccess(
-              compiler.findHelper('convertRtiToRuntimeType')),
-          pop()]));
+              compiler.findHelper('convertRtiToRuntimeType'))(pop()));
     }
   }
 
   void visitInterfaceType(HInterfaceType node) {
     List<js.Expression> typeArguments = <js.Expression>[];
     for (HInstruction type in node.inputs) {
       use(type);
       typeArguments.add(pop());
     }
 
     ClassElement cls = node.dartType.element;
     var arguments = [
         backend.namer.elementAccess(backend.getImplementationClass(cls))];
     if (!typeArguments.isEmpty) {
       arguments.add(new js.ArrayInitializer.from(typeArguments));
     }
-    push(js.js('#(#)', [accessHelper('buildInterfaceType'), arguments]));
+    push(accessHelper('buildInterfaceType')(arguments));
   }
 
   void visitVoidType(HVoidType node) {
-    push(js.js('#()', accessHelper('getVoidRuntimeType')));
+    push(accessHelper('getVoidRuntimeType')());
   }
 
   void visitDynamicType(HDynamicType node) {
-    push(js.js('#()', accessHelper('getDynamicRuntimeType')));
+    push(accessHelper('getDynamicRuntimeType')());
   }
 
   js.PropertyAccess accessHelper(String name) {
     Element helper = compiler.findHelper(name);
     if (helper == null) {
       // For mocked-up tests.
       return js.js('(void 0).$name');
     }
     world.registerStaticUse(helper);
     return backend.namer.elementAccess(helper);
   }
 }