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

Resolution of == fixed

Browse Source
This commit is contained in:
Andrey Breslav
2011-09-05 19:44:09 +04:00
parent b632fc31d9
commit bca24cf39c
1 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+3 -5
View File
@@ -2219,9 +2219,9 @@ public class JetTypeInferrer {
String name = "equals"; String name = "equals";
if (right != null) { if (right != null) {
JetType leftType = getType(left, context.replaceScope(context.scope)); JetType leftType = getType(left, context.replaceScope(context.scope));
if (leftType != null) { if (leftType == null) {
JetType rightType = getType(right, context.replaceScope(context.scope)); leftType = ErrorUtils.createErrorType("No type for " + left.getText());
if (rightType != null) { }
OverloadResolutionResult<FunctionDescriptor> resolutionResult = context.services.callResolver.resolveExactSignature( OverloadResolutionResult<FunctionDescriptor> resolutionResult = context.services.callResolver.resolveExactSignature(
context.scope, leftType, "equals", context.scope, leftType, "equals",
Collections.singletonList(JetStandardClasses.getNullableAnyType())); Collections.singletonList(JetStandardClasses.getNullableAnyType()));
@@ -2245,8 +2245,6 @@ public class JetTypeInferrer {
} }
} }
} }
}
}
result = semanticServices.getStandardLibrary().getBooleanType(); result = semanticServices.getStandardLibrary().getBooleanType();
} }
else if (operationType == JetTokens.EQEQEQ || operationType == JetTokens.EXCLEQEQEQ) { else if (operationType == JetTokens.EQEQEQ || operationType == JetTokens.EXCLEQEQEQ) {