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

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

Issue 10545189: Issue 3643. Associate 'no such method' problem with method name, not with whole invocation (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Use 'resolutionError' flag in DartIdentifier Created 8 years, 6 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/Resolver.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/Resolver.java b/compiler/java/com/google/dart/compiler/resolver/Resolver.java
index 4c3d27a17003c2c738bf24440a9b0c3b6c20b7d9..6b9ffaacaa77b47620e4c9f303a096fd5b4671d7 100644
--- a/compiler/java/com/google/dart/compiler/resolver/Resolver.java
+++ b/compiler/java/com/google/dart/compiler/resolver/Resolver.java
@@ -1018,7 +1018,7 @@ public class Resolver {
return recordElement(x, element);
}
-
+
/**
* Possibly recursive check on the resolved identifier.
*/
@@ -1178,6 +1178,7 @@ public class Resolver {
@Override
public Element visitMethodInvocation(DartMethodInvocation x) {
+ DartIdentifier name = x.getFunctionName();
Element target = resolveQualifier(x.getTarget());
Element element = null;
@@ -1208,7 +1209,8 @@ public class Resolver {
element = member.getElement();
// Must be accessible.
if (!Elements.isAccessible(context.getScope().getLibrary(), element)) {
- onError(x, ResolverErrorCode.CANNOT_ACCESS_METHOD, x.getFunctionNameString());
+ name.markResolutionError();
+ onError(name, ResolverErrorCode.CANNOT_ACCESS_METHOD, x.getFunctionNameString());
}
}
}
@@ -1223,15 +1225,15 @@ public class Resolver {
if (element == null) {
diagnoseErrorInMethodInvocation(x, library, null);
} else {
- x.getFunctionName().setElement(element);
+ name.setElement(element);
}
break;
}
checkInvocationTarget(x, currentMethod, target);
visit(x.getArguments());
- if (x.getFunctionName() != null) {
- recordElement(x.getFunctionName(), element);
+ if (name != null) {
+ recordElement(name, element);
}
return recordElement(x, element);
}
@@ -1480,10 +1482,12 @@ public class Resolver {
switch (kind) {
case NONE:
if (isStaticContextOrInitializer()) {
- onError(node, ResolverErrorCode.CANNOT_RESOLVE_METHOD, name);
+ node.getTarget().markResolutionError();
+ onError(node.getTarget(), ResolverErrorCode.CANNOT_RESOLVE_METHOD, name);
}
if (scope.findElement(null, name) != null) {
- onError(node, ResolverErrorCode.CANNOT_ACCESS_METHOD, name);
+ node.getTarget().markResolutionError();
+ onError(node.getTarget(), ResolverErrorCode.CANNOT_ACCESS_METHOD, name);
}
break;
@@ -1853,13 +1857,13 @@ public class Resolver {
checkConstructor(node, constructorElement);
}
-
- private void onError(HasSourceInfo node, ErrorCode errorCode, Object... arguments) {
- context.onError(node, errorCode, arguments);
+
+ private void onError(HasSourceInfo target, ErrorCode errorCode, Object... arguments) {
+ context.onError(target, errorCode, arguments);
}
- private void onError(SourceInfo node, ErrorCode errorCode, Object... arguments) {
- context.onError(node, errorCode, arguments);
+ private void onError(SourceInfo target, ErrorCode errorCode, Object... arguments) {
+ context.onError(target, errorCode, arguments);
}
private boolean inStaticContext(DartNode node) {
@@ -1873,10 +1877,6 @@ public class Resolver {
return true;
}
- private boolean inStaticContext(Element element) {
- return element == null || Elements.isTopLevel(element)
- || element.getModifiers().isStatic() || element.getModifiers().isFactory();
- }
private boolean inFactoryContext(Element element) {
if (element != null) {
@@ -1890,6 +1890,11 @@ public class Resolver {
return inStaticContext(currentMethod);
}
+ private boolean inStaticContext(Element element) {
+ return element == null || Elements.isTopLevel(element)
+ || element.getModifiers().isStatic() || element.getModifiers().isFactory();
+ }
+
@Override
boolean isFactoryContext() {
return inFactoryContext(currentMethod);

Powered by Google App Engine
This is Rietveld 408576698