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

KotlinBuiltIns injected into ExpressionTypingUtils

Browse Source
This commit is contained in:
Andrey Breslav
2014-12-02 17:59:11 +03:00
parent ae7f38d891
commit 32d2a9cdb2
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+4 -3
View File
@@ -127,7 +127,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
boolean hasError = compileTimeConstantChecker.checkConstantExpressionType(value, expression, context.expectedType); boolean hasError = compileTimeConstantChecker.checkConstantExpressionType(value, expression, context.expectedType);
if (hasError) { if (hasError) {
IElementType elementType = expression.getNode().getElementType(); IElementType elementType = expression.getNode().getElementType();
return JetTypeInfo.create(getDefaultType(elementType), context.dataFlowInfo); return JetTypeInfo.create(components.expressionTypingUtils.getDefaultType(elementType), context.dataFlowInfo);
} }
} }
@@ -989,7 +989,8 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
if (resolutionResults.isSuccess()) { if (resolutionResults.isSuccess()) {
FunctionDescriptor equals = resolutionResults.getResultingCall().getResultingDescriptor(); FunctionDescriptor equals = resolutionResults.getResultingCall().getResultingDescriptor();
if (ensureBooleanResult(operationSign, OperatorConventions.EQUALS, equals.getReturnType(), context)) { if (components.expressionTypingUtils.ensureBooleanResult(operationSign, OperatorConventions.EQUALS, equals.getReturnType(),
context)) {
ensureNonemptyIntersectionOfOperandTypes(expression, context); ensureNonemptyIntersectionOfOperandTypes(expression, context);
} }
} }
@@ -1119,7 +1120,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
operationSign, operationSign,
OperatorConventions.CONTAINS); OperatorConventions.CONTAINS);
JetType containsType = OverloadResolutionResultsUtil.getResultingType(resolutionResult, context.contextDependency); JetType containsType = OverloadResolutionResultsUtil.getResultingType(resolutionResult, context.contextDependency);
ensureBooleanResult(operationSign, OperatorConventions.CONTAINS, containsType, context); components.expressionTypingUtils.ensureBooleanResult(operationSign, OperatorConventions.CONTAINS, containsType, context);
if (left != null) { if (left != null) {
dataFlowInfo = facade.getTypeInfo(left, contextWithDataFlow).getDataFlowInfo().and(dataFlowInfo); dataFlowInfo = facade.getTypeInfo(left, contextWithDataFlow).getDataFlowInfo().and(dataFlowInfo);
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
.replaceExpectedType(components.builtIns.getBooleanType()).replaceContextDependency(INDEPENDENT)); .replaceExpectedType(components.builtIns.getBooleanType()).replaceContextDependency(INDEPENDENT));
JetType conditionType = typeInfo.getType(); JetType conditionType = typeInfo.getType();
if (conditionType != null && !isBoolean(conditionType)) { if (conditionType != null && !components.expressionTypingUtils.isBoolean(conditionType)) {
context.trace.report(TYPE_MISMATCH_IN_CONDITION.on(condition, conditionType)); context.trace.report(TYPE_MISMATCH_IN_CONDITION.on(condition, conditionType));
} }
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java
+11 -11
View File
@@ -109,19 +109,19 @@ public class ExpressionTypingUtils {
return scope; return scope;
} }
public static boolean isBoolean(@NotNull JetType type) { public boolean isBoolean(@NotNull JetType type) {
return JetTypeChecker.DEFAULT.isSubtypeOf(type, KotlinBuiltIns.getInstance().getBooleanType()); return JetTypeChecker.DEFAULT.isSubtypeOf(type, builtIns.getBooleanType());
} }
public static boolean ensureBooleanResult(JetExpression operationSign, Name name, JetType resultType, ExpressionTypingContext context) { public boolean ensureBooleanResult(JetExpression operationSign, Name name, JetType resultType, ExpressionTypingContext context) {
return ensureBooleanResultWithCustomSubject(operationSign, resultType, "'" + name + "'", context); return ensureBooleanResultWithCustomSubject(operationSign, resultType, "'" + name + "'", context);
} }
public static boolean ensureBooleanResultWithCustomSubject(JetExpression operationSign, JetType resultType, String subjectName, ExpressionTypingContext context) { private boolean ensureBooleanResultWithCustomSubject(JetExpression operationSign, JetType resultType, String subjectName, ExpressionTypingContext context) {
if (resultType != null) { if (resultType != null) {
// TODO : Relax? // TODO : Relax?
if (!isBoolean(resultType)) { if (!isBoolean(resultType)) {
context.trace.report(RESULT_TYPE_MISMATCH.on(operationSign, subjectName, KotlinBuiltIns.getInstance().getBooleanType(), resultType)); context.trace.report(RESULT_TYPE_MISMATCH.on(operationSign, subjectName, builtIns.getBooleanType(), resultType));
return false; return false;
} }
} }
@@ -129,21 +129,21 @@ public class ExpressionTypingUtils {
} }
@NotNull @NotNull
public static JetType getDefaultType(IElementType constantType) { public JetType getDefaultType(IElementType constantType) {
if (constantType == JetNodeTypes.INTEGER_CONSTANT) { if (constantType == JetNodeTypes.INTEGER_CONSTANT) {
return KotlinBuiltIns.getInstance().getIntType(); return builtIns.getIntType();
} }
else if (constantType == JetNodeTypes.FLOAT_CONSTANT) { else if (constantType == JetNodeTypes.FLOAT_CONSTANT) {
return KotlinBuiltIns.getInstance().getDoubleType(); return builtIns.getDoubleType();
} }
else if (constantType == JetNodeTypes.BOOLEAN_CONSTANT) { else if (constantType == JetNodeTypes.BOOLEAN_CONSTANT) {
return KotlinBuiltIns.getInstance().getBooleanType(); return builtIns.getBooleanType();
} }
else if (constantType == JetNodeTypes.CHARACTER_CONSTANT) { else if (constantType == JetNodeTypes.CHARACTER_CONSTANT) {
return KotlinBuiltIns.getInstance().getCharType(); return builtIns.getCharType();
} }
else if (constantType == JetNodeTypes.NULL) { else if (constantType == JetNodeTypes.NULL) {
return KotlinBuiltIns.getInstance().getNullableNothingType(); return builtIns.getNullableNothingType();
} }
else { else {
throw new IllegalArgumentException("Unsupported constant type: " + constantType); throw new IllegalArgumentException("Unsupported constant type: " + constantType);
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java
+1 -2
View File
@@ -43,7 +43,6 @@ import java.util.Collections;
import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.diagnostics.Errors.*;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.BindingContext.*;
import static org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils.isBoolean;
public class ForLoopConventionsChecker { public class ForLoopConventionsChecker {
@@ -98,7 +97,7 @@ public class ForLoopConventionsChecker {
JetType hasNextType = checkConventionForIterator(context, loopRangeExpression, iteratorType, "hasNext", JetType hasNextType = checkConventionForIterator(context, loopRangeExpression, iteratorType, "hasNext",
HAS_NEXT_FUNCTION_AMBIGUITY, HAS_NEXT_MISSING, HAS_NEXT_FUNCTION_NONE_APPLICABLE, HAS_NEXT_FUNCTION_AMBIGUITY, HAS_NEXT_MISSING, HAS_NEXT_FUNCTION_NONE_APPLICABLE,
LOOP_RANGE_HAS_NEXT_RESOLVED_CALL); LOOP_RANGE_HAS_NEXT_RESOLVED_CALL);
if (hasNextType != null && !isBoolean(hasNextType)) { if (hasNextType != null && !expressionTypingUtils.isBoolean(hasNextType)) {
context.trace.report(HAS_NEXT_FUNCTION_TYPE_MISMATCH.on(loopRangeExpression, hasNextType)); context.trace.report(HAS_NEXT_FUNCTION_TYPE_MISMATCH.on(loopRangeExpression, hasNextType));
} }
return checkConventionForIterator(context, loopRangeExpression, iteratorType, "next", return checkConventionForIterator(context, loopRangeExpression, iteratorType, "next",