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

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

Issue 10873088: Issue 3989. Show warning if constructor name is same as member name (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 4 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
« no previous file with comments | « no previous file | compiler/java/com/google/dart/compiler/resolver/ResolverErrorCode.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java b/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java
index 8496b0493e6dee0053ffcdde415e45b7972b2440..7c9b55be3a3a163040f398f3933a786b0d372ebd 100644
--- a/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java
+++ b/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java
@@ -8,6 +8,8 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Objects;
import com.google.dart.compiler.DartCompilerContext;
import com.google.dart.compiler.ErrorCode;
+import com.google.dart.compiler.PackageLibraryManager;
+import com.google.dart.compiler.Source;
import com.google.dart.compiler.ast.ASTVisitor;
import com.google.dart.compiler.ast.DartBlock;
import com.google.dart.compiler.ast.DartClass;
@@ -99,8 +101,9 @@ public class MemberBuilder {
public Element visitClass(DartClass node) {
assert !ElementKind.of(currentHolder).equals(ElementKind.CLASS) : "nested class?";
beginClassContext(node);
+ ClassElement classElement = node.getElement();
EnclosingElement previousEnclosingElement = enclosingElement;
- enclosingElement = node.getElement();
+ enclosingElement = classElement;
// visit fields, to make their Elements ready for constructor parameters
for (DartNode member : node.getMembers()) {
if (member instanceof DartFieldDefinition) {
@@ -113,6 +116,15 @@ public class MemberBuilder {
member.accept(this);
}
}
+ // check that constructor names don't conflict with member names
Brian Wilkerson 2012/08/27 18:28:42 nit: "don't" -> "doesn't"
+ for (ConstructorElement constructor : classElement.getConstructors()) {
+ String name = constructor.getName();
+ Element member = classElement.lookupLocalElement(name);
+ if (member != null) {
+ resolutionError(constructor.getNameLocation(),
+ ResolverErrorCode.CONSTRUCTOR_WITH_NAME_OF_MEMBER);
+ }
+ }
// done with this class
enclosingElement = previousEnclosingElement;
endClassContext();
@@ -658,8 +670,8 @@ public class MemberBuilder {
resolutionError(node.getSourceInfo(), errorCode, arguments);
}
- void resolutionError(SourceInfo node, ErrorCode errorCode, Object... arguments) {
- topLevelContext.onError(node, errorCode, arguments);
+ void resolutionError(SourceInfo sourceInfo, ErrorCode errorCode, Object... arguments) {
+ topLevelContext.onError(sourceInfo, errorCode, arguments);
}
/**
« no previous file with comments | « no previous file | compiler/java/com/google/dart/compiler/resolver/ResolverErrorCode.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698