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

+= can go along with +

Browse Source
This commit is contained in:
Andrey Breslav
2011-03-15 21:28:58 +03:00
parent 349e3eb83a
commit dafa8f7230
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+4 -11
View File
@@ -587,18 +587,11 @@ public class JetTypeInferrer {
String name = assignmentOperationNames.get(operationType); String name = assignmentOperationNames.get(operationType);
JetType assignmentOperationType = getTypeForBinaryCall(expression, name, scope, false); JetType assignmentOperationType = getTypeForBinaryCall(expression, name, scope, false);
String counterpartName = binaryOperationNames.get(assignmentOperationCounterparts.get(operationType)); if (assignmentOperationType == null) {
JetType counterpartType = getTypeForBinaryCall(expression, counterpartName, scope, false); String counterpartName = binaryOperationNames.get(assignmentOperationCounterparts.get(operationType));
getTypeForBinaryCall(expression, counterpartName, scope, true);
if (assignmentOperationType != null) {
if (counterpartType != null) {
semanticServices.getErrorHandler().structuralError(operationSign.getNode(), "Ambiguity: both '" + name + "' and '" + counterpartName + "' are defined");
// TODO : make reference unresolved?
trace.removeReferenceResolution(operationSign);
} else {
result = assignmentOperationType;
}
} }
result = null; // TODO : not an expression
} }
else if (equalsOperations.contains(operationType)) { else if (equalsOperations.contains(operationType)) {
String name = "equals"; String name = "equals";