dart2js OldEmitter: Change to named holes in js output strings plus some extra clean-ups.

pkg/compiler/lib/src/js_emitter/old_emitter/reflection_data_parser.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;
 
 // TODO(ahe): Share these with js_helper.dart.
 const FUNCTION_INDEX = 0;
 const NAME_INDEX = 1;
 const CALL_NAME_INDEX = 2;
 const REQUIRED_PARAMETER_INDEX = 3;
 const OPTIONAL_PARAMETER_INDEX = 4;
 const DEFAULT_ARGUMENTS_INDEX = 5;
 
 const bool VALIDATE_DATA = false;
 
 // TODO(ahe): This code should be integrated in CodeEmitterTask.finishClasses.
 jsAst.Expression getReflectionDataParser(String classesCollector,
                                         JavaScriptBackend backend) {
   Namer namer = backend.namer;
   Compiler compiler = backend.compiler;
   CodeEmitterTask emitter = backend.emitter;
 
   String metadataField = '"${namer.metadataField}"';
   String reflectableField = namer.reflectableField;
-
-  // TODO(ahe): Move this string constants to namer.
-  String reflectionInfoField = r'$reflectionInfo';
-  String reflectionNameField = r'$reflectionName';
-  String metadataIndexField = r'$metadataIndex';
-
+  String reflectionInfoField = namer.reflectionInfoField;
+  String reflectionNameField = namer.reflectionNameField;
+  String metadataIndexField = namer.metadataIndexField;
   String defaultValuesField = namer.defaultValuesField;
   String methodsWithOptionalArgumentsField =
       namer.methodsWithOptionalArgumentsField;
 
   String unmangledNameIndex = backend.mustRetainMetadata
       ? ' 3 * optionalParameterCount + 2 * requiredParameterCount + 3'
       : ' 2 * optionalParameterCount + requiredParameterCount + 3';
 
   jsAst.Expression typeInformationAccess =
       emitter.generateEmbeddedGlobalAccess(embeddedNames.TYPE_INFORMATION);
@@ skipping 139 matching lines @@
            requiredParameterCount + optionalParameterCount != funcs[0].length;
     var functionTypeIndex = ${readFunctionType("array", "2")};
     var unmangledNameIndex = $unmangledNameIndex;
     var isReflectable = array.length > unmangledNameIndex;
 
     if (getterStubName) {
       f = tearOff(funcs, array, isStatic, name, isIntercepted);
       descriptor[name].\$getter = f;
       f.\$getterStub = true;
       // Used to create an isolate using spawnFunction.
-      if (isStatic) #[name] = f;  // embedded globalFunctions.
+      if (isStatic) #globalFunctions[name] = f;
       originalDescriptor[getterStubName] = descriptor[getterStubName] = f;
       funcs.push(f);
       if (getterStubName) functions.push(getterStubName);
       f.\$stubName = getterStubName;
       f.\$callName = null;
-      if (isIntercepted) #[getterStubName] = true; // embedded interceptedNames.
+      if (isIntercepted) #interceptedNames[getterStubName] = true;
     }
     if (isReflectable) {
       for (var i = 0; i < funcs.length; i++) {
         funcs[i].$reflectableField = 1;
         funcs[i].$reflectionInfoField = array;
       }
-      var mangledNames = isStatic ? # : #;  // embedded mangledGlobalNames, mangledNames
+      var mangledNames = isStatic ? #mangledGlobalNames : #mangledNames;
       var unmangledName = ${readString("array", "unmangledNameIndex")};
       // The function is either a getter, a setter, or a method.
       // If it is a method, it might also have a tear-off closure.
       // The unmangledName is the same as the getter-name.
       var reflectionName = unmangledName;
       if (getterStubName) mangledNames[getterStubName] = reflectionName;
       if (isSetter) {
         reflectionName += "=";
       } else if (!isGetter) {
         reflectionName += ":" + requiredParameterCount +
           ":" + optionalParameterCount;
       }
       mangledNames[name] = reflectionName;
       funcs[0].$reflectionNameField = reflectionName;
       funcs[0].$metadataIndexField = unmangledNameIndex + 1;
       if (optionalParameterCount) descriptor[unmangledName + "*"] = funcs[0];
     }
   }
-''', [globalFunctionsAccess, interceptedNamesAccess,
-      mangledGlobalNamesAccess, mangledNamesAccess]);
+''', {'globalFunctions' : globalFunctionsAccess,
+      'interceptedNames': interceptedNamesAccess,
+      'mangledGlobalNames': mangledGlobalNamesAccess,
+      'mangledNames': mangledNamesAccess});
 
   List<jsAst.Statement> tearOffCode = buildTearOffCode(backend);
 
   jsAst.Statement init = js.statement('''{
   var functionCounter = 0;
   if (!#) # = [];  // embedded libraries.
   if (!#) # = map();  // embedded mangledNames.
   if (!#) # = map();  // embedded mangledGlobalNames.
   if (!#) # = map();  // embedded statics.
   if (!#) # = map();  // embedded typeInformation.
@@ skipping 136 matching lines @@
                   return new cache(this, funcs[0], null, name);
                 };
         }''', [tearOffAccessExpression, tearOffAccessExpression]);
   }
 
   jsAst.Statement tearOff = js.statement('''
     function tearOff(funcs, reflectionInfo, isStatic, name, isIntercepted) {
       var cache;
       return isStatic
           ? function() {
-              if (cache === void 0) cache = #(
+              if (cache === void 0) cache = #tearOff(
                   this, funcs, reflectionInfo, true, [], name).prototype;
               return cache;
             }
           : tearOffGetter(funcs, reflectionInfo, name, isIntercepted);
-    }''', tearOffAccessExpression);
+    }''',  {'tearOff': tearOffAccessExpression});
 
   return <jsAst.Statement>[tearOffGetter, tearOff];
 }
 
 String readString(String array, String index) {
   return readChecked(
       array, index, 'result != null && typeof result != "string"', 'string');
 }
 
 String readInt(String array, String index) {
@@ skipping 18 matching lines @@
 (function() {
   var result = $array[$index];
   if ($check) {
     throw new Error(
         name + ": expected value of type \'$type\' at index " + ($index) +
         " but got " + (typeof result));
   }
   return result;
 })()''';
 }