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

Unified Diff: pkg/compiler/lib/src/js_emitter/program_builder.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/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 2d22ead02315ee95bb458efb7d9fb5dbc76f3817..69e291707a11c48a9fc097965235a8d6bef46544 100644
--- a/pkg/compiler/lib/src/js_emitter/program_builder.dart
+++ b/pkg/compiler/lib/src/js_emitter/program_builder.dart
@@ -216,7 +216,7 @@ class ProgramBuilder {
// a static field.
_registry.registerHolder(namer.globalObjectForConstant(initialValue));
js.Expression code = _task.emitter.constantReference(initialValue);
- String name = namer.getNameOfGlobalField(element);
+ String name = namer.globalPropertyName(element);
bool isFinal = false;
bool isLazy = false;
@@ -252,7 +252,7 @@ class ProgramBuilder {
// before code generation.
if (code == null) return null;
- String name = namer.getNameOfGlobalField(element);
+ String name = namer.globalPropertyName(element);
bool isFinal = element.isFinal;
bool isLazy = true;
// TODO(floitsch): we shouldn't update the registry in the middle of
@@ -308,7 +308,7 @@ class ProgramBuilder {
assert(_compiler.hasIncrementalSupport);
List<Field> instanceFields = _buildFields(element, false);
- String name = namer.getNameOfClass(element);
+ String name = namer.className(element);
return new Class(
element, name, null, [], instanceFields, [], [], [], [], [], null,
@@ -369,8 +369,7 @@ class ProgramBuilder {
if (element == backend.closureClass) {
// We add a special getter here to allow for tearing off a closure from
// itself.
- String name = namer.getterNameFromAccessorName(
- namer.getMappedInstanceName(Compiler.CALL_OPERATOR_NAME));
+ String name = namer.getterForPublicMember(Compiler.CALL_OPERATOR_NAME);
js.Fun function = js.js('function() { return this; }');
callStubs.add(_buildStubMethod(name, function));
}
@@ -398,7 +397,7 @@ class ProgramBuilder {
isChecks.add(_buildStubMethod(name, code));
});
- String name = namer.getNameOfClass(element);
+ String name = namer.className(element);
String holderName = namer.globalObjectFor(element);
// TODO(floitsch): we shouldn't update the registry in the middle of
// building a class.
@@ -485,7 +484,7 @@ class ProgramBuilder {
}
DartMethod _buildMethod(FunctionElement element) {
- String name = namer.getNameOfInstanceMember(element);
+ String name = namer.methodPropertyName(element);
js.Expression code = backend.generatedCode[element];
// TODO(kasperl): Figure out under which conditions code is null.
@@ -501,7 +500,7 @@ class ProgramBuilder {
bool canBeApplied = _methodCanBeApplied(element);
String aliasName = backend.isAliasedSuperMember(element)
- ? namer.getNameOfAliasedSuperMember(element)
+ ? namer.aliasedSuperMemberPropertyName(element)
: null;
if (isNotApplyTarget) {
@@ -516,7 +515,7 @@ class ProgramBuilder {
(canBeReflected && !element.isOperator);
assert(canTearOff ||
!universe.methodsNeedingSuperGetter.contains(element));
- tearOffName = namer.getterName(element);
+ tearOffName = namer.getterForElement(element);
}
}
@@ -692,7 +691,7 @@ class ProgramBuilder {
}
StaticDartMethod _buildStaticMethod(FunctionElement element) {
- String name = namer.getNameOfMember(element);
+ String name = namer.methodPropertyName(element);
String holder = namer.globalObjectFor(element);
js.Expression code = backend.generatedCode[element];
@@ -705,7 +704,7 @@ class ProgramBuilder {
universe.staticFunctionsNeedingGetter.contains(element));
String tearOffName =
- needsTearOff ? namer.getStaticClosureName(element) : null;
+ needsTearOff ? namer.staticClosureName(element) : null;
String callName = null;

Powered by Google App Engine
This is Rietveld 408576698