dart2js: split out types from metadata.

sdk/lib/_internal/compiler/js_lib/js_mirrors.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.
 
 library dart._js_mirrors;
 
 import 'dart:_js_embedded_names' show
     JsGetName,
     ALL_CLASSES,
     LAZIES,
@@ skipping 37 matching lines @@
     Primitives,
     ReflectionInfo,
     RuntimeError,
     TearOffClosure,
     TypeVariable,
     UnimplementedNoSuchMethodError,
     createRuntimeType,
     createUnmangledInvocationMirror,
     getMangledTypeName,
     getMetadata,
+    getType,
     getRuntimeType,
     runtimeTypeToString,
     setRuntimeTypeInfo,
     throwInvalidReflectionError,
     TypeImpl,
     deferredLoadHook;
 
 import 'dart:_interceptors' show
     Interceptor,
     JSArray,
@@ skipping 212 matching lines @@
   }
 
   String get _prettyName => 'TypeVariableMirror';
 
   bool get isTopLevel => false;
   bool get isStatic => false;
 
   TypeMirror get upperBound {
     if (_cachedUpperBound != null) return _cachedUpperBound;
     return _cachedUpperBound = typeMirrorFromRuntimeTypeRepresentation(
-        owner, getMetadata(_typeVariable.bound));
+        owner, getType(_typeVariable.bound));
   }
 
   bool isSubtypeOf(TypeMirror other) => throw new UnimplementedError();
   bool isAssignableTo(TypeMirror other) => throw new UnimplementedError();
 
   _asRuntimeType() => _metadataIndex;
 }
 
 class JsTypeMirror extends JsDeclarationMirror implements TypeMirror {
   JsTypeMirror(Symbol simpleName)
@@ skipping 341 matching lines @@
     // Typedefs are represented as normal classes with two special properties:
     //   TYPEDEF_PREDICATE_PROPERTY_NAME and TYPEDEF_TYPE_PROPERTY_NAME.
     // For example:
     //  MyTypedef: {
     //     "^": "Object;",
     //     $typedefType: 58,
     //     $$isTypedef: true
     //  }
     //  The typedefType is the index into the metadata table.
     int index = JS('int', '#[#]', descriptor, TYPEDEF_TYPE_PROPERTY_NAME);
-    mirror = new JsTypedefMirror(symbol, mangledName, getMetadata(index));
+    mirror = new JsTypedefMirror(symbol, mangledName, getType(index));
   } else {
     fields = JS('', '#[#]', descriptor,
         JS_GET_NAME(JsGetName.CLASS_DESCRIPTOR_PROPERTY));
     if (fields is List) {
       fieldsMetadata = fields.getRange(1, fields.length).toList();
       fields = fields[0];
     }
     if (fields is! String) {
       // TODO(ahe): This is CSP mode.  Find a way to determine the
       // fields of this class.
@@ skipping 840 matching lines @@
 
   List<InstanceMirror> get metadata => _class.metadata;
 
   ClassMirror get superclass {
     if (_superclass != null) return _superclass;
 
     var typeInformationContainer = JS_EMBEDDED_GLOBAL('', TYPE_INFORMATION);
     List<int> typeInformation =
         JS('List|Null', '#[#]', typeInformationContainer, _class._mangledName);
     assert(typeInformation != null);
-    var type = getMetadata(typeInformation[0]);
+    var type = getType(typeInformation[0]);
     return _superclass = typeMirrorFromRuntimeTypeRepresentation(this, type);
   }
 
   InstanceMirror invoke(Symbol memberName,
                         List positionalArguments,
                         [Map<Symbol,dynamic> namedArguments]) {
     return _class.invoke(memberName, positionalArguments, namedArguments);
   }
 
   bool get isOriginalDeclaration => false;
@@ skipping 455 matching lines @@
     return _cachedMetadata =
         new UnmodifiableListView<InstanceMirror>(_metadata.map(reflect));
   }
 
   ClassMirror get superclass {
     if (_superclass == null) {
       var typeInformationContainer = JS_EMBEDDED_GLOBAL('', TYPE_INFORMATION);
       List<int> typeInformation =
           JS('List|Null', '#[#]', typeInformationContainer, _mangledName);
       if (typeInformation != null) {
-        var type = getMetadata(typeInformation[0]);
+        var type = getType(typeInformation[0]);
         _superclass = typeMirrorFromRuntimeTypeRepresentation(this, type);
       } else {
         var superclassName = _fieldsDescriptor.split(';')[0];
         // TODO(zarah): Remove special handing of mixins.
         var mixins = superclassName.split('+');
         if (mixins.length > 1) {
           if (mixins.length != 2) {
             throw new RuntimeError('Strange mixin: $_fieldsDescriptor');
           }
           _superclass = reflectClassByMangledName(mixins[0]);
@@ skipping 37 matching lines @@
 
   ClassMirror get originalDeclaration => this;
 
   List<ClassMirror> _getSuperinterfacesWithOwner(DeclarationMirror owner) {
     var typeInformationContainer = JS_EMBEDDED_GLOBAL('', TYPE_INFORMATION);
     List<int> typeInformation =
         JS('List|Null', '#[#]', typeInformationContainer, _mangledName);
     List<ClassMirror> result = const <ClassMirror>[];
     if (typeInformation != null) {
       ClassMirror lookupType(int i) {
-        var type = getMetadata(i);
+        var type = getType(i);
         return typeMirrorFromRuntimeTypeRepresentation(owner, type);
       }
 
       //We skip the first since it is the supertype.
       result = typeInformation.skip(1).map(lookupType).toList();
     }
 
     return new UnmodifiableListView<ClassMirror>(result);
   }
 
@@ skipping 123 matching lines @@
                                 type,
                                 isFinal,
                                 isStatic,
                                 metadataFunction,
                                 owner);
   }
 
   String get _prettyName => 'VariableMirror';
 
   TypeMirror get type {
-    return typeMirrorFromRuntimeTypeRepresentation(owner, getMetadata(_type));
+    return typeMirrorFromRuntimeTypeRepresentation(owner, getType(_type));
   }
 
   DeclarationMirror get owner => _owner;
 
   List<InstanceMirror> get metadata {
     preserveMetadata();
     if (_metadata == null) {
       _metadata = (_metadataFunction == null)
           ? const [] : JS('', '#()', _metadataFunction);
     }
@@ skipping 836 matching lines @@
   // have a part (following a '.') that starts with '_'.
   const int UNDERSCORE = 0x5f;
   if (name.isEmpty) return true;
   int index = -1;
   do {
     if (name.codeUnitAt(index + 1) == UNDERSCORE) return false;
     index = name.indexOf('.', index + 1);
   } while (index >= 0 && index + 1 < name.length);
   return true;
 }