Index: pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart |
diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart |
index 26e067d77f2d801e76db2313234f44a547c68740..f74c87d635167d4a8a1cfd1b1ad3980db010e138 100644 |
--- a/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart |
+++ b/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart |
@@ -150,8 +150,7 @@ class OldEmitter implements Emitter { |
=> '${namer.isolateName}.${lazyInitializerProperty}'; |
String get initName => 'init'; |
- String get makeConstListProperty |
- => namer.getMappedInstanceName('makeConstantList'); |
+ String get makeConstListProperty => namer.internGlobal('makeConstantList'); |
/// The name of the property that contains all field names. |
/// |
@@ -162,7 +161,7 @@ class OldEmitter implements Emitter { |
final String deferredInitializers = r"$dart_deferred_initializers"; |
/// All the global state can be passed around with this variable. |
floitsch
2015/01/30 21:03:38
Please update comment:
Contains the global state t
asgerf
2015/02/03 17:39:13
Done.
|
- String get globalsHolder => namer.getMappedGlobalName("globalsHolder"); |
+ String get globalsHolder => namer.internGlobal("globalsHolder"); |
@override |
jsAst.Expression generateEmbeddedGlobalAccess(String global) { |
@@ -175,7 +174,7 @@ class OldEmitter implements Emitter { |
} |
jsAst.PropertyAccess globalPropertyAccess(Element element) { |
- String name = namer.getNameX(element); |
+ String name = namer.globalPropertyName(element); |
jsAst.PropertyAccess pa = new jsAst.PropertyAccess.field( |
new jsAst.VariableUse(namer.globalObjectFor(element)), |
name); |
@@ -720,7 +719,7 @@ class OldEmitter implements Emitter { |
void emitInitialization(Element element, jsAst.Expression initialValue) { |
jsAst.Expression init = |
js('$isolateProperties.# = #', |
- [namer.getNameOfGlobalField(element), initialValue]); |
+ [namer.globalPropertyName(element), initialValue]); |
output.addBuffer(jsAst.prettyPrint(init, compiler, |
monitor: compiler.dumpInfoTask)); |
output.add('$N'); |
@@ -791,7 +790,7 @@ class OldEmitter implements Emitter { |
[js(lazyInitializerName), |
js(isolateProperties), |
js.string(element.name), |
- js.string(namer.getNameX(element)), |
+ js.string(namer.globalPropertyName(element)), |
js.string(namer.getLazyInitializerName(element)), |
code]); |
} |
@@ -1251,7 +1250,7 @@ class OldEmitter implements Emitter { |
assert(compiler.objectClass != null); |
builder.superName = namer.getNameOfClass(compiler.objectClass); |
jsAst.Node declaration = builder.toObjectInitializer(); |
- String mangledName = namer.getNameX(typedef); |
+ String mangledName = namer.globalPropertyName(typedef); |
String reflectionName = getReflectionName(typedef, mangledName); |
getElementDescriptor(library) |
..addProperty(mangledName, declaration) |