Some cleanups to Frog to avoid looking up its builtin types too much

frog/world.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.
 
 /** The one true [World]. */
 World world;
 
 /**
  * Experimental phase to enable await, only set when using the
  * await/awaitc.dart entrypoint.
@@ skipping 50 matching lines @@
 /** Represents a Dart "world" of code. */
 class World {
   WorldGenerator gen;
   String legCode; // TODO(kasperl): Remove this temporary kludge.
 
   FileSystem files;
   final LibraryReader reader;
 
   Map<String, Library> libraries;
   Library corelib;
+  Library coreimpl;
 
-  Library get coreimpl() => libraries['dart:coreimpl'];
-  Library get dom() => libraries['dart:dom'];
+  // TODO(jmesserly): we shouldn't be special casing DOM anywhere.
+  Library dom;
 
   List<Library> _todo;
 
   /** Internal map to track name conflicts in the generated javascript. */
   Map<String, Element> _topNames;
 
   Map<String, MemberSet> _members;
 
   MessageHandler messageHandler;
 
   int errors = 0, warnings = 0;
   int dartBytesRead = 0, jsBytesWritten = 0;
   bool seenFatal = false;
 
   // Special types to Dart.
   DefinedType varType;
   // TODO(jimhug): Is this ever not === varType?
   DefinedType dynamicType;
 
   DefinedType voidType;
-
   DefinedType objectType;
   DefinedType numType;
   DefinedType intType;
   DefinedType doubleType;
   DefinedType boolType;
   DefinedType stringType;
   DefinedType listType;
   DefinedType mapType;
   DefinedType functionType;
+  DefinedType typeErrorType;
+
+  // Types from dart:coreimpl that the compiler needs
+  DefinedType numImplType;
+  DefinedType stringImplType;
+  DefinedType functionImplType;
+  DefinedType listFactoryType;
+  DefinedType immutableListType;
 
   NonNullableType nonNullBool;
 
   World(this.files)
     : libraries = {}, _todo = [], _members = {}, _topNames = {},
       // TODO(jmesserly): these two types don't actually back our Date and
       // RegExp yet, so we need to add them manually.
       reader = new LibraryReader() {
   }
 
   void reset() {
     // TODO(jimhug): Use a smaller hammer in the future.
     libraries = {}; _todo = []; _members = {}; _topNames = {};
     errors = warnings = 0;
     seenFatal = false;
     init();
   }
 
   init() {
     // Setup well-known libraries and types.
     corelib = new Library(readFile('dart:core'));
     libraries['dart:core'] = corelib;
     _todo.add(corelib);
 
-    voidType = _addToCoreLib('void', false);
-    dynamicType = _addToCoreLib('Dynamic', false);
+    coreimpl = getOrAddLibrary('dart:coreimpl');
+
+    voidType = corelib.addType('void', null, false);
+    dynamicType = corelib.addType('Dynamic', null, false);
     varType = dynamicType;
 
-    objectType = _addToCoreLib('Object', true);
-    numType = _addToCoreLib('num', false);
-    intType = _addToCoreLib('int', false);
-    doubleType = _addToCoreLib('double', false);
-    boolType = _addToCoreLib('bool', false);
-    stringType = _addToCoreLib('String', false);
-    listType = _addToCoreLib('List', false);
-    mapType = _addToCoreLib('Map', false);
-    functionType = _addToCoreLib('Function', false);
+    objectType = corelib.addType('Object', null, true);
+    numType = corelib.addType('num', null, false);
+    intType = corelib.addType('int', null, false);
+    doubleType = corelib.addType('double', null, false);
+    boolType = corelib.addType('bool', null, false);
+    stringType = corelib.addType('String', null, false);
+    listType = corelib.addType('List', null, false);
+    mapType = corelib.addType('Map', null, false);
+    functionType = corelib.addType('Function', null, false);
+    typeErrorType = corelib.addType('TypeError', null, false);
+
+    numImplType = coreimpl.addType('NumImplementation', null, true);
+    stringImplType = coreimpl.addType('StringImplementation', null, true);
+    immutableListType = coreimpl.addType('ImmutableList', null, true);
+    listFactoryType = coreimpl.addType('ListFactory', null, true);
+    functionImplType = coreimpl.addType('_FunctionImplementation', null, true);
 
     nonNullBool = new NonNullableType(boolType);
   }
 
   _addMember(Member member) {
     // Private members are only visible in their own library.
     assert(!member.isPrivate);
     if (member.isStatic) {
       if (member.declaringType.isTop) {
         _addTopName(member);
       }
       return;
     }
 
     var mset = _members[member.name];
     if (mset == null) {
       mset = new MemberSet(member, isVar:true);
       _members[mset.name] = mset;
     } else {
       mset.members.add(member);
     }
   }
 
   /**
    * Adds a top level named [Element] so we track which names will be used in
    * the generated JS.
    */
   _addTopName(Element named) {
-    if (named.nativeName != null) {
+    if (named is Type && named.isNative) {
       // Reserve the native name if we have one. This ensures no other type
       // will take our native name.
       _addJavascriptTopName(named, named.nativeName);
     }
     _addJavascriptTopName(named, named.jsname);
   }
 
   /**
    * Reserves [name] in the generated JS, or renames the lower priority
    * [Element] if the name we wanted was already taken.
@@ skipping 68 matching lines @@
     }
     _topNames[named.jsname] = named;
   }
 
   _addType(Type type) {
     // Top types don't have a name - we will capture their members in
     // [_addMember].
     if (!type.isTop) _addTopName(type);
   }
 
-  _addToCoreLib(String name, bool isClass) {
-    var ret = new DefinedType(name, corelib, null, isClass);
-    corelib.types[name] = ret;
-    return ret;
-  }
-
   // TODO(jimhug): Can this just be a const Set?
   Set<String> _jsKeywords;
 
   /** Ensures that identifiers are legal in the generated JS. */
   String toJsIdentifier(String name) {
     if (name == null) return null;
     if (_jsKeywords == null) {
       // TODO(jmesserly): this doesn't work if I write "new Set<String>.from"
       // List of JS reserved words.
       _jsKeywords = new Set.from([
@@ skipping 109 matching lines @@
 
     if (library == null) {
       library = new Library(readFile(filename));
       info('read library ${filename}');
       if (!library.isCore &&
           !library.imports.some((li) => li.library.isCore)) {
         library.imports.add(new LibraryImport(corelib));
       }
       libraries[filename] = library;
       _todo.add(library);
+
+      if (filename == 'dart:dom') {
+        dom = library;
+      }
     }
     return library;
   }
 
   process() {
     while (_todo.length > 0) {
       final todo = _todo;
       _todo = [];
       for (var lib in todo) {
         lib.visitSources();
@@ skipping 150 matching lines @@
 
   withTiming(String name, f()) {
     final sw = new Stopwatch();
     sw.start();
     var result = f();
     sw.stop();
     info('$name in ${sw.elapsedInMs()}msec');
     return result;
   }
 }