pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart - Issue 891673003: dart2js: Refactoring, documentation, and a few bugfixes in Namer class.

Unified Diff: pkg/compiler/lib/src/js_emitter/old_emitter/class_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: Typo and TODO about clash in named parameters Created 5 years, 11 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

« pkg/compiler/lib/src/js_backend/namer.dart ('K') | « pkg/compiler/lib/src/js_emitter/new_emitter/emitter.dart ('k') | pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart » ('j') | pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart

diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart

index 6e5b46d38222b18f527f7e256bb967cbf7f24e35..789e8ea9f56aca621c5130c0f57e1a9913187eea 100644

--- a/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart

+++ b/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart

@@ -46,9 +46,9 @@ class ClassEmitter extends CodeEmitterHelper {

if (classElement == backend.closureClass) {

// We add a special getter here to allow for tearing off a closure from

// itself.

- String name = namer.getMappedInstanceName(Compiler.CALL_OPERATOR_NAME);

jsAst.Fun function = js('function() { return this; }');

- builder.addProperty(namer.getterNameFromAccessorName(name), function);

+ String name = namer.getterForMember(null, Compiler.CALL_OPERATOR_NAME);

floitsch 2015/01/30 21:03:38 maybe add a namer.getterForPublicMember(...) Other

asgerf 2015/02/03 17:39:13 Done.

+ builder.addProperty(name, function);

}

emitTypeVariableReaders(classElement, builder);

@@ -143,14 +143,14 @@ class ClassEmitter extends CodeEmitterHelper {

if (field.needsInterceptedGetter) {

emitter.interceptorEmitter.interceptorInvocationNames.add(

- namer.getterName(fieldElement));

+ namer.getterForElement(fieldElement));

}

// TODO(16168): The setter creator only looks at the getter-name.

// Even though the setter could avoid the interceptor convention we

// currently still need to add the additional argument.

if (field.needsInterceptedGetter || field.needsInterceptedSetter) {

emitter.interceptorEmitter.interceptorInvocationNames.add(

- namer.setterName(fieldElement));

+ namer.setterForElement(fieldElement));

}

int code = field.getterFlags + (field.setterFlags << 2);

@@ -494,7 +494,7 @@ class ClassEmitter extends CodeEmitterHelper {

ClassBuilder builder) {

jsAst.Expression code = backend.generatedCode[member];

assert(code != null);

- String setterName = namer.setterNameFromAccessorName(accessorName);

+ String setterName = namer.deriveSetterName(accessorName);

compiler.dumpInfoTask.registerElementAst(member,

builder.addProperty(setterName, code));

generateReflectionDataForFieldGetterOrSetter(

@@ -506,7 +506,7 @@ class ClassEmitter extends CodeEmitterHelper {

jsAst.Expression function =

_stubGenerator.generateGetter(member, fieldName);

- String getterName = namer.getterNameFromAccessorName(accessorName);

+ String getterName = namer.deriveGetterName(accessorName);

ClassElement cls = member.enclosingClass;

String className = namer.getNameOfClass(cls);

OutputUnit outputUnit =

@@ -525,7 +525,7 @@ class ClassEmitter extends CodeEmitterHelper {