Refactor Library/CompilationUnit and how we define local Scope.

lib/dartdoc/mirrors/dart2js_mirror.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.
 
 #library('mirrors.dart2js');
 
 #import('../../compiler/compiler.dart', prefix: 'diagnostics');
 #import('../../compiler/implementation/elements/elements.dart');
 #import('../../compiler/implementation/apiimpl.dart', prefix: 'api');
 #import('../../compiler/implementation/scanner/scannerlib.dart');
@@ skipping 218 matching lines @@
     log('Resolving...');
     phase = Compiler.PHASE_RESOLVING;
     backend.enqueueHelpers(enqueuer.resolution);
     processQueueList(enqueuer.resolution, elementList);
     log('Resolved ${enqueuer.resolution.resolvedElements.length} elements.');
   }
 
   void processQueueList(Enqueuer world, List<LibraryElement> elements) {
     backend.processNativeClasses(world, libraries.getValues());
     for (var library in elements) {
-      library.elements.forEach((_, element) {
+      library.localMembers.forEach((element) {

[ahe, 2012/08/14 12:45:26]

I like this better than the old version.

         world.addToWorkList(element);
       });
     }
     progress.reset();
     world.forEach((WorkItem work) {
       withCurrentElement(work.element, () => work.run(this, world));
     });
     //world.queueIsClosed = true;
     assert(world.checkNoEnqueuedInvokedInstanceMethods());
     world.registerFieldClosureInvocations();
@@ skipping 229 matching lines @@
   /**
    * Returns the library name (for libraries with a #library tag) or the script
    * file name (for scripts without a #library tag). The latter case is used to
    * provide a 'library name' for scripts, to use for instance in dartdoc.
    */
   String get simpleName() {
     if (_library.libraryTag !== null) {
       return _library.libraryTag.argument.dartString.slowToString();
     } else {
       // Use the file name as script name.
-      String path = _library.script.uri.path;
+      String path = _library.uri.path;

[ahe, 2012/08/14 12:45:26]

Also better, I think.

       return path.substring(path.lastIndexOf('/') + 1);
     }
   }
 
   String get qualifiedName() => simpleName;
 
   void _ensureTypes() {
     if (_types == null) {
       _types = <InterfaceMirror>{};
       _library.forEachExport((Element e) {
@@ skipping 177 matching lines @@
         var span = system.compiler.spanFromNode(node, script.uri);
         return new Dart2JsLocation(script, span);
       }
     }
     return super.location;
   }
 
   void _ensureMembers() {
     if (_members == null) {
       _members = <Dart2JsMemberMirror>{};
-      _class.constructors.forEach((_, e) {
+      _class.localMembers.forEach((e) {
         for (var member in _convertElementMemberToMemberMirrors(this, e)) {
           _members[member.canonicalName] = member;
         }
-      });
-      _class.localMembers.forEach((_, e) {
-        for (var member in _convertElementMemberToMemberMirrors(this, e)) {
-          _members[member.canonicalName] = member;
-        }
       });
     }
   }
 
   Map<Object, MemberMirror> get declaredMembers() {
     _ensureMembers();
     return new ImmutableMapWrapper<Object, MemberMirror>(_members);
   }
 
   bool get isObject() => _class == system.compiler.objectClass;
@@ skipping 654 matching lines @@
     if (node !== null) {
       var span = system.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     } else {
       var span = system.compiler.spanFromElement(_variable);
       return new Dart2JsLocation(script, span);
     }
   }
 }