| Index: pkg/compiler/lib/src/js_emitter/full_emitter/class_emitter.dart
|
| diff --git a/pkg/compiler/lib/src/js_emitter/full_emitter/class_emitter.dart b/pkg/compiler/lib/src/js_emitter/full_emitter/class_emitter.dart
|
| index 870ccaa324261fbd4488708cb24dd27006b19c4c..174a1004a4d6e254ededbc288dacf429f82a66d6 100644
|
| --- a/pkg/compiler/lib/src/js_emitter/full_emitter/class_emitter.dart
|
| +++ b/pkg/compiler/lib/src/js_emitter/full_emitter/class_emitter.dart
|
| @@ -102,7 +102,7 @@ class ClassEmitter extends CodeEmitterHelper {
|
|
|
| jsAst.Name constructorName = namer.className(classElement);
|
| OutputUnit outputUnit =
|
| - compiler.deferredLoadTask.outputUnitForElement(classElement);
|
| + compiler.deferredLoadTask.outputUnitForEntity(classElement);
|
| emitter.assemblePrecompiledConstructor(
|
| outputUnit, constructorName, constructorAst, fieldNames);
|
| }
|
| @@ -206,7 +206,7 @@ class ClassEmitter extends CodeEmitterHelper {
|
| jsAst.Literal fieldNameAst = js.concatenateStrings(fieldNameParts);
|
| builder.addField(fieldNameAst);
|
| // Add 1 because adding a field to the class also requires a comma
|
| - compiler.dumpInfoTask.registerElementAst(fieldElement, fieldNameAst);
|
| + compiler.dumpInfoTask.registerEntityAst(fieldElement, fieldNameAst);
|
| fieldsAdded = true;
|
| }
|
| }
|
| @@ -227,7 +227,7 @@ class ClassEmitter extends CodeEmitterHelper {
|
| jsAst.Expression code = method.code;
|
| jsAst.Name setterName = method.name;
|
| compiler.dumpInfoTask
|
| - .registerElementAst(member, builder.addProperty(setterName, code));
|
| + .registerEntityAst(member, builder.addProperty(setterName, code));
|
| generateReflectionDataForFieldGetterOrSetter(member, setterName, builder,
|
| isGetter: false);
|
| }
|
| @@ -253,7 +253,7 @@ class ClassEmitter extends CodeEmitterHelper {
|
| void emitStubs(Iterable<StubMethod> stubs, ClassBuilder builder) {
|
| for (Method method in stubs) {
|
| jsAst.Property property = builder.addProperty(method.name, method.code);
|
| - compiler.dumpInfoTask.registerElementAst(method.element, property);
|
| + compiler.dumpInfoTask.registerEntityAst(method.element, property);
|
| }
|
| }
|
|
|
| @@ -341,9 +341,9 @@ class ClassEmitter extends CodeEmitterHelper {
|
| if (emitFields(cls, staticsBuilder, emitStatics: true)) {
|
| jsAst.ObjectInitializer initializer =
|
| staticsBuilder.toObjectInitializer();
|
| - compiler.dumpInfoTask.registerElementAst(classEntity, initializer);
|
| + compiler.dumpInfoTask.registerEntityAst(classEntity, initializer);
|
| jsAst.Node property = initializer.properties.single;
|
| - compiler.dumpInfoTask.registerElementAst(classEntity, property);
|
| + compiler.dumpInfoTask.registerEntityAst(classEntity, property);
|
| statics.add(property);
|
| }
|
|
|
| @@ -363,7 +363,7 @@ class ClassEmitter extends CodeEmitterHelper {
|
| // TODO(ahe): This method (generateClass) should return a jsAst.Expression.
|
| jsAst.ObjectInitializer propertyValue = classBuilder.toObjectInitializer();
|
| compiler.dumpInfoTask
|
| - .registerElementAst(classBuilder.element, propertyValue);
|
| + .registerEntityAst(classBuilder.element, propertyValue);
|
| enclosingBuilder.addProperty(className, propertyValue);
|
|
|
| String reflectionName =
|
| @@ -414,7 +414,7 @@ class ClassEmitter extends CodeEmitterHelper {
|
| ClassElement cls = member.enclosingClass;
|
| jsAst.Name className = namer.className(cls);
|
| OutputUnit outputUnit =
|
| - compiler.deferredLoadTask.outputUnitForElement(member);
|
| + compiler.deferredLoadTask.outputUnitForEntity(member);
|
| emitter
|
| .cspPrecompiledFunctionFor(outputUnit)
|
| .add(js('#.prototype.# = #', [className, getterName, function]));
|
| @@ -434,7 +434,7 @@ class ClassEmitter extends CodeEmitterHelper {
|
| ClassElement cls = member.enclosingClass;
|
| jsAst.Name className = namer.className(cls);
|
| OutputUnit outputUnit =
|
| - compiler.deferredLoadTask.outputUnitForElement(member);
|
| + compiler.deferredLoadTask.outputUnitForEntity(member);
|
| emitter
|
| .cspPrecompiledFunctionFor(outputUnit)
|
| .add(js('#.prototype.# = #', [className, setterName, function]));
|
|
|