| Index: pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart
|
| diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart
|
| index 543386864987cf20119829ac302a01b6451c52bb..0193ba25b95472978af13d76329126726cdc2a3a 100644
|
| --- a/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart
|
| +++ b/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart
|
| @@ -22,7 +22,7 @@ class ClassEmitter extends CodeEmitterHelper {
|
| ClassElement superclass = classElement.superclass;
|
| String superName = "";
|
| if (superclass != null) {
|
| - superName = namer.className(superclass);
|
| + superName = namer.getNameOfClass(superclass);
|
| }
|
|
|
| if (cls.isMixinApplication) {
|
| @@ -47,9 +47,9 @@ class ClassEmitter extends CodeEmitterHelper {
|
| if (classElement == backend.closureClass) {
|
| // We add a special getter here to allow for tearing off a closure from
|
| // itself.
|
| + String name = namer.getMappedInstanceName(Compiler.CALL_OPERATOR_NAME);
|
| jsAst.Fun function = js('function() { return this; }');
|
| - String name = namer.getterForPublicMember(Compiler.CALL_OPERATOR_NAME);
|
| - builder.addProperty(name, function);
|
| + builder.addProperty(namer.getterNameFromAccessorName(name), function);
|
| }
|
|
|
| emitClassBuilderWithReflectionData(cls, builder, enclosingBuilder);
|
| @@ -71,7 +71,7 @@ class ClassEmitter extends CodeEmitterHelper {
|
| jsAst.Expression constructorAst =
|
| _stubGenerator.generateClassConstructor(classElement, fieldNames);
|
|
|
| - String constructorName = namer.className(classElement);
|
| + String constructorName = namer.getNameOfClass(classElement);
|
| OutputUnit outputUnit =
|
| compiler.deferredLoadTask.outputUnitForElement(classElement);
|
| emitter.emitPrecompiledConstructor(
|
| @@ -142,14 +142,14 @@ class ClassEmitter extends CodeEmitterHelper {
|
|
|
| if (field.needsInterceptedGetter) {
|
| emitter.interceptorEmitter.interceptorInvocationNames.add(
|
| - namer.getterForElement(fieldElement));
|
| + namer.getterName(fieldElement));
|
| }
|
| // TODO(16168): The setter creator only looks at the getter-name.
|
| // Even though the setter could avoid the interceptor convention we
|
| // currently still need to add the additional argument.
|
| if (field.needsInterceptedGetter || field.needsInterceptedSetter) {
|
| emitter.interceptorEmitter.interceptorInvocationNames.add(
|
| - namer.setterForElement(fieldElement));
|
| + namer.setterName(fieldElement));
|
| }
|
|
|
| int code = field.getterFlags + (field.setterFlags << 2);
|
| @@ -493,7 +493,7 @@ class ClassEmitter extends CodeEmitterHelper {
|
| ClassBuilder builder) {
|
| jsAst.Expression code = backend.generatedCode[member];
|
| assert(code != null);
|
| - String setterName = namer.deriveSetterName(accessorName);
|
| + String setterName = namer.setterNameFromAccessorName(accessorName);
|
| compiler.dumpInfoTask.registerElementAst(member,
|
| builder.addProperty(setterName, code));
|
| generateReflectionDataForFieldGetterOrSetter(
|
| @@ -505,9 +505,9 @@ class ClassEmitter extends CodeEmitterHelper {
|
| jsAst.Expression function =
|
| _stubGenerator.generateGetter(member, fieldName);
|
|
|
| - String getterName = namer.deriveGetterName(accessorName);
|
| + String getterName = namer.getterNameFromAccessorName(accessorName);
|
| ClassElement cls = member.enclosingClass;
|
| - String className = namer.className(cls);
|
| + String className = namer.getNameOfClass(cls);
|
| OutputUnit outputUnit =
|
| compiler.deferredLoadTask.outputUnitForElement(member);
|
| emitter.cspPrecompiledFunctionFor(outputUnit).add(
|
| @@ -524,9 +524,9 @@ class ClassEmitter extends CodeEmitterHelper {
|
| jsAst.Expression function =
|
| _stubGenerator.generateSetter(member, fieldName);
|
|
|
| - String setterName = namer.deriveSetterName(accessorName);
|
| + String setterName = namer.setterNameFromAccessorName(accessorName);
|
| ClassElement cls = member.enclosingClass;
|
| - String className = namer.className(cls);
|
| + String className = namer.getNameOfClass(cls);
|
| OutputUnit outputUnit =
|
| compiler.deferredLoadTask.outputUnitForElement(member);
|
| emitter.cspPrecompiledFunctionFor(outputUnit).add(
|
|
|