Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1043)

Unified Diff: pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart

Issue 891673003: dart2js: Refactoring, documentation, and a few bugfixes in Namer class. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Rebase Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 bbce58a28536a7dc6a33645df781061ec2993511..8fa840e61921ffbcbe2f484d3fc0132477f113ae 100644
--- a/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart
@@ -148,8 +148,7 @@ class OldEmitter implements Emitter {
=> '${namer.isolateName}.${lazyInitializerProperty}';
String get initName => 'init';
- String get makeConstListProperty
- => namer.getMappedInstanceName('makeConstantList');
+ String get makeConstListProperty => namer.internalGlobal('makeConstantList');
/// The name of the property that contains all field names.
///
@@ -159,8 +158,9 @@ class OldEmitter implements Emitter {
/// For deferred loading we communicate the initializers via this global var.
final String deferredInitializers = r"$dart_deferred_initializers";
- /// All the global state can be passed around with this variable.
- String get globalsHolder => namer.getMappedGlobalName("globalsHolder");
+ /// Contains the global state that is needed to initialize and load a
+ /// deferred library.
+ String get globalsHolder => namer.internalGlobal("globalsHolder");
@override
jsAst.Expression generateEmbeddedGlobalAccess(String global) {
@@ -173,7 +173,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);
@@ -183,13 +183,13 @@ class OldEmitter implements Emitter {
@override
jsAst.Expression isolateLazyInitializerAccess(FieldElement element) {
return jsAst.js('#.#', [namer.globalObjectFor(element),
- namer.getLazyInitializerName(element)]);
+ namer.lazyInitializerName(element)]);
}
@override
jsAst.Expression isolateStaticClosureAccess(FunctionElement element) {
return jsAst.js('#.#()',
- [namer.globalObjectFor(element), namer.getStaticClosureName(element)]);
+ [namer.globalObjectFor(element), namer.staticClosureName(element)]);
}
@override
@@ -726,7 +726,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');
@@ -797,8 +797,8 @@ class OldEmitter implements Emitter {
[js(lazyInitializerName),
js(isolateProperties),
js.string(element.name),
- js.string(namer.getNameX(element)),
- js.string(namer.getLazyInitializerName(element)),
+ js.string(namer.globalPropertyName(element)),
+ js.string(namer.lazyInitializerName(element)),
code]);
}
@@ -1212,9 +1212,9 @@ class OldEmitter implements Emitter {
// typedefs are only emitted with reflection, which requires lots of
// classes.
assert(compiler.objectClass != null);
- builder.superName = namer.getNameOfClass(compiler.objectClass);
+ builder.superName = namer.className(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)

Powered by Google App Engine
This is Rietveld 408576698