It's alive!

pkg/compiler/lib/src/js_emitter/full_emitter/container_builder.dart

 // Copyright (c) 2013, 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.
 
 library dart2js.js_emitter.full_emitter.container_builder;
 
 import '../../constants/values.dart';
 import '../../elements/elements.dart'
-    show
-        Element,
-        Elements,
-        FunctionSignature,
-        MetadataAnnotation,
-        MethodElement;
+    show Element, Elements, MetadataAnnotation, MethodElement;
+import '../../elements/entities.dart';
+import '../../elements/names.dart';
 import '../../js/js.dart' as jsAst;
 import '../../js/js.dart' show js;
 import '../js_emitter.dart' hide Emitter, EmitterFactory;
 import '../model.dart';
 import 'emitter.dart';
 
 /// This class should morph into something that makes it easy to build
 /// JavaScript representations of libraries, class-sides, and instance-sides.
 /// Initially, it is just a placeholder for code that is moved from
 /// [CodeEmitterTask].
 class ContainerBuilder extends CodeEmitterHelper {
   void addMemberMethod(DartMethod method, ClassBuilder builder) {
-    MethodElement member = method.element;
+    FunctionEntity member = method.element;
     jsAst.Name name = method.name;
-    FunctionSignature parameters = member.functionSignature;
+    ParameterStructure parameters = member.parameterStructure;
     jsAst.Expression code = method.code;
     bool needsStubs = method.parameterStubs.isNotEmpty;
     bool canBeApplied = method.canBeApplied;
     bool canBeReflected = method.canBeReflected;
     bool canTearOff = method.needsTearOff;
     jsAst.Name tearOffName = method.tearOffName;
     bool isClosure = method is InstanceMethod && method.isClosureCallMethod;
     jsAst.Name superAlias = method is InstanceMethod ? method.aliasName : null;
     bool hasSuperAlias = superAlias != null;
     jsAst.Expression memberTypeExpression = method.functionType;
@@ skipping 68 matching lines @@
 
     jsAst.Literal callSelectorString;
     if (method.callName == null) {
       callSelectorString = new jsAst.LiteralNull();
     } else {
       callSelectorString = js.quoteName(method.callName);
     }
 
     // On [requiredParameterCount], the lower bit is set if this method can be
     // called reflectively.
-    int requiredParameterCount = parameters.requiredParameterCount << 1;
-    if (member.isAccessor) requiredParameterCount++;
+    int requiredParameterCount = parameters.requiredParameters << 1;
+    if (member.isGetter || member.isSetter) requiredParameterCount++;
 
-    int optionalParameterCount = parameters.optionalParameterCount << 1;
-    if (parameters.optionalParametersAreNamed) optionalParameterCount++;
+    int optionalParameterCount = parameters.optionalParameters << 1;
+    if (parameters.namedParameters.isNotEmpty) optionalParameterCount++;
 
     List tearOffInfo = [callSelectorString];
 
     for (ParameterStubMethod stub in method.parameterStubs) {
       jsAst.Name invocationName = stub.name;
       emitter.interceptorEmitter
           .recordMangledNameOfMemberMethod(member, invocationName);
 
       expressions.add(stub.code);
       if (member.isInstanceMember) {
         expressions.add(js.quoteName(invocationName));
       }
       jsAst.Name callName = stub.callName;
       jsAst.Literal callSelectorString =
           (callName == null) ? new jsAst.LiteralNull() : js.quoteName(callName);
       tearOffInfo.add(callSelectorString);
     }
 
     expressions
       ..addAll(tearOffInfo)
-      ..add((tearOffName == null || member.isAccessor)
+      ..add((tearOffName == null || member.isGetter || member.isSetter)
           ? js("null")
           : js.quoteName(tearOffName))
       ..add(js.number(requiredParameterCount))
       ..add(js.number(optionalParameterCount))
       ..add(memberTypeExpression == null ? js("null") : memberTypeExpression)
       ..addAll(task.metadataCollector.reifyDefaultArguments(member));
 
     if (canBeReflected || canBeApplied) {
-      parameters.forEachParameter((Element parameter) {
+      // TODO(johnniwinther): Support entities.
+      MethodElement method = member;
+      method.functionSignature.forEachParameter((Element parameter) {
         expressions.add(task.metadataCollector.reifyName(parameter.name));
         if (backend.mirrorsData.mustRetainMetadata) {
           Iterable<jsAst.Expression> metadataIndices =
               parameter.metadata.map((MetadataAnnotation annotation) {
             ConstantValue constant =
                 backend.constants.getConstantValueForMetadata(annotation);
             backend.constants.addCompileTimeConstantForEmission(constant);
             return task.metadataCollector.reifyMetadata(annotation);
           });
           expressions.add(new jsAst.ArrayInitializer(metadataIndices.toList()));
         }
       });
     }
+    Name memberName = new Name(member.name, member.library);
     if (canBeReflected) {
       jsAst.LiteralString reflectionName;
       if (member.isConstructor) {
         // TODO(herhut): This registers name as a mangled name. Do we need this
         //               given that we use a different name below?
         emitter.getReflectionName(member, name);
         reflectionName = new jsAst.LiteralString(
             '"new ${Elements.reconstructConstructorName(member)}"');
       } else {
-        reflectionName = js.string(namer.privateName(member.memberName));
+        reflectionName = js.string(namer.privateName(memberName));
       }
       expressions
         ..add(reflectionName)
         ..addAll(task.metadataCollector.computeMetadata(member));
     } else if (isClosure && canBeApplied) {
-      expressions.add(js.string(namer.privateName(member.memberName)));
+      expressions.add(js.string(namer.privateName(memberName)));
     }
 
     jsAst.ArrayInitializer arrayInit =
         new jsAst.ArrayInitializer(expressions.toList());
     compiler.dumpInfoTask
         .registerElementAst(member, builder.addProperty(name, arrayInit));
   }
 
   void addMemberField(Field field, ClassBuilder builder) {
     // For now, do nothing.
   }
 }