Extract CallStructure from Selector.

pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.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.
 
 part of dart2js.js_emitter;
 
 class ClassEmitter extends CodeEmitterHelper {
 
   ClassStubGenerator get _stubGenerator =>
       new ClassStubGenerator(compiler, namer, backend);
@@ skipping 30 matching lines @@
     emitInstanceMembers(cls, builder);
     emitStubs(cls.callStubs, builder);
     emitStubs(cls.typeVariableReaderStubs, builder);
     emitRuntimeTypeInformation(cls, builder);
     emitNativeInfo(cls, builder);
 
     if (classElement == backend.closureClass) {
       // We add a special getter here to allow for tearing off a closure from
       // itself.
       jsAst.Fun function = js('function() { return this; }');
-      String name = namer.getterForPublicMember(Compiler.CALL_OPERATOR_NAME);
+      String name = namer.getterForMember(Selector.CALL_NAME);
       builder.addProperty(name, function);
     }
 
     emitClassBuilderWithReflectionData(cls, builder, enclosingBuilder);
   }
   /**
   * Emits the precompiled constructor when in CSP mode.
   */
   void emitConstructorsForCSP(Class cls) {
     List<String> fieldNames = <String>[];
@@ skipping 34 matching lines @@
       assert(container is Library);
       assert(emitStatics);
       fields = container.staticFieldsForReflection;
     }
 
     var fieldMetadata = [];
     bool hasMetadata = false;
     bool fieldsAdded = false;
 
     for (Field field in fields) {
-      VariableElement fieldElement = field.element;
+      FieldElement fieldElement = field.element;
       String name = field.name;
       String accessorName = field.accessorName;
       bool needsGetter = field.needsGetter;
       bool needsSetter = field.needsUncheckedSetter;
 
         // Ignore needsCheckedSetter - that is handled below.
       bool needsAccessor = (needsGetter || needsSetter);
       // We need to output the fields for non-native classes so we can auto-
       // generate the constructor.  For native classes there are no
       // constructors, so we don't need the fields unless we are generating
       // accessors at runtime.
       bool needsFieldsForConstructor = !emitStatics && !classIsNative;
       if (needsFieldsForConstructor || needsAccessor) {
         var metadata =
             task.metadataCollector.buildMetadataFunction(fieldElement);
         if (metadata != null) {
           hasMetadata = true;
         } else {
           metadata = new jsAst.LiteralNull();
         }
         fieldMetadata.add(metadata);
         recordMangledField(fieldElement, accessorName,
-            namer.privateName(fieldElement.library, fieldElement.name));
+            namer.privateName(fieldElement.memberName));
         String fieldName = name;
         String fieldCode = '';
         String reflectionMarker = '';
         if (!needsAccessor) {
           // Emit field for constructor generation.
           assert(!classIsNative);
         } else {
           // Emit (possibly renaming) field name so we can add accessors at
           // runtime.
           if (name != accessorName) {
@@ skipping 229 matching lines @@
     } else {
       throw new SpannableAssertionFailure(
           element, 'Expected a ClassElement or a LibraryElement.');
     }
 
     // If the class is never instantiated we still need to set it up for
     // inheritance purposes, but we can simplify its JavaScript constructor.
     bool isInstantiated =
         compiler.codegenWorld.directlyInstantiatedClasses.contains(element);
 
-    void visitField(Element holder, VariableElement field) {
+    void visitField(Element holder, FieldElement field) {
       assert(invariant(element, field.isDeclaration));
       String name = field.name;
 
       // Keep track of whether or not we're dealing with a field mixin
       // into a native class.
       bool isMixinNativeField =
           isClass && element.isNative && holder.isMixinApplication;
 
       // See if we can dynamically create getters and setters.
       // We can only generate getters and setters for [element] since
@@ skipping 154 matching lines @@
         ? new Selector.getter(member.name, member.library)
         : new Selector.setter(member.name, member.library);
     String reflectionName = emitter.getReflectionName(selector, name);
     if (reflectionName != null) {
       var reflectable =
           js(backend.isAccessibleByReflection(member) ? '1' : '0');
       builder.addProperty('+$reflectionName', reflectable);
     }
   }
 }