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

Unified Diff: compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java

Issue 10696056: Fix for issues 3729 and 3523 (Closed) Base URL: http://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
Index: compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java
===================================================================
--- compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java (revision 9267)
+++ compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java (working copy)
@@ -1958,6 +1958,9 @@
@Override
public Type visitPropertyAccess(DartPropertyAccess node) {
+ if (node.isCascade()) {
+ return node.getQualifier().accept(this);
+ }
if (node.getType() != null) {
return node.getType();
}
@@ -2297,6 +2300,17 @@
private Type checkInvocation(DartInvocation node, DartNode diagnosticNode, String name,
Type type) {
List<DartExpression> argumentNodes = node.getArguments();
+ if (node instanceof DartMethodInvocation) {
+ DartMethodInvocation invocation = (DartMethodInvocation) node;
+ if (invocation.isCascade()) {
+ checkInvocation(argumentNodes, diagnosticNode, name, type);
+ DartExpression target = invocation.getTarget();
+ if (target == null) {
+ return getCurrentClass();
+ }
+ return target.accept(this);
+ }
+ }
return checkInvocation(argumentNodes, diagnosticNode, name, type);
}

Powered by Google App Engine
This is Rietveld 408576698