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

pkg/compiler/lib/src/js_emitter/program_builder.dart

 // Copyright (c) 2014, 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.
 
 library dart2js.js_emitter.program_builder;
 
 import 'js_emitter.dart' show computeMixinClass;
 import 'model.dart';
 
 import '../common.dart';
@@ skipping 184 matching lines @@
         backend.constants.getStaticNonFinalFieldsForEmission();
     return Elements.sortedByPosition(staticNonFinalFields)
         .map(_buildStaticField)
         .toList(growable: false);
   }
 
   StaticField _buildStaticField(Element element) {
     JavaScriptConstantCompiler handler = backend.constants;
     ConstantValue initialValue = handler.getInitialValueFor(element).value;
     js.Expression code = _task.emitter.constantReference(initialValue);
-    String name = namer.globalPropertyName(element);
+    String name = namer.getNameOfGlobalField(element);
     bool isFinal = false;
     bool isLazy = false;
     return new StaticField(element,
                            name, _registry.registerHolder(r'$'), code,
                            isFinal, isLazy);
   }
 
   List<StaticField> _buildStaticLazilyInitializedFields(
       LibrariesMap librariesMap) {
     // TODO(floitsch): lazy fields should just be in their respective
@@ skipping 11 matching lines @@
         .toList(growable: false);
   }
 
   StaticField _buildLazyField(Element element) {
     js.Expression code = backend.generatedCode[element];
     // The code is null if we ended up not needing the lazily
     // initialized field after all because of constant folding
     // before code generation.
     if (code == null) return null;
 
-    String name = namer.globalPropertyName(element);
+    String name = namer.getNameOfGlobalField(element);
     bool isFinal = element.isFinal;
     bool isLazy = true;
     return new StaticField(element,
                            name, _registry.registerHolder(r'$'), code,
                            isFinal, isLazy);
   }
 
   List<Library> _buildLibraries(LibrariesMap librariesMap) {
     List<Library> libraries = new List<Library>(librariesMap.length);
     int count = 0;
@@ skipping 32 matching lines @@
                        staticFieldsForReflection);
   }
 
   /// HACK for Incremental Compilation.
   ///
   /// Returns a class that contains the fields of a class.
   Class buildFieldsHackForIncrementalCompilation(ClassElement element) {
     assert(_compiler.hasIncrementalSupport);
 
     List<Field> instanceFields = _buildFields(element, false);
-    String name = namer.className(element);
+    String name = namer.getNameOfClass(element);
 
     return new Class(
         element, name, null, [], instanceFields, [], [], [], [], null,
         isDirectlyInstantiated: true,
         onlyForRti: false,
         isNative: element.isNative);
   }
 
   Class _buildClass(ClassElement element) {
     bool onlyForRti = _task.typeTestRegistry.rtiNeededClasses.contains(element);
@@ skipping 57 matching lines @@
     TypeTestProperties typeTests =
         generator.generateIsTests(
             element,
             storeFunctionTypeInMetadata: _storeFunctionTypesInMetadata);
 
     List<StubMethod> isChecks = <StubMethod>[];
     typeTests.properties.forEach((String name, js.Node code) {
       isChecks.add(_buildStubMethod(name, code));
     });
 
-    String name = namer.className(element);
+    String name = namer.getNameOfClass(element);
     String holderName = namer.globalObjectFor(element);
     Holder holder = _registry.registerHolder(holderName);
     bool isInstantiated =
         _compiler.codegenWorld.directlyInstantiatedClasses.contains(element);
 
     Class result;
     if (element.isMixinApplication && !onlyForRti) {
       assert(!element.isNative);
       assert(methods.isEmpty);
 
@@ skipping 42 matching lines @@
   Method buildMethodHackForIncrementalCompilation(FunctionElement element) {
     assert(_compiler.hasIncrementalSupport);
     if (element.isInstanceMember) {
       return _buildMethod(element);
     } else {
       return _buildStaticMethod(element);
     }
   }
 
   DartMethod _buildMethod(FunctionElement element) {
-    String name = namer.methodPropertyName(element);
+    String name = namer.getNameOfInstanceMember(element);
     js.Expression code = backend.generatedCode[element];
 
     // TODO(kasperl): Figure out under which conditions code is null.
     if (code == null) return null;
 
     bool canTearOff = false;
     String tearOffName;
     bool isClosure = false;
     bool isNotApplyTarget = !element.isFunction || element.isAccessor;
 
     bool canBeReflected = _methodCanBeReflected(element);
     bool needsStubs = _methodNeedsStubs(element);
     bool canBeApplied = _methodCanBeApplied(element);
 
     String aliasName = backend.isAliasedSuperMember(element)
-        ? namer.aliasedSuperMemberPropertyName(element)
+        ? namer.getNameOfAliasedSuperMember(element)
         : null;
 
     if (isNotApplyTarget) {
       canTearOff = false;
     } else {
       if (element.enclosingClass.isClosure) {
         canTearOff = false;
         isClosure = true;
       } else {
         // Careful with operators.
         canTearOff = universe.hasInvokedGetter(element, _compiler.world) ||
             (canBeReflected && !element.isOperator);
         assert(canTearOff ||
                !universe.methodsNeedingSuperGetter.contains(element));
-        tearOffName = namer.getterForElement(element);
+        tearOffName = namer.getterName(element);
       }
     }
 
     if (canTearOff) {
       assert(invariant(element, !element.isGenerativeConstructor));
       assert(invariant(element, !element.isGenerativeConstructorBody));
       assert(invariant(element, !element.isConstructor));
     }
 
     String callName = null;
@@ skipping 125 matching lines @@
     Holder holder = _registry.registerHolder(holderName);
 
     List<String> names = backend.oneShotInterceptors.keys.toList()..sort();
     return names.map((String name) {
       js.Expression code = stubGenerator.generateOneShotInterceptor(name);
       return new StaticStubMethod(name, holder, code);
     });
   }
 
   StaticDartMethod _buildStaticMethod(FunctionElement element) {
-    String name = namer.methodPropertyName(element);
+    String name = namer.getNameOfMember(element);
     String holder = namer.globalObjectFor(element);
     js.Expression code = backend.generatedCode[element];
 
     bool isApplyTarget = !element.isConstructor && !element.isAccessor;
     bool canBeApplied = _methodCanBeApplied(element);
     bool canBeReflected = _methodCanBeReflected(element);
 
     bool needsTearOff = isApplyTarget &&
         (canBeReflected ||
             universe.staticFunctionsNeedingGetter.contains(element));
 
     String tearOffName =
-        needsTearOff ? namer.staticClosureName(element) : null;
+        needsTearOff ? namer.getStaticClosureName(element) : null;
 
     String callName = null;
     if (needsTearOff) {
       Selector callSelector =
           new Selector.fromElement(element).toCallSelector();
       callName = namer.invocationName(callSelector);
     }
 
     return new StaticDartMethod(element,
                                 name, _registry.registerHolder(holder), code,
@@ skipping 13 matching lines @@
       _registry.registerConstant(outputUnit, constantValue);
       assert(!_constants.containsKey(constantValue));
       String name = namer.constantName(constantValue);
       String constantObject = namer.globalObjectForConstant(constantValue);
       Holder holder = _registry.registerHolder(constantObject);
       Constant constant = new Constant(name, holder, constantValue);
       _constants[constantValue] = constant;
     }
   }
 }