TBR (red build bot).

frog/library.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 LibraryImport {
   String prefix;
   Library library;
   LibraryImport(this.library, [this.prefix = null]);
 }
 
 /** Represents a Dart library. */
 class Library {
   final SourceFile baseSource;
-  Map<String, DefinedType> types;
+  Map<String, Type> types;
   List<LibraryImport> imports;
   String sourceDir;
   String name;
   List<SourceFile> natives;
   List<SourceFile> sources;
 
   Map<String, MemberSet> _privateMembers;
 
   /** The type that holds top level types in the library. */
   DefinedType topType;
@@ skipping 89 matching lines @@
     final def = new FunctionTypeDefinition(func, null, func.span);
     final type = new DefinedType(name, this, def, false);
     type.addMethod('\$call', func);
     type.members['\$call'].resolve(inType);
     // Function types implement the Function interface.
     type.interfaces = [world.functionType];
     return type;
   }
 
   /** Adds a type to the library. */
-  DefinedType addType(String name, Node definition, bool isClass) {
+  Type addType(String name, Node definition, bool isClass) {
     if (types.containsKey(name)) {
       var existingType = types[name];
       if (isCore && existingType.definition == null) {
         // TODO(jimhug): Validate compatibility with natives.
         existingType.setDefinition(definition);
       } else {
         world.warning('duplicate definition of $name', definition.span);
       }
     } else {
       types[name] = new DefinedType(name, this, definition, isClass);
@@ skipping 109 matching lines @@
     var visitor = new _LibraryVisitor(this);
     visitor.addSource(baseSource);
   }
 
   toString() => baseSource.filename;
 }
 
 
 class _LibraryVisitor implements TreeVisitor {
   final Library library;
-  DefinedType currentType;
+  Type currentType;
   List<SourceFile> sources;
 
   bool seenImport = false;
   bool seenSource = false;
   bool seenResource = false;
   bool isTop = true;
 
   _LibraryVisitor(this.library) {
     currentType = library.topType;
     sources = [];
@@ skipping 178 matching lines @@
 
   void visitFunctionDefinition(FunctionDefinition node) {
     currentType.addMethod(node.name.name, node);
   }
 
   void visitFunctionTypeDefinition(FunctionTypeDefinition node) {
     var type = library.addType(node.func.name.name, node, false);
     type.addMethod('\$call', node.func);
   }
 }