Index: pkg/compiler/lib/src/js_emitter/program_builder.dart |
diff --git a/pkg/compiler/lib/src/js_emitter/program_builder.dart b/pkg/compiler/lib/src/js_emitter/program_builder.dart |
index 336dfdb0fc16c9f3fe65bfa7282e7d753a8d5e34..7036bb73a526943aa7b76c7b6428ec600e21bedc 100644 |
--- a/pkg/compiler/lib/src/js_emitter/program_builder.dart |
+++ b/pkg/compiler/lib/src/js_emitter/program_builder.dart |
@@ -210,7 +210,7 @@ class ProgramBuilder { |
JavaScriptConstantCompiler handler = backend.constants; |
ConstantValue initialValue = handler.getInitialValueFor(element).value; |
js.Expression code = _task.emitter.constantReference(initialValue); |
- String name = namer.globalPropertyName(element); |
+ String name = namer.getNameOfGlobalField(element); |
bool isFinal = false; |
bool isLazy = false; |
return new StaticField(element, |
@@ -242,7 +242,7 @@ class ProgramBuilder { |
// before code generation. |
if (code == null) return null; |
- String name = namer.globalPropertyName(element); |
+ String name = namer.getNameOfGlobalField(element); |
bool isFinal = element.isFinal; |
bool isLazy = true; |
return new StaticField(element, |
@@ -295,7 +295,7 @@ class ProgramBuilder { |
assert(_compiler.hasIncrementalSupport); |
List<Field> instanceFields = _buildFields(element, false); |
- String name = namer.className(element); |
+ String name = namer.getNameOfClass(element); |
return new Class( |
element, name, null, [], instanceFields, [], [], [], [], [], null, |
@@ -376,7 +376,7 @@ class ProgramBuilder { |
isChecks.add(_buildStubMethod(name, code)); |
}); |
- String name = namer.className(element); |
+ String name = namer.getNameOfClass(element); |
String holderName = namer.globalObjectFor(element); |
Holder holder = _registry.registerHolder(holderName); |
bool isInstantiated = |
@@ -441,7 +441,7 @@ class ProgramBuilder { |
} |
DartMethod _buildMethod(FunctionElement element) { |
- String name = namer.methodPropertyName(element); |
+ String name = namer.getNameOfInstanceMember(element); |
js.Expression code = backend.generatedCode[element]; |
// TODO(kasperl): Figure out under which conditions code is null. |
@@ -457,7 +457,7 @@ class ProgramBuilder { |
bool canBeApplied = _methodCanBeApplied(element); |
String aliasName = backend.isAliasedSuperMember(element) |
- ? namer.aliasedSuperMemberPropertyName(element) |
+ ? namer.getNameOfAliasedSuperMember(element) |
: null; |
if (isNotApplyTarget) { |
@@ -472,7 +472,7 @@ class ProgramBuilder { |
(canBeReflected && !element.isOperator); |
assert(canTearOff || |
!universe.methodsNeedingSuperGetter.contains(element)); |
- tearOffName = namer.getterForElement(element); |
+ tearOffName = namer.getterName(element); |
} |
} |
@@ -618,7 +618,7 @@ class ProgramBuilder { |
} |
StaticDartMethod _buildStaticMethod(FunctionElement element) { |
- String name = namer.methodPropertyName(element); |
+ String name = namer.getNameOfMember(element); |
String holder = namer.globalObjectFor(element); |
js.Expression code = backend.generatedCode[element]; |
@@ -631,7 +631,7 @@ class ProgramBuilder { |
universe.staticFunctionsNeedingGetter.contains(element)); |
String tearOffName = |
- needsTearOff ? namer.staticClosureName(element) : null; |
+ needsTearOff ? namer.getStaticClosureName(element) : null; |
String callName = null; |
if (needsTearOff) { |