Roll sdk dependency to 34357cdad108dcba734949bd13bd28c76ea285e0

pkg/fletchc/lib/src/fletch_class_builder.dart

 // Copyright (c) 2015, the Fletch 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.md file.
 
 library fletchc.fletch_class_builder;
 
 import 'package:compiler/src/dart_types.dart';
 import 'package:compiler/src/elements/elements.dart';
-import 'package:compiler/src/universe/universe.dart';
+import 'package:compiler/src/universe/selector.dart';
 import 'package:persistent/persistent.dart';
 
 import 'fletch_function_builder.dart';
 import 'fletch_context.dart';
 import 'fletch_backend.dart';
 
 import '../fletch_system.dart';
 import '../commands.dart';
 
 // TODO(ahe): Remove this import.
@@ skipping 129 matching lines @@
 
   void updateImplicitAccessors(FletchBackend backend) {
     _implicitAccessorTable.clear();
     // If we don't have an element (stub class), we don't have anything to
     // generate accessors for.
     if (element == null) return;
     // TODO(ajohnsen): Don't do this once dart2js can enqueue field getters in
     // CodegenEnqueuer.
     int fieldIndex = superclassFields;
     element.implementation.forEachInstanceField((enclosing, field) {
-      var getter = new Selector.getter(field.name, field.library);
+      var getter = new Selector.getter(field.memberName);
       int getterSelector = backend.context.toFletchSelector(getter);
       _implicitAccessorTable[getterSelector] = backend.makeGetter(fieldIndex);
 
       if (!field.isFinal) {
-        var setter = new Selector.setter(field.name, field.library);
+        var setter = new Selector.setter(new Name(field.name, field.library));
         var setterSelector = backend.context.toFletchSelector(setter);
         _implicitAccessorTable[setterSelector] = backend.makeSetter(fieldIndex);
       }
 
       fieldIndex++;
     });
   }
 
   void createIsFunctionEntry(FletchBackend backend, int arity) {
     int fletchSelector = backend.context.toFletchIsSelector(
-        backend.compiler.functionClass);
+        backend.compiler.coreClasses.functionClass);
     addIsSelector(fletchSelector);
     fletchSelector = backend.context.toFletchIsSelector(
-        backend.compiler.functionClass, arity);
+        backend.compiler.coreClasses.functionClass, arity);
     addIsSelector(fletchSelector);
   }
 
   FletchClass finalizeClass(
       FletchContext context,
       List<Command> commands) {
     if (isBuiltin) {
       int nameId = context.getSymbolId(element.name);
       commands.add(new PushBuiltinClass(nameId, fields));
     } else {
@@ skipping 82 matching lines @@
   }
 
   void updateImplicitAccessors(FletchBackend backend) {
     // If we don't have an element (stub class), we don't have anything to
     // generate accessors for.
     if (element == null) return;
     // TODO(ajohnsen): Don't do this once dart2js can enqueue field getters in
     // CodegenEnqueuer.
     int fieldIndex = superclassFields + extraFields;
     element.implementation.forEachInstanceField((enclosing, field) {
-      var getter = new Selector.getter(field.name, field.library);
+      var getter = new Selector.getter(new Name(field.name, field.library));
       int getterSelector = backend.context.toFletchSelector(getter);
       _implicitAccessorTable[getterSelector] = backend.makeGetter(fieldIndex);
 
       if (!field.isFinal) {
-        var setter = new Selector.setter(field.name, field.library);
+        var setter = new Selector.setter(new Name(field.name, field.library));
         var setterSelector = backend.context.toFletchSelector(setter);
         _implicitAccessorTable[setterSelector] = backend.makeSetter(fieldIndex);
       }
 
       fieldIndex++;
     });
 
     for (FieldElement field in _removedFields) {
-      Selector getter = new Selector.getter(field.name, field.library);
+      Selector getter =
+          new Selector.getter(new Name(field.name, field.library));
       int getterSelector = backend.context.toFletchSelector(getter);
       _removedAccessors.add(getterSelector);
 
       if (!field.isFinal) {
-        Selector setter = new Selector.setter(field.name, field.library);
+        Selector setter =
+            new Selector.setter(new Name(field.name, field.library));
         int setterSelector = backend.context.toFletchSelector(setter);
         _removedAccessors.add(setterSelector);
       }
     }
   }
 
   PersistentMap<int, int> computeMethodTable() {
     PersistentMap<int, int> methodTable = klass.methodTable;
 
     for (int selector in _removedAccessors) {
@@ skipping 81 matching lines @@
     }
     commands.add(new PushNewArray(afterFields.length * 2));
 
     // Finally, ask the runtime to change the schemas!
     int fieldCountDelta = afterFields.length - klass.fields.length;
     commands.add(new ChangeSchemas(numberOfClasses, fieldCountDelta));
 
     return true;
   }
 }