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

resolve elvis operator as call

Browse Source
This commit is contained in:
Svetlana Isakova
2013-08-02 15:19:28 +04:00
parent 624eaa5aa8
commit 4621fe6dfa
4 changed files with 70 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+15 -16
View File
@@ -16,6 +16,7 @@
package org.jetbrains.jet.lang.types.expressions;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType;
@@ -35,6 +36,7 @@ import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowValueFactory;
import org.jetbrains.jet.lang.resolve.calls.autocasts.Nullability;
import org.jetbrains.jet.lang.resolve.calls.context.CheckValueArgumentsMode;
import org.jetbrains.jet.lang.resolve.calls.context.ExpressionPosition;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallWithTrace;
import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall;
import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults;
@@ -1031,25 +1033,22 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
JetExpression left = expression.getLeft();
JetExpression right = expression.getRight();
JetTypeInfo leftTypeInfo = getTypeInfoOrNullType(left, context, facade);
if (left == null || right == null) {
getTypeInfoOrNullType(left, context, facade);
return JetTypeInfo.create(null, context.dataFlowInfo);
}
Call call = createCallForSpecialConstruction(expression, Lists.newArrayList(left, right));
ResolvedCall<FunctionDescriptor> resolvedCall = resolveSpecialConstructionAsCall(
call, "Elvis", Lists.newArrayList("left", "right"), Lists.newArrayList(true, false), contextWithExpectedType, null);
JetTypeInfo leftTypeInfo = BindingContextUtils.getRecordedTypeInfo(left, context.trace.getBindingContext());
assert leftTypeInfo != null : "Left expression was not processed: " + expression;
JetType leftType = leftTypeInfo.getType();
DataFlowInfo dataFlowInfo = leftTypeInfo.getDataFlowInfo();
if (left == null || leftType == null) return JetTypeInfo.create(null, dataFlowInfo);
if (isKnownToBeNotNull(left, leftType, context)) {
if (leftType != null && isKnownToBeNotNull(left, leftType, context)) {
context.trace.report(USELESS_ELVIS.on(left, leftType));
}
ExpressionTypingContext newContext = contextWithExpectedType.replaceDataFlowInfo(dataFlowInfo).replaceScope(context.scope);
JetType rightType = right == null ? null : facade.getTypeInfo(right, newContext).getType();
if (rightType != null) {
DataFlowUtils.checkType(TypeUtils.makeNullableAsSpecified(leftType, rightType.isNullable()), left, contextWithExpectedType);
return JetTypeInfo.create(TypeUtils.makeNullableAsSpecified(
CommonSupertypes.commonSupertype(Arrays.asList(leftType, rightType)), rightType.isNullable()), dataFlowInfo);
}
return JetTypeInfo.create(null, dataFlowInfo);
return JetTypeInfo.create(resolvedCall.getResultingDescriptor().getReturnType(),
resolvedCall.getDataFlowInfoForArguments().getResultInfo());
}
@NotNull
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingUtils.java
+16 -2
View File
@@ -250,6 +250,11 @@ public class ControlStructureTypingUtils {
this.trace = trace;
this.expectedType = expectedType;
}
CheckTypeContext makeTypeNullable() {
if (TypeUtils.noExpectedType(expectedType)) return this;
return new CheckTypeContext(trace, TypeUtils.makeNullable(expectedType));
}
}
final JetVisitor<Void, CheckTypeContext> checkTypeVisitor = new JetVisitor<Void, CheckTypeContext>() {
@@ -280,13 +285,22 @@ public class ControlStructureTypingUtils {
@Override
public Void visitPostfixExpression(JetPostfixExpression expression, CheckTypeContext c) {
if (expression.getOperationReference().getReferencedNameElementType() == JetTokens.EXCLEXCL) {
checkExpressionType(expression.getBaseExpression(),
new CheckTypeContext(c.trace, TypeUtils.makeNullable(c.expectedType)));
checkExpressionType(expression.getBaseExpression(), c.makeTypeNullable());
return null;
}
return super.visitPostfixExpression(expression, c);
}
@Override
public Void visitBinaryExpression(JetBinaryExpression expression, CheckTypeContext c) {
if (expression.getOperationReference().getReferencedNameElementType() == JetTokens.ELVIS) {
checkExpressionType(expression.getLeft(), c.makeTypeNullable());
checkExpressionType(expression.getRight(), c);
return null;
}
return super.visitBinaryExpression(expression, c);
}
@Override
public Void visitExpression(JetExpression expression, CheckTypeContext c) {
JetTypeInfo typeInfo = BindingContextUtils.getRecordedTypeInfo(expression, c.trace.getBindingContext());