Import scope rules updated.

lib/compiler/implementation/elements/elements.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('elements');
 
 #import('dart:uri');
 
 #import('../tree/tree.dart');
 #import('../scanner/scannerlib.dart');
@@ skipping 298 matching lines @@
  * except [isErroneous] will currently throw an exception. (This might
  * change when we actually want more information on the erroneous element,
  * e.g., the name of the element we were trying to resolve.)
  *
  * Code that cannot not handle an [ErroneousElement] should use
  *   [: Element.isInvalid(element) :]
  * to check for unresolvable elements instead of
  *   [: element == null :].
  */
 class ErroneousElement extends Element {
-  final Message errorMessage;
+  final MessageKind messageKind;
+  final List messageArguments;
   final SourceString targetName;
 
-  ErroneousElement(this.errorMessage, this.targetName, Element enclosing)
+  ErroneousElement(this.messageKind, this.messageArguments,
+                   this.targetName, Element enclosing)
       : super(const SourceString('erroneous element'), null, enclosing);
 
   isErroneous() => true;
 
   unsupported() {
     throw 'unsupported operation on erroneous element';
   }
 
   SourceString get name => unsupported();
   ElementKind get kind => unsupported();
   Link<MetadataAnnotation> get metadata => unsupported();
 
   getLibrary() => enclosingElement.getLibrary();
 }
 
 class ErroneousFunctionElement extends ErroneousElement
                                implements FunctionElement {
-  ErroneousFunctionElement(Message errorMessage, SourceString targetName,
-                           Element enclosing)
-      : super(errorMessage, targetName, enclosing);
+  ErroneousFunctionElement(MessageKind messageKind, List messageArguments,
+                           SourceString targetName, Element enclosing)
+      : super(messageKind, messageArguments, targetName, enclosing);
 
   get type => unsupported();
   get cachedNode => unsupported();
   get functionSignature => unsupported();
   get patch => unsupported();
   get defaultImplementation => unsupported();
   bool get isPatched => unsupported();
   setPatch(patch) => unsupported();
   computeSignature(compiler) => unsupported();
   requiredParameterCount(compiler) => unsupported();
@@ skipping 126 matching lines @@
 
 class LibraryElement extends ScopeContainerElement {
   final Uri uri;
   CompilationUnitElement entryCompilationUnit;
   Link<CompilationUnitElement> compilationUnits =
       const EmptyLink<CompilationUnitElement>();
   Link<ScriptTag> tags = const EmptyLink<ScriptTag>();
   ScriptTag libraryTag;
   bool canUseNative = false;
   LibraryElement patch = null;
+  final Map<SourceString, Element> importScope;

[Lasse Reichstein Nielsen, 2012/09/20 12:21:08]

Documentation. What is the meaning of this field? What is it used for?

Should this be a Scope instead of a Map? Or some other meaningful wrapping of
the map, to avoid people *fiddling* with the Map from the outside?

[Johnni Winther, 2012/09/21 14:00:05]

Comment added.

 
   LibraryElement(Script script, [Uri uri])
     : this.uri = ((uri === null) ? script.uri : uri),
+      importScope = new Map<SourceString, Element>(),
       super(new SourceString(script.name), ElementKind.LIBRARY, null) {
     entryCompilationUnit = new CompilationUnitElement(script, this);
   }
 
 
   bool get isPatched => patch !== null;
 
   void addCompilationUnit(CompilationUnitElement element) {
     compilationUnits = compilationUnits.prepend(element);
   }
 
   void addTag(ScriptTag tag, DiagnosticListener listener) {
     tags = tags.prepend(tag);
   }
 
-  /** Look up a top-level element in this library. The element could
-    * potentially have been imported from another library. Returns
-    * null if no such element exist. */
+  /**
+   * Adds [element] to the imported scope of this library.

[Lasse Reichstein Nielsen, 2012/09/20 12:21:08]

"imported scope" -> "import scope". You don't import a scope. You import into
the scope.

[Johnni Winther, 2012/09/21 14:00:05]

Done.

+   *
+   * If an element by the same name is already in the imported scope, an
+   * [ErroneousElement] will be put in the imported scope, allowing for the
+   * detection of ambiguous uses of imported names.
+   */
+  void addImport(Element element, DiagnosticListener listener) {
+    Element existing = importScope.putIfAbsent(element.name, () => element);
+    if (existing !== element && existing !== null) {

[Lasse Reichstein Nielsen, 2012/09/20 12:21:08]

Adding the same element twice is an error (according to current spec). It's
importing the same name twice that is not allowed, independently of the actual
name.

[Lasse Reichstein Nielsen, 2012/09/20 14:03:36]

... actual value, even.

[Johnni Winther, 2012/09/21 14:00:05]

I don't understand. Did you mean '... is not an error ...'? The created
[ErroneousElement] is used to report errors/warnings on usage.

+      if (!existing.isErroneous()) {
+        // TODO(johnniwinther): Provide access to both the new and existing
+        // elements.
+        importScope[element.name] = new ErroneousElement(
+            MessageKind.DUPLICATE_IMPORT,
+            [element.name], element.name, this);
+      }
+    }
+  }
+
+
+  /**
+   * Look up a top-level element in this library. The element could
+   * potentially have been imported from another library. Returns
+   * null if no such element exist and an [ErroneousElement] if multiple
+   * elements have been imported.
+   */
   Element find(SourceString elementName) {
-    return localScope[elementName];
+    Element result = localScope[elementName];
+    if (result === null) {
+      result = importScope[elementName];
+    }
+    return result;
   }
 
   /** Look up a top-level element in this library, but only look for
     * non-imported elements. Returns null if no such element exist. */
   Element findLocal(SourceString elementName) {
     Element result = localScope[elementName];
     if (result === null || result.getLibrary() != this) return null;
     return result;
   }
 
@@ skipping 1169 matching lines @@
 
   MetadataAnnotation ensureResolved(Compiler compiler) {
     if (resolutionState == STATE_NOT_STARTED) {
       compiler.resolver.resolveMetadataAnnotation(this);
     }
     return this;
   }
 
   String toString() => 'MetadataAnnotation($value, $resolutionState)';
 }