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

refactoring: extracted 'visitElvisExpression'

Browse Source
This commit is contained in:
Svetlana Isakova
2013-08-02 14:26:50 +04:00
parent aba70e047d
commit 624eaa5aa8
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+31 -20
View File
@@ -1013,26 +1013,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
result = booleanType; result = booleanType;
} }
else if (operationType == JetTokens.ELVIS) { else if (operationType == JetTokens.ELVIS) {
JetTypeInfo leftTypeInfo = getTypeInfoOrNullType(left, context, facade); return visitElvisExpression(expression, contextWithExpectedType);
JetType leftType = leftTypeInfo.getType();
dataFlowInfo = leftTypeInfo.getDataFlowInfo();
if (left != null && leftType != null) {
if (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);
}
}
} }
else { else {
context.trace.report(UNSUPPORTED.on(operationSign, "Unknown operation")); context.trace.report(UNSUPPORTED.on(operationSign, "Unknown operation"));
@@ -1041,6 +1022,36 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
return DataFlowUtils.checkType(result, expression, contextWithExpectedType, dataFlowInfo); return DataFlowUtils.checkType(result, expression, contextWithExpectedType, dataFlowInfo);
} }
@NotNull
private JetTypeInfo visitElvisExpression(
@NotNull JetBinaryExpression expression,
@NotNull ExpressionTypingContext contextWithExpectedType
) {
ExpressionTypingContext context = contextWithExpectedType.replaceExpectedType(NO_EXPECTED_TYPE);
JetExpression left = expression.getLeft();
JetExpression right = expression.getRight();
JetTypeInfo leftTypeInfo = getTypeInfoOrNullType(left, context, facade);
JetType leftType = leftTypeInfo.getType();
DataFlowInfo dataFlowInfo = leftTypeInfo.getDataFlowInfo();
if (left == null || leftType == null) return JetTypeInfo.create(null, dataFlowInfo);
if (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);
}
@NotNull @NotNull
public JetTypeInfo checkInExpression( public JetTypeInfo checkInExpression(
JetElement callElement, JetElement callElement,