dart2js: Refactoring, documentation, and a few bugfixes in Namer class.

pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart

Index: pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart
diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart
index e79e424e656d1975df979157d4d2a51211ad82eb..1f5bcb5742c00fd71bb6b1ae44ef208fbd25e6e8 100644
--- a/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart
+++ b/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart
@@ -49,8 +49,8 @@ class ContainerBuilder extends CodeEmitterHelper {
     // If the method is intercepted, we need to also pass the actual receiver.
     int extraArgumentCount = isInterceptedMethod ? 1 : 0;
     // Use '$receiver' to avoid clashes with other parameter names. Using
-    // '$receiver' works because [:namer.safeName:] used for getting parameter
-    // names never returns a name beginning with a single '$'.
+    // '$receiver' works because namer.safeVariableName used for getting
+    // parameter names never returns a name beginning with a single '$'.
     String receiverArgumentName = r'$receiver';
 
     // The parameters that this stub takes.
@@ -75,7 +75,7 @@ class ContainerBuilder extends CodeEmitterHelper {
 
     int parameterIndex = 0;
     parameters.orderedForEachParameter((ParameterElement element) {
-      String jsName = backend.namer.safeName(element.name);
+      String jsName = backend.namer.safeVariableName(element.name);
       assert(jsName != receiverArgumentName);
       if (count < optionalParameterStart) {
         parametersBuffer[count] = new jsAst.Parameter(jsName);
@@ -117,7 +117,7 @@ class ContainerBuilder extends CodeEmitterHelper {
     } else if (member.isInstanceMember) {
       if (needsSuperGetter(member)) {
         ClassElement superClass = member.enclosingClass;
-        String methodName = namer.getNameOfInstanceMember(member);
+        String methodName = namer.instanceMethodName(member);
         // When redirecting, we must ensure that we don't end up in a subclass.
         // We thus can't just invoke `this.foo$1.call(filledInArguments)`.
         // Instead we need to call the statically resolved target.
@@ -131,7 +131,7 @@ class ContainerBuilder extends CodeEmitterHelper {
       } else {
         body = js.statement(
             'return this.#(#);',
-            [namer.getNameOfInstanceMember(member), argumentsBuffer]);
+            [namer.instanceMethodName(member), argumentsBuffer]);
       }
     } else {
       body = js.statement('return #(#)',
@@ -267,7 +267,7 @@ class ContainerBuilder extends CodeEmitterHelper {
     if (member.isAbstract) return null;
     jsAst.Expression code = backend.generatedCode[member];
     if (code == null) return null;
-    String name = namer.getNameOfMember(member);
+    String name = namer.methodPropertyName(member);
 
     FunctionSignature parameters = member.functionSignature;
     bool needsStubs = !parameters.optionalParameters.isEmpty;
@@ -296,13 +296,13 @@ class ContainerBuilder extends CodeEmitterHelper {
             compiler.codegenWorld.hasInvokedGetter(member, compiler.world) ||
             (canBeReflected && !member.isOperator);
         assert(!needsSuperGetter(member) || canTearOff);
-        tearOffName = namer.getterName(member);
+        tearOffName = namer.getterForElement(member);
       }
     } else {
       canTearOff =
           compiler.codegenWorld.staticFunctionsNeedingGetter.contains(member) ||
           canBeReflected;
-      tearOffName = namer.getStaticClosureName(member);
+      tearOffName = namer.staticClosureName(member);
     }
     final bool canBeApplied = compiler.enabledFunctionApply &&
                               compiler.world.getMightBePassedToApply(member);
@@ -400,7 +400,7 @@ class ContainerBuilder extends CodeEmitterHelper {
     // Create the optional aliasing entry if this method is called via super.
     if (backend.isAliasedSuperMember(member)) {
       expressions.add(new jsAst.LiteralString(
-          '"${namer.getNameOfAliasedSuperMember(member)}"'));
+          '"${namer.aliasedSuperMemberPropertyName(member)}"'));
     }
 
     expressions.add(code);