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

small fixes after review

Browse Source
This commit is contained in:
Svetlana Isakova
2013-08-27 17:24:24 +04:00
parent 164da12518
commit 928133b69b
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+1 -2
View File
@@ -817,9 +817,8 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
assert operationSign.getReferencedNameElementType() == JetTokens.EXCLEXCL; assert operationSign.getReferencedNameElementType() == JetTokens.EXCLEXCL;
Call call = createCallForSpecialConstruction(expression, Collections.singletonList(baseExpression)); Call call = createCallForSpecialConstruction(expression, Collections.singletonList(baseExpression));
ResolvedCall<FunctionDescriptor> resolvedCall = resolveSpecialConstructionAsCall( resolveSpecialConstructionAsCall(
call, "ExclExcl", Collections.singletonList("baseExpr"), Collections.singletonList(true), context, null); call, "ExclExcl", Collections.singletonList("baseExpr"), Collections.singletonList(true), context, null);
resolvedCall.getResultingDescriptor();
JetTypeInfo baseTypeInfo = BindingContextUtils.getRecordedTypeInfo(baseExpression, context.trace.getBindingContext()); JetTypeInfo baseTypeInfo = BindingContextUtils.getRecordedTypeInfo(baseExpression, context.trace.getBindingContext());
assert baseTypeInfo != null : "Base expression was not processed: " + expression; assert baseTypeInfo != null : "Base expression was not processed: " + expression;
JetType baseType = baseTypeInfo.getType(); JetType baseType = baseTypeInfo.getType();
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingUtils.java
+4 -2
View File
@@ -122,7 +122,7 @@ public class ControlStructureTypingUtils {
return function; return function;
} }
/*package*/ static MutableDataFlowInfoForArguments createDataFlowInfoForArgumentsForCall( /*package*/ static MutableDataFlowInfoForArguments createIndependentDataFlowInfoForArgumentsForCall(
final Map<ValueArgument, DataFlowInfo> dataFlowInfoForArgumentsMap final Map<ValueArgument, DataFlowInfo> dataFlowInfoForArgumentsMap
) { ) {
return new MutableDataFlowInfoForArguments() { return new MutableDataFlowInfoForArguments() {
@@ -135,6 +135,7 @@ public class ControlStructureTypingUtils {
@Override @Override
public void updateInfo(@NotNull ValueArgument valueArgument, @NotNull DataFlowInfo dataFlowInfo) { public void updateInfo(@NotNull ValueArgument valueArgument, @NotNull DataFlowInfo dataFlowInfo) {
//todo
} }
@NotNull @NotNull
@@ -146,6 +147,7 @@ public class ControlStructureTypingUtils {
@NotNull @NotNull
@Override @Override
public DataFlowInfo getResultInfo() { public DataFlowInfo getResultInfo() {
//todo merge and use
return initialDataFlowInfo; return initialDataFlowInfo;
} }
}; };
@@ -159,7 +161,7 @@ public class ControlStructureTypingUtils {
Map<ValueArgument, DataFlowInfo> dataFlowInfoForArgumentsMap = Maps.newHashMap(); Map<ValueArgument, DataFlowInfo> dataFlowInfoForArgumentsMap = Maps.newHashMap();
dataFlowInfoForArgumentsMap.put(callForIf.getValueArguments().get(0), thenInfo); dataFlowInfoForArgumentsMap.put(callForIf.getValueArguments().get(0), thenInfo);
dataFlowInfoForArgumentsMap.put(callForIf.getValueArguments().get(1), elseInfo); dataFlowInfoForArgumentsMap.put(callForIf.getValueArguments().get(1), elseInfo);
return createDataFlowInfoForArgumentsForCall(dataFlowInfoForArgumentsMap); return createIndependentDataFlowInfoForArgumentsForCall(dataFlowInfoForArgumentsMap);
} }
/*package*/ static Call createCallForSpecialConstruction( /*package*/ static Call createCallForSpecialConstruction(
compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt
+1
View File
@@ -15,6 +15,7 @@ fun test(a: A, b: B, c: C) {
val d: C = id(a) val d: C = id(a)
val e: Any = id(a) val e: Any = id(a)
val f = id(a) val f = id(a)
f: A
val g = two(a, b) val g = two(a, b)
g: B g: B
g: A g: A