azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

analyze left expression in assignment operation

Browse Source 
when it's incomplete
This commit is contained in:
Svetlana Isakova
2012-11-14 22:45:45 +04:00
parent c4428496bd
commit 41864c29b2
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java
+8 -7
View File
@@ -17,7 +17,6 @@
package org.jetbrains.jet.lang.types.expressions; package org.jetbrains.jet.lang.types.expressions;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -193,9 +192,6 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito
} }
protected JetType visitAssignmentOperation(JetBinaryExpression expression, ExpressionTypingContext contextWithExpectedType) { protected JetType visitAssignmentOperation(JetBinaryExpression expression, ExpressionTypingContext contextWithExpectedType) {
JetExpression right = expression.getRight();
if (right == null) return null;
//There is a temporary binding trace for an opportunity to resolve set method for array if needed (the initial trace should be used there) //There is a temporary binding trace for an opportunity to resolve set method for array if needed (the initial trace should be used there)
TemporaryBindingTrace temporaryBindingTrace = TemporaryBindingTrace.create( TemporaryBindingTrace temporaryBindingTrace = TemporaryBindingTrace.create(
contextWithExpectedType.trace, "trace to resolve array set method for binary expression", expression); contextWithExpectedType.trace, "trace to resolve array set method for binary expression", expression);
@@ -203,10 +199,15 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito
JetSimpleNameExpression operationSign = expression.getOperationReference(); JetSimpleNameExpression operationSign = expression.getOperationReference();
IElementType operationType = operationSign.getReferencedNameElementType(); IElementType operationType = operationSign.getReferencedNameElementType();
JetExpression left = JetPsiUtil.deparenthesize(expression.getLeft()); JetType leftType = facade.getTypeInfo(expression.getLeft(), context).getType();
if (left == null) return null;
JetExpression right = expression.getRight();
JetExpression left = JetPsiUtil.deparenthesize(expression.getLeft());
if (right == null || left == null) {
temporaryBindingTrace.commit();
return null;
}
JetType leftType = facade.getTypeInfo(left, context).getType();
if (leftType == null) { if (leftType == null) {
facade.getTypeInfo(right, context); facade.getTypeInfo(right, context);
context.trace.report(UNRESOLVED_REFERENCE.on(operationSign)); context.trace.report(UNRESOLVED_REFERENCE.on(operationSign));
compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.kt
+1 -1
View File
@@ -5,7 +5,7 @@ fun sum(a : IntArray) : Int {
// Write your solution here // Write your solution here
<!UNRESOLVED_REFERENCE!>res<!> = 0 <!UNRESOLVED_REFERENCE!>res<!> = 0
for (e in a) for (e in a)
<!DEBUG_INFO_MISSING_UNRESOLVED!>res<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>+=<!><!SYNTAX!><!> <!UNRESOLVED_REFERENCE!>res<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>+=<!><!SYNTAX!><!>
} }
fun main(args : Array<String>) { fun main(args : Array<String>) {
test(0) test(0)