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

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

Issue 10665018: Issue 2477. Can not reference instance method from initializer (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: 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
« 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/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 85c25767169626ae362b88485f028352c4455342..bcd65d089c2bfd69714ee71a5865f965cb33756c 100644
--- a/compiler/java/com/google/dart/compiler/resolver/Resolver.java
+++ b/compiler/java/com/google/dart/compiler/resolver/Resolver.java
@@ -1073,6 +1073,11 @@ public class Resolver {
if (isIllegalPrivateAccess(x, enclosingElement, element, x.getName())) {
return null;
}
+ if (!element.getModifiers().isStatic() && !Elements.isTopLevel(element)) {
+ if (referencedFromInitializer(x)) {
+ onError(x, ResolverErrorCode.INSTANCE_METHOD_FROM_INITIALIZER);
+ }
+ }
break;
case CLASS:
if (!isQualifier) {
@@ -1928,15 +1933,27 @@ public class Resolver {
if (!target.getModifiers().isStatic() && !Elements.isTopLevel(target)) {
onError(node, ResolverErrorCode.INSTANCE_METHOD_FROM_STATIC);
}
- if (calledFromRedirectConstructor(node)) {
- if (!target.getModifiers().isStatic() && !Elements.isTopLevel(target)) {
+ if (!target.getModifiers().isStatic() && !Elements.isTopLevel(target)) {
+ if (referencedFromRedirectConstructor(node)) {
onError(node, ResolverErrorCode.INSTANCE_METHOD_FROM_REDIRECT);
+ } else if (referencedFromInitializer(node)) {
+ onError(node, ResolverErrorCode.INSTANCE_METHOD_FROM_INITIALIZER);
}
}
}
}
- private boolean calledFromRedirectConstructor(DartNode node) {
+ private boolean referencedFromInitializer(DartNode node) {
+ do {
+ if (node instanceof DartInitializer) {
+ return true;
+ }
+ node = node.getParent();
+ } while (node != null);
+ return false;
+ }
+
+ private boolean referencedFromRedirectConstructor(DartNode node) {
do {
if (node instanceof DartRedirectConstructorInvocation) {
return true;
« 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