Support for new 'export' directive in resolver

compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java

 // 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.
 
 package com.google.dart.compiler.resolver;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.dart.compiler.DartCompilationError;
 import com.google.dart.compiler.DartCompilerContext;
 import com.google.dart.compiler.DartCompilerListener;
 import com.google.dart.compiler.ErrorCode;
 import com.google.dart.compiler.ast.ASTVisitor;
 import com.google.dart.compiler.ast.DartClass;
 import com.google.dart.compiler.ast.DartField;
 import com.google.dart.compiler.ast.DartFieldDefinition;
 import com.google.dart.compiler.ast.DartFunctionTypeAlias;
 import com.google.dart.compiler.ast.DartIdentifier;
 import com.google.dart.compiler.ast.DartLibraryDirective;
 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;
 import com.google.dart.compiler.common.SourceInfo;
 import com.google.dart.compiler.type.Type;
 import com.google.dart.compiler.type.TypeVariable;
 import com.google.dart.compiler.type.Types;
 
 import java.util.Collections;
 import java.util.List;
@@ skipping 89 matching lines @@
         } else {
           scopeForImport = importScope;
         }
       }
       // Prepare "lib" scope.
       fillInLibraryScope(lib, listener);
       // Fill "library" scope with element exported from "lib".
       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);
-            }
+          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);
-          }
+        }
+      }
+    }
+    // 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();
   }
 
   private static void reportDuplicateTopLevelDeclarationImport(DartCompilerListener listener,
       LibraryUnit library, String prefix, Element oldElement, Element newElement) {
     String name = newElement.getName();
@@ skipping 124 matching lines @@
       Modifiers modifiers = node.getModifiers();
       if (modifiers.isFinal()) {
         // final top-level fields are implicitly compile-time constants.
         modifiers = modifiers.makeConstant();
       }
       node.setElement(Elements.fieldFromNode(node, library, node.getObsoleteMetadata(), modifiers));
       return null;
     }
   }
 }