dart2js: split out types from metadata.

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;
@@ skipping 32 matching lines @@
   jsAst.Expression staticsAccess =
       emitter.generateEmbeddedGlobalAccess(embeddedNames.STATICS);
   jsAst.Expression interceptedNamesAccess =
       emitter.generateEmbeddedGlobalAccess(embeddedNames.INTERCEPTED_NAMES);
   jsAst.Expression mangledGlobalNamesAccess =
       emitter.generateEmbeddedGlobalAccess(embeddedNames.MANGLED_GLOBAL_NAMES);
   jsAst.Expression mangledNamesAccess =
       emitter.generateEmbeddedGlobalAccess(embeddedNames.MANGLED_NAMES);
   jsAst.Expression librariesAccess =
       emitter.generateEmbeddedGlobalAccess(embeddedNames.LIBRARIES);
-  jsAst.Expression metadataAccess =
-      emitter.generateEmbeddedGlobalAccess(embeddedNames.METADATA);
+  jsAst.Expression typesAccess =
+      emitter.generateEmbeddedGlobalAccess(embeddedNames.TYPES);
 
   jsAst.Statement processClassData = js.statement('''{
   function processClassData(cls, descriptor, processedClasses) {
     var newDesc = {};
     var previousProperty;
     var properties = Object.keys(descriptor);
     for (var i = 0; i < properties.length; i++) {
       var property = properties[i];
       var firstChar = property.substring(0, 1);
       if (property === "static") {
@@ skipping 43 matching lines @@
     fields = s[1] == "" ? [] : s[1].split(",");
     supr = s[0];
     // ${ClassBuilder.functionTypeEncodingDescription}.
     split = supr.split(":");
     if (split.length == 2) {
       supr = split[0];
       var functionSignature = split[1];
       if (functionSignature)
         newDesc.${namer.operatorSignature} = function(s) {
           return function() {
-            return #metadata[s];
+            return #types[s];
           };
         }(functionSignature);
     }
 
     if (supr) processedClasses.pending[cls] = supr;
     if (#notInCspMode) {
       processedClasses.combinedConstructorFunction += defineClass(cls, fields);
       processedClasses.constructorsList.push(cls);
     }
     processedClasses.collected[cls] = [globalObject, newDesc];
     classes.push(cls);
   }
 }''', {'embeddedStatics': staticsAccess,
        'hasRetainedMetadata': backend.hasRetainedMetadata,
-       'metadata': metadataAccess,
+       'types': typesAccess,
        'notInCspMode': !compiler.useContentSecurityPolicy});
 
   // TODO(zarah): Remove empty else branches in output when if(#hole) is false.
   jsAst.Statement processStatics = js.statement('''
     function processStatics(descriptor, processedClasses) {
       var properties = Object.keys(descriptor);
       for (var i = 0; i < properties.length; i++) {
         var property = properties[i];
         if (property === "${namer.classDescriptorProperty}") continue;
         var element = descriptor[property];
@@ skipping 342 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;
 })()''';
 }