fix Library*NegativeTests (and a couple Prefix ones by accident)

frog/library.dart

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// 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 LibraryImport {
-  String prefix;
-  Library library;
-  LibraryImport(this.library, [this.prefix = null]);
+  final String prefix;
+  final Library library;
+  final SourceSpan span;
+  LibraryImport(this.library, [this.prefix, this.span]);
+}
+
+// TODO(jimhug): Make this more useful for good error messages.
+class AmbiguousMember extends Member {
+  List<Member> members;
+  AmbiguousMember(String name, this.members): super(name, null);
 }
 
 
 /** Represents a Dart library. */
 class Library extends Element {
   final SourceFile baseSource;
   Map<String, DefinedType> types;
   List<LibraryImport> imports;
   String sourceDir;
   List<SourceFile> natives;
   List<SourceFile> sources;
 
+  Map<String, Member> _topNames;
   Map<String, MemberSet> _privateMembers;
 
   /** The type that holds top level types in the library. */
   DefinedType topType;
 
   /** Set to true by [WorldGenerator] once this type has been written. */
   bool isWritten = false;
 
   Library(this.baseSource) : super(null, null) {
     sourceDir = dirname(baseSource.filename);
@@ skipping 21 matching lines @@
   String makeFullPath(String filename) {
     if (filename.startsWith('dart:')) return filename;
     // TODO(jmesserly): replace with node.js path.resolve
     if (filename.startsWith('/')) return filename;
     if (filename.startsWith('file:///')) return filename;
     if (filename.startsWith('http://')) return filename;
     return joinPaths(sourceDir, filename);
   }
 
   /** Adds an import to the library. */
-  addImport(String fullname, String prefix) {
+  addImport(String fullname, String prefix, SourceSpan span) {
     var newLib = world.getOrAddLibrary(fullname);
-    imports.add(new LibraryImport(newLib, prefix));
+    // Special exemption in spec to ensure core is only imported once

[Jennifer Messerly, 2012/01/12 01:58:33]

Is this to avoid our implicit import of dart:core conflicting with explicit
import?

+    if (newLib.isCore) return;
+    imports.add(new LibraryImport(newLib, prefix, span));
     return newLib;
   }
 
   addNative(String fullname) {
     natives.add(world.reader.readFile(fullname));
   }
 
   MemberSet _findMembers(String name) {
     if (name.startsWith('_')) {
       return _privateMembers[name];
@@ skipping 81 matching lines @@
         return null;
       }
 
       // The type we got back was the "top level" library type.
       // Now perform a lookup in that library for the next name.
       return result.library.findTypeByName(type.names[0].name);
     }
     return result;
   }
 
+  // TODO(jimhug): Should be merged with new lookup method's logic.
   Type findTypeByName(String name) {
     var ret = types[name];
 
     // Check all imports even if ret != null to detect conflicting names.
     // TODO(jimhug): Only do this on first lookup.
     for (var imported in imports) {
       var newRet = null;
       if (imported.prefix == null) {
         newRet = imported.library.types[name];
       } else if (imported.prefix == name) {
@@ skipping 33 matching lines @@
 
   static String _getDottedName(NameTypeReference type) {
     if (type.names != null) {
       var names = map(type.names, (n) => n.name);
       return type.name.name + '.' + Strings.join(names, '.');
     } else {
       return type.name.name;
     }
   }
 
   Member lookup(String name, SourceSpan span) {

[Jennifer Messerly, 2012/01/12 01:58:33]

Member lookup(String name, SourceSpan span) => _topNames[name];

-    var retType = findTypeByName(name);
-    var ret = null;
-
-    if (retType != null) {
-      ret = retType.typeMember;
-    }
-
-    var newRet = topType.getMember(name);
-    // TODO(jimhug): Shares too much code with body of loop.
-    if (newRet != null) {
-      if (ret != null && ret != newRet) {
-        world.error('conflicting members for "$name"',
-          span, ret.span, newRet.span);
-      } else {
-        ret = newRet;
-      }
-    }
-
-    // Check all imports even if ret != null to detect conflicting names.
-    // TODO(jimhug): Only do this on first lookup.
-    for (var imported in imports) {
-      if (imported.prefix == null) {
-        newRet = imported.library.topType.getMember(name);
-        if (newRet != null) {
-          if (ret != null && ret != newRet) {
-            world.error('conflicting members for "$name"',
-              span, ret.span, newRet.span);
-          } else {
-            ret = newRet;
-          }
-        }
-      }
-    }
-    return ret;
+    return _topNames[name];
   }
 
   resolve() {
     if (name == null) {
       // TODO(jimhug): More fodder for io library.
       name = baseSource.filename;
       var index = name.lastIndexOf('/', name.length);
       if (index >= 0) {
         name = name.substring(index+1);
       }
       index = name.indexOf('.');
       if (index > 0) {
         name = name.substring(0, index);
       }
     }
     // TODO(jimhug): Expand to handle all illegal id characters
     _jsname =
       name.replaceAll('.', '_').replaceAll(':', '_').replaceAll(' ', '_');
 
     for (var type in types.getValues()) {
       type.resolve();
     }
   }
 
+  _addTopName(String name, Member member, [SourceSpan localSpan]) {
+    var existing = _topNames[name];
+    if (existing === null) {
+      _topNames[name] = member;
+    } else {
+      if (existing is AmbiguousMember) {
+        existing.members.add(member);
+      } else {
+        var newMember = new AmbiguousMember(name, [existing, member]);
+        world.error('conflicting members for "$name"',
+          existing.span, member.span, localSpan);
+          _topNames[name] = newMember;
+      }
+    }
+  }
+
+  _addTopNames(Library lib) {
+    for (var member in lib.topType.members.getValues()) {
+      if (member.isPrivate && lib != this) continue;
+      _addTopName(member.name, member);
+    }
+    for (var type in lib.types.getValues()) {
+      if (!type.isTop) {
+        if (lib != this && type.typeMember.isPrivate) continue;
+        _addTopName(type.name, type.typeMember);
+      }
+    }
+  }
+
+  /**
+   * This method will check for any conflicts in top-level names in this
+   * library.  It will also build up a map from top-level names to a single
+   * member to be used for future lookups both to keep error messages clean
+   * and as a minor perf optimization.
+   */
+  postResolveChecks() {
+    _topNames = {};
+    // check for conflicts between top-level names
+    _addTopNames(this);
+    for (var imported in imports) {
+      if (imported.prefix == null) {
+        _addTopNames(imported.library);
+      } else {
+        _addTopName(imported.prefix, imported.library.topType.typeMember,
+            imported.span);
+      }
+    }
+  }
+
   visitSources() {
     var visitor = new _LibraryVisitor(this);
     visitor.addSource(baseSource);
   }
 
   toString() => baseSource.filename;
 
   int hashCode() => baseSource.filename.hashCode();
 
   bool operator ==(other) => other is Library &&
@@ skipping 95 matching lines @@
         if (prefix == '') prefix = null;
 
         var filename = library.makeFullPath(name);
 
         if (library.imports.some((li) => li.library.baseSource == filename)) {
           // TODO(jimhug): Can you import a lib twice with different prefixes?
           world.error('duplicate import of "$name"', node.span);
           return;
         }
 
-        var newLib = library.addImport(filename, prefix);
+        var newLib = library.addImport(filename, prefix, node.span);
         // TODO(jimhug): Add check that imported library has a #library
         break;
 
       case "source":
         seenSource = true;
         name = getSingleStringArg(node);
         addSourceFromName(name, node.span);
         if (seenResource) {
           world.error('#sources must come before any #resource', node.span);
         }
@@ skipping 79 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);
   }
 }