Index: compiler/java/com/google/dart/compiler/DeltaAnalyzer.java |
diff --git a/compiler/java/com/google/dart/compiler/DeltaAnalyzer.java b/compiler/java/com/google/dart/compiler/DeltaAnalyzer.java |
index e7c2ec54a4c9a546f68d45aedec69082decc3c10..2829cd95f202a3e14fe7aa7abfdbb840f7fd5d7b 100644 |
--- a/compiler/java/com/google/dart/compiler/DeltaAnalyzer.java |
+++ b/compiler/java/com/google/dart/compiler/DeltaAnalyzer.java |
@@ -16,6 +16,7 @@ import com.google.dart.compiler.parser.DartParser; |
import com.google.dart.compiler.resolver.CoreTypeProvider; |
import com.google.dart.compiler.resolver.CoreTypeProviderImplementation; |
import com.google.dart.compiler.resolver.Element; |
+import com.google.dart.compiler.resolver.ElementKind; |
import com.google.dart.compiler.resolver.LibraryElement; |
import com.google.dart.compiler.resolver.MemberBuilder; |
import com.google.dart.compiler.resolver.Resolver; |
@@ -95,7 +96,11 @@ class DeltaAnalyzer { |
Scope scope = libraryUnit.getElement().getScope(); |
for (Element member : enclosingLibrary.getMembers()) { |
if (member.getSourceInfo().getSource() != originalSource) { |
- scope.declareElement(member.getName(), member); |
+ String name = member.getName(); |
+ if (ElementKind.of(member) == ElementKind.LIBRARY) { |
+ name = "__library_" + ((LibraryElement) member).getLibraryUnit().getName(); |
+ } |
+ scope.declareElement(name, member); |
} |
} |
return scope; |