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

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

Issue 10979013: Issue 5292. Unreferenced imported identifiers should not be an error (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: 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 62ae1855c03eb61556e2a26ced38a0977e31e9d6..bccb3ca95796eaaf2672e35f82be7f3df3d8f107 100644
--- a/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
+++ b/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
@@ -135,7 +135,8 @@ public class TopLevelElementBuilder {
if (libraryImport.isVisible(name)) {
Element oldElement = scopeForImport.declareElement(name, element);
if (shouldReportDuplicateDeclaration(oldElement, element)) {
- reportDuplicateTopLevelDeclarationImport(listener, library, prefix, oldElement, element);
+ scopeForImport.declareElement(name,
+ Elements.createDuplicateElement(oldElement, element));
}
}
}
@@ -154,18 +155,18 @@ public class TopLevelElementBuilder {
library.getElement().getScope().markStateReady();
}
- private static void reportDuplicateTopLevelDeclarationImport(DartCompilerListener listener,
- LibraryUnit library, String prefix, Element oldElement, Element newElement) {
- String name = newElement.getName();
- SourceInfo errorLocation = new SourceInfo(library.getSource(), 0, 0);
- compilationError(listener, errorLocation,
- ResolverErrorCode.DUPLICATE_TOP_LEVEL_DECLARATION_IMPORT,
- name,
- library.getSource().getUri(),
- prefix,
- Elements.getLibraryUnitLocation(oldElement),
- Elements.getLibraryUnitLocation(newElement));
- }
+// private static void reportDuplicateTopLevelDeclarationImport(DartCompilerListener listener,
Brian Wilkerson 2012/09/25 13:11:20 Unless there is a reason to keep this code, let's
+// LibraryUnit library, String prefix, Element oldElement, Element newElement) {
+// String name = newElement.getName();
+// SourceInfo errorLocation = new SourceInfo(library.getSource(), 0, 0);
+// compilationError(listener, errorLocation,
+// ResolverErrorCode.DUPLICATE_TOP_LEVEL_DECLARATION_IMPORT,
+// name,
+// library.getSource().getUri(),
+// prefix,
+// Elements.getLibraryUnitLocation(oldElement),
+// Elements.getLibraryUnitLocation(newElement));
+// }
@VisibleForTesting
void fillInUnitScope(DartUnit unit, DartCompilerListener listener, Scope scope,
@@ -227,16 +228,16 @@ public class TopLevelElementBuilder {
if (oldElement == null) {
return false;
}
- // Getter/setter can shared same name, but not setter/setter and getter/getter.
- if (newElement.getModifiers().isAbstractField()
- && oldElement.getModifiers().isAbstractField()) {
- if (newElement.getModifiers().isGetter() && !oldElement.getModifiers().isGetter()) {
- return false;
- }
- if (newElement.getModifiers().isSetter() && !oldElement.getModifiers().isSetter()) {
- return false;
- }
- }
+// // Getter/setter can shared same name, but not setter/setter and getter/getter.
Brian Wilkerson 2012/09/25 13:11:20 Unless there is a reason to keep this code, let's
+// if (newElement.getModifiers().isAbstractField()
+// && oldElement.getModifiers().isAbstractField()) {
+// if (newElement.getModifiers().isGetter() && !oldElement.getModifiers().isGetter()) {
+// return false;
+// }
+// if (newElement.getModifiers().isSetter() && !oldElement.getModifiers().isSetter()) {
+// return false;
+// }
+// }
// yes
return true;
}

Powered by Google App Engine
This is Rietveld 408576698