Index: pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart |
diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart |
index e79e424e656d1975df979157d4d2a51211ad82eb..93e30184f8f95acfece2dcc7c46f44e02f29031c 100644 |
--- a/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart |
+++ b/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart |
@@ -117,7 +117,7 @@ class ContainerBuilder extends CodeEmitterHelper { |
} else if (member.isInstanceMember) { |
if (needsSuperGetter(member)) { |
ClassElement superClass = member.enclosingClass; |
- String methodName = namer.getNameOfInstanceMember(member); |
+ String methodName = namer.instanceMethodName(member); |
// When redirecting, we must ensure that we don't end up in a subclass. |
// We thus can't just invoke `this.foo$1.call(filledInArguments)`. |
// Instead we need to call the statically resolved target. |
@@ -131,7 +131,7 @@ class ContainerBuilder extends CodeEmitterHelper { |
} else { |
body = js.statement( |
'return this.#(#);', |
- [namer.getNameOfInstanceMember(member), argumentsBuffer]); |
+ [namer.instanceMethodName(member), argumentsBuffer]); |
} |
} else { |
body = js.statement('return #(#)', |
@@ -267,7 +267,7 @@ class ContainerBuilder extends CodeEmitterHelper { |
if (member.isAbstract) return null; |
jsAst.Expression code = backend.generatedCode[member]; |
if (code == null) return null; |
- String name = namer.getNameOfMember(member); |
+ String name = namer.methodPropertyName(member); |
FunctionSignature parameters = member.functionSignature; |
bool needsStubs = !parameters.optionalParameters.isEmpty; |
@@ -296,13 +296,13 @@ class ContainerBuilder extends CodeEmitterHelper { |
compiler.codegenWorld.hasInvokedGetter(member, compiler.world) || |
(canBeReflected && !member.isOperator); |
assert(!needsSuperGetter(member) || canTearOff); |
- tearOffName = namer.getterName(member); |
+ tearOffName = namer.getterForElement(member); |
} |
} else { |
canTearOff = |
compiler.codegenWorld.staticFunctionsNeedingGetter.contains(member) || |
canBeReflected; |
- tearOffName = namer.getStaticClosureName(member); |
+ tearOffName = namer.staticClosureName(member); |
} |
final bool canBeApplied = compiler.enabledFunctionApply && |
compiler.world.getMightBePassedToApply(member); |
@@ -400,7 +400,7 @@ class ContainerBuilder extends CodeEmitterHelper { |
// Create the optional aliasing entry if this method is called via super. |
if (backend.isAliasedSuperMember(member)) { |
expressions.add(new jsAst.LiteralString( |
- '"${namer.getNameOfAliasedSuperMember(member)}"')); |
+ '"${namer.aliasedSuperMemberPropertyName(member)}"')); |
} |
expressions.add(code); |