Fix bug 578

frog/type.dart

 // Copyright (c) 2011, 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.
 
-class Type implements Named, Hashable {
-  final String name;
+class Type extends Element {
   bool isTested;
 
   /**
    * For core types (int, String, etc) this is the generated type assertion
    * function (uses JS "typeof"). This field is null for all other types.
    */
   String typeCheckCode;
 
-  String _jsname;
-
   Member _typeMember;
 
   /** Stubs used to call into this method dynamically. Lazy initialized. */
   Map<String, VarMember> varStubs;
 
   /** Cache of [MemberSet]s that have been resolved. */
   Map<String, MemberSet> _resolvedMembers;
 
-  Type(this.name): isTested = false, _resolvedMembers = {};
+  Type(String name): isTested = false, _resolvedMembers = {}, super(name, null);
 
   void markUsed() {}
   abstract void genMethod(Member method);
 
   TypeMember get typeMember() {
     if (_typeMember == null) {
       _typeMember = new TypeMember(this);
     }
     return _typeMember;
   }
 
-  abstract SourceSpan get span();
-
-  abstract Type resolveType(TypeReference node, bool isRequired);
-
   abstract Type resolveTypeParams(ConcreteType inType);
 
   Member getMember(String name) => null;
   abstract MethodMember getConstructor(String name);
   abstract MethodMember getFactory(Type type, String name);
   abstract Type getOrMakeConcreteType(List<Type> typeArgs);
   abstract Map<String, MethodMember> get constructors();
   abstract addDirectSubtype(Type type);
   abstract bool get isClass();
-  abstract Library get library();
   Set<Type> get subtypes() => null;
 
   // TODO(jmesserly): rename to isDynamic?
   bool get isVar() => false;
   bool get isTop() => false;
 
   bool get isObject() => false;
   bool get isString() => false;
   bool get isBool() => false;
   bool get isFunction() => false;
@@ skipping 14 matching lines @@
 
   /** Gets the $call method for a function type. */
   MethodMember getCallMethod() => null;
 
   /** These types may not be implemented or extended by user code. */
   bool get isClosed() => isString || isBool || isNum || isFunction || isVar;
 
   bool get isUsed() => false;
 
   bool get isGeneric() => false;
-  bool get isNativeType() => false;
-
-  bool get isNative() => isNativeType; // TODO(jimhug): remove isNativeType.
 
   bool get isHiddenNativeType() => false;
 
   bool get hasTypeParams() => false;
 
   String get typeofName() => null;
 
-  String get jsname() => _jsname == null ? name : _jsname;
-
-  set jsname(String name) => _jsname = name;
-
   Map<String, Member> get members() => null;
   Definition get definition() => null;
   FactoryMap get factories() => null;
 
   // TODO(jmesserly): should try using a const list instead of null to represent
   // the absence of type parameters.
   Collection<Type> get typeArgsInOrder() => null;
   DefinedType get genericType() => this;
 
   // TODO(jmesserly): what should these do for ParameterType?
   List<Type> get interfaces() => null;
   Type get parent() => null;
 
   Map<String, Member> getAllMembers() => {};
 
-  int hashCode() => name.hashCode();
-
   bool _hasNativeSubtypes;
   bool get hasNativeSubtypes() {
     if (_hasNativeSubtypes == null) {
-      _hasNativeSubtypes = subtypes.some((t) => t.isNativeType);
+      _hasNativeSubtypes = subtypes.some((t) => t.isNative);
     }
     return _hasNativeSubtypes;
   }
 
   void _checkOverride(Member member) {
     // always look in parents to check that any overloads are legal
     var parentMember = _getMemberInParents(member.name);
     if (parentMember != null) {
       // TODO(jimhug): Ensure that this is only done once.
       if (!member.isPrivate || member.library == parentMember.library) {
@@ skipping 317 matching lines @@
     world.internalError('no constructors on type parameters yet');
   }
 
   Type getOrMakeConcreteType(List<Type> typeArgs) {
     world.internalError('no concrete types of type parameters yet', span);
   }
 
   Type resolveTypeParams(ConcreteType inType) {
     return inType.typeArguments[name];
   }