Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1764)

Unified Diff: compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java

Issue 10919133: Support for new 'export' directive in resolver (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Tweak for parsing import/export directives Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java b/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
index 6abba51025bc430636d397478465afead6576d98..f728ad6d6a5f1ea043df96f8873dd76caad41c00 100644
--- a/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
+++ b/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
@@ -22,6 +22,7 @@ import com.google.dart.compiler.ast.DartMethodDefinition;
import com.google.dart.compiler.ast.DartNode;
import com.google.dart.compiler.ast.DartTypeParameter;
import com.google.dart.compiler.ast.DartUnit;
+import com.google.dart.compiler.ast.LibraryExport;
import com.google.dart.compiler.ast.LibraryImport;
import com.google.dart.compiler.ast.LibraryUnit;
import com.google.dart.compiler.ast.Modifiers;
@@ -131,19 +132,23 @@ public class TopLevelElementBuilder {
for (Element element : lib.getElement().getExportedElements()) {
String name = element.getName();
if (libraryImport.isVisible(name)) {
- {
- Element oldElement = scopeForImport.declareElement(name, element);
- if (shouldReportDuplicateDeclaration(oldElement, element)) {
- reportDuplicateTopLevelDeclarationImport(listener, library, prefix, oldElement, element);
- }
- }
- // May re-export.
- if (libraryImport.isExported()) {
- Elements.addExportedElement(library.getElement(), element);
+ Element oldElement = scopeForImport.declareElement(name, element);
+ if (shouldReportDuplicateDeclaration(oldElement, element)) {
+ reportDuplicateTopLevelDeclarationImport(listener, library, prefix, oldElement, element);
}
}
}
}
+ // Fill "library" export scope with re-exports.
+ for (LibraryExport export : library.getExports()) {
+ LibraryUnit lib = export.getLibrary();
+ for (Element element : lib.getElement().getExportedElements()) {
+ String name = element.getName();
+ if (export.isVisible(name)) {
+ Elements.addExportedElement(library.getElement(), element);
+ }
+ }
+ }
// Done.
library.getElement().getScope().markStateReady();
}

Powered by Google App Engine
This is Rietveld 408576698