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

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

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart2js.js_emitter;
 
 /// This class should morph into something that makes it easy to build
 /// JavaScript representations of libraries, class-sides, and instance-sides.
 /// Initially, it is just a placeholder for code that is moved from
 /// [CodeEmitterTask].
@@ skipping 31 matching lines @@
 
     String invocationName = namer.invocationName(selector);
     if (alreadyGenerated.contains(invocationName)) return;
     alreadyGenerated.add(invocationName);
 
     bool isInterceptedMethod = backend.isInterceptedMethod(member);
 
     // 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.
     List<jsAst.Parameter> parametersBuffer =
         new List<jsAst.Parameter>(selector.argumentCount + extraArgumentCount);
     // The arguments that will be passed to the real method.
     List<jsAst.Expression> argumentsBuffer =
         new List<jsAst.Expression>(
             parameters.parameterCount + extraArgumentCount);
 
     int count = 0;
     if (isInterceptedMethod) {
       count++;
       parametersBuffer[0] = new jsAst.Parameter(receiverArgumentName);
       argumentsBuffer[0] = js('#', receiverArgumentName);
       emitter.interceptorEmitter.interceptorInvocationNames.add(invocationName);
     }
 
     int optionalParameterStart = positionalArgumentCount + extraArgumentCount;
     // Includes extra receiver argument when using interceptor convention
     int indexOfLastOptionalArgumentInParameters = optionalParameterStart - 1;
 
     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);
         argumentsBuffer[count] = js('#', jsName);
       } else {
         int index = names.indexOf(element.name);
         if (index != -1) {
           indexOfLastOptionalArgumentInParameters = count;
           // The order of the named arguments is not the same as the
           // one in the real method (which is in Dart source order).
@@ skipping 21 matching lines @@
 
     var body;  // List or jsAst.Statement.
     if (member.hasFixedBackendName) {
       body = emitter.nativeEmitter.generateParameterStubStatements(
           member, isInterceptedMethod, invocationName,
           parametersBuffer, argumentsBuffer,
           indexOfLastOptionalArgumentInParameters);
     } 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.
         //   `<class>.prototype.bar$1.call(this, argument0, ...)`.
         body = js.statement(
             'return #.#.call(this, #);',
             [backend.emitter.prototypeAccess(superClass,
                                              hasBeenInstantiated: true),
              methodName,
              argumentsBuffer]);
       } else {
         body = js.statement(
             'return this.#(#);',
-            [namer.getNameOfInstanceMember(member), argumentsBuffer]);
+            [namer.instanceMethodName(member), argumentsBuffer]);
       }
     } else {
       body = js.statement('return #(#)',
           [emitter.staticFunctionAccess(member), argumentsBuffer]);
     }
 
     jsAst.Fun function = js('function(#) { #; }', [parametersBuffer, body]);
 
     addStub(selector, function);
   }
@@ skipping 115 matching lines @@
     MemberInfo info = analyzeMemberMethod(member);
     if (info != null) {
       addMemberMethodFromInfo(info, builder);
     }
   }
 
   MemberInfo analyzeMemberMethod(FunctionElement member) {
     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;
     bool canTearOff = false;
     bool isClosure = false;
     bool isNotApplyTarget = !member.isFunction ||
                             member.isConstructor ||
                             member.isAccessor;
     String tearOffName;
 
 
     final bool canBeReflected = backend.isAccessibleByReflection(member) ||
         // During incremental compilation, we have to assume that reflection
         // *might* get enabled.
         compiler.hasIncrementalSupport;
 
     if (isNotApplyTarget) {
       canTearOff = false;
     } else if (member.isInstanceMember) {
       if (member.enclosingClass.isClosure) {
         canTearOff = false;
         isClosure = true;
       } else {
         // Careful with operators.
         canTearOff =
             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);
 
     final bool hasSuperAlias = backend.isAliasedSuperMember(member);
 
     final bool needStructuredInfo =
         canTearOff || canBeReflected || canBeApplied || hasSuperAlias;
 
 
@@ skipping 77 matching lines @@
     // P+1. First metadata (if reflectable).
     // ...
     // TODO(ahe): Consider one of the parameter counts can be replaced by the
     // length property of the JavaScript function object.
 
     List<jsAst.Expression> expressions = <jsAst.Expression>[];
 
     // 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);
 
     final bool onlyNeedsSuperAlias =
         !(canTearOff || canBeReflected || canBeApplied || needsStubs);
 
     if (onlyNeedsSuperAlias) {
       jsAst.ArrayInitializer arrayInit =
             new jsAst.ArrayInitializer(expressions);
@@ skipping 167 matching lines @@
     assert(needsStubs != null);
     assert(canTearOff != null);
     assert(isClosure != null);
     assert(tearOffName != null || !canTearOff);
     assert(canBeReflected != null);
     assert(canBeApplied != null);
     assert(hasSuperAlias != null);
     assert(needStructuredInfo != null);
   }
 }