When importing a library without a prefix, add the elements from the element map instead of the lis…

frog/leg/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('../tree/tree.dart');
 #import('../scanner/scannerlib.dart');
 #import('../leg.dart');  // TODO(karlklose): we only need type.
 #import('../util/util.dart');
@@ skipping 242 matching lines @@
     define(element, listener);
   }
 
   void define(Element element, DiagnosticListener listener) {
     if (element.kind == ElementKind.GETTER
         || element.kind == ElementKind.SETTER) {
       addGetterOrSetter(element, elements[element.name], listener);
     } else {
       Element existing = elements.putIfAbsent(element.name, () => element);
       if (existing !== element) {
+        print(existing);

[ahe, 2012/03/10 21:26:36]

debug code?

[ngeoffray, 2012/03/10 21:30:50]

Done.

+        print(element);

[ahe, 2012/03/10 21:26:36]

ditto

[ngeoffray, 2012/03/10 21:30:50]

Done.

         listener.cancel('duplicate definition', token: element.position());
         listener.cancel('existing definition', token: existing.position());
       }
     }
   }
 
   Element find(SourceString name) {
     return elements[name];
   }
 
   Element lookupLocalMember(SourceString name) {
     Element element = find(name);
     if (element === null) return null;
     return (this === element.getLibrary()) ? element : null;
   }
+
+  void forEachExport(f(Element element)) {
+    elements.forEach((SourceString _, Element e) {
+      if (this === e.getLibrary()
+          && e.kind !== ElementKind.PREFIX

[ahe, 2012/03/10 21:26:36]

See the code above in lookupLocalMember. Shouldn't it have the same fix?

[ngeoffray, 2012/03/10 21:30:50]

Are you referring to the one line 278?
I don't think so. A prefix is a local member that libraries that import the
library should not see. Same for foreign elements.

[ahe, 2012/04/13 13:48:10]

I was referring to the method above. However, that method is completely broken
and I'm about to remove it. So don't worry about it.

+          && e.kind !== ElementKind.FOREIGN) {
+        f(e);
+      }
+    });
+  }
 }
 
 class PrefixElement extends Element {
   final LiteralString prefix;
   final LibraryElement library;
 
   PrefixElement(LiteralString prefix,
                 LibraryElement this.library,
                 Element enclosing)
     : this.prefix = prefix,
@@ skipping 552 matching lines @@
 
   LabelElement addLabel(Identifier label, String labelName) {
     LabelElement result = new LabelElement(label, labelName, this,
                                            enclosingElement);
     labels = labels.prepend(result);
     return result;
   }
 
   Node parseNode(DiagnosticListener l) => statement;
 }