Remove SimpleType.

lib/compiler/implementation/typechecker.dart

 // Copyright (c) 2012, 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 TypeCheckerTask extends CompilerTask {
   TypeCheckerTask(Compiler compiler) : super(compiler);
   String get name() => "Type checker";
 
   static final bool LOG_FAILURES = false;
 
@@ skipping 47 matching lines @@
   }
 
   String toString() => stringName;
 }
 
 class InterfaceType implements Type {
   final SourceString name;
   final Element element;
   final Link<Type> arguments;
 
-  const InterfaceType(this.name, this.element, this.arguments);
+  const InterfaceType(this.name, this.element,
+                      [this.arguments = const EmptyLink<Type>()]);
 
   toString() {
     StringBuffer sb = new StringBuffer();
     sb.add(name.slowToString());
     if (!arguments.isEmpty()) {
       sb.add('<');
       arguments.printOn(sb);
       sb.add('>');
     }
     return sb.toString();
   }
 }
 
-// TODO(karlklose): merge into InterfaceType as a named constructor.
-class SimpleType extends InterfaceType {
-  const SimpleType(SourceString name, Element element)
-    : super(name, element, const EmptyLink<Type>());
-  String toString() => name.slowToString();
-}
-
 class FunctionType implements Type {
   final Element element;
   final Type returnType;
   final Link<Type> parameterTypes;
 
   const FunctionType(Type this.returnType, Link<Type> this.parameterTypes,
                      Element this.element);
 
   toString() {
     StringBuffer sb = new StringBuffer();
@@ skipping 10 matching lines @@
 class Types {
   static final VOID = const SourceString('void');
   static final INT = const SourceString('int');
   static final DOUBLE = const SourceString('double');
   static final DYNAMIC = const SourceString('Dynamic');
   static final STRING = const SourceString('String');
   static final BOOL = const SourceString('bool');
   static final OBJECT = const SourceString('Object');
   static final LIST = const SourceString('List');
 
-  final SimpleType voidType;
-  final SimpleType dynamicType;
+  final InterfaceType voidType;
+  final InterfaceType dynamicType;
 
   Types() : this.with(new LibraryElement(new Script(null, null)));
 
   Types.with(LibraryElement library)
-    : voidType = new SimpleType(VOID, new ClassElement(VOID, library)),
-      dynamicType = new SimpleType(DYNAMIC, new ClassElement(DYNAMIC, library));
+    : voidType = new InterfaceType(VOID, new ClassElement(VOID, library)),
+      dynamicType = new InterfaceType(DYNAMIC, new ClassElement(DYNAMIC, library));
 
   Type lookup(SourceString s) {
     if (VOID == s) {
       return voidType;
     } else if (DYNAMIC == s || s.stringValue === 'var') {
       return dynamicType;
     }
     return null;
   }
 
   /** Returns true if t is a subtype of s */
   bool isSubtype(Type t, Type s) {
     if (t === s || t === dynamicType || s === dynamicType ||
         s.name == OBJECT) return true;
-    if (t is SimpleType) {
-      if (s is !SimpleType) return false;
+    if (t is InterfaceType) {
+      if (s is !InterfaceType) return false;
       ClassElement tc = t.element;
       for (Link<Type> supertypes = tc.allSupertypes;
            supertypes != null && !supertypes.isEmpty();
            supertypes = supertypes.tail) {
         Type supertype = supertypes.head;
         if (supertype.element === s.element) return true;
       }
       return false;
     } else if (t is FunctionType) {
       if (s is !FunctionType) return false;
@@ skipping 596 matching lines @@
   }
 
   visitCatchBlock(CatchBlock node) {
     fail(node);
   }
 
   visitTypedef(Typedef node) {
     fail(node);
   }
 }