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

Expected function type used for parameter types inference in function expression

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-03-04 20:10:47 +03:00
parent 639003b8a8
commit f47f285868
6 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt
+12 -10
View File
@@ -70,7 +70,7 @@ class FunctionDescriptorResolver(
CallableMemberDescriptor.Kind.DECLARATION,
function.toSourceElement()
)
initializeFunctionDescriptorAndExplicitReturnType(containingDescriptor, scope, function, functionDescriptor, trace, null)
initializeFunctionDescriptorAndExplicitReturnType(containingDescriptor, scope, function, functionDescriptor, trace, TypeUtils.NO_EXPECTED_TYPE)
initializeFunctionReturnTypeBasedOnFunctionBody(scope, function, functionDescriptor, trace, dataFlowInfo)
BindingContextUtils.recordFunctionDeclarationToDescriptor(trace, function, functionDescriptor)
return functionDescriptor
@@ -81,7 +81,8 @@ class FunctionDescriptorResolver(
scope: JetScope,
function: JetNamedFunction,
trace: BindingTrace,
dataFlowInfo: DataFlowInfo
dataFlowInfo: DataFlowInfo,
expectedFunctionType: JetType
): SimpleFunctionDescriptor {
val functionDescriptor = FunctionExpressionDescriptor(
containingDescriptor,
@@ -90,7 +91,7 @@ class FunctionDescriptorResolver(
CallableMemberDescriptor.Kind.DECLARATION,
function.toSourceElement()
)
initializeFunctionDescriptorAndExplicitReturnType(containingDescriptor, scope, function, functionDescriptor, trace, null)
initializeFunctionDescriptorAndExplicitReturnType(containingDescriptor, scope, function, functionDescriptor, trace, expectedFunctionType)
initializeFunctionReturnTypeBasedOnFunctionBody(scope, function, functionDescriptor, trace, dataFlowInfo)
BindingContextUtils.recordFunctionDeclarationToDescriptor(trace, function, functionDescriptor)
return functionDescriptor
@@ -128,7 +129,7 @@ class FunctionDescriptorResolver(
function: JetFunction,
functionDescriptor: SimpleFunctionDescriptorImpl,
trace: BindingTrace,
expectedFunctionType: JetType?
expectedFunctionType: JetType
) {
val innerScope = WritableScopeImpl(scope, functionDescriptor, TraceBasedRedeclarationHandler(trace), "Function descriptor header scope")
innerScope.addLabeledDeclaration(functionDescriptor)
@@ -170,7 +171,7 @@ class FunctionDescriptorResolver(
functionDescriptor: SimpleFunctionDescriptorImpl,
innerScope: WritableScopeImpl,
trace: BindingTrace,
expectedFunctionType: JetType?
expectedFunctionType: JetType
): List<ValueParameterDescriptor> {
val expectedValueParameters = expectedFunctionType.getValueParameters(functionDescriptor)
if (expectedValueParameters != null) {
@@ -198,11 +199,11 @@ class FunctionDescriptorResolver(
}
private fun JetType.functionTypeExpected() = !TypeUtils.noExpectedType(this) && KotlinBuiltIns.isFunctionOrExtensionFunctionType(this)
private fun JetType?.getReceiverType(): JetType? =
if (this != null && functionTypeExpected()) getReceiverType(this) else null
private fun JetType.getReceiverType(): JetType? =
if (functionTypeExpected()) KotlinBuiltIns.getReceiverType(this) else null
private fun JetType?.getValueParameters(owner: FunctionDescriptor): List<ValueParameterDescriptor>? =
if (this != null && functionTypeExpected()) getValueParameters(owner, this) else null
private fun JetType.getValueParameters(owner: FunctionDescriptor): List<ValueParameterDescriptor>? =
if (functionTypeExpected()) KotlinBuiltIns.getValueParameters(owner, this) else null
public fun resolvePrimaryConstructorDescriptor(
scope: JetScope,
@@ -316,7 +317,8 @@ class FunctionDescriptorResolver(
else {
type = TypeUtils.CANT_INFER_FUNCTION_PARAM_TYPE
}
} else {
}
else {
trace.report(VALUE_PARAMETER_WITH_NO_TYPE_ANNOTATION.on(valueParameter))
type = ErrorUtils.createErrorType("Type annotation was missing for parameter ${valueParameter.getNameAsSafeName()}")
}
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt
+1 -1
View File
@@ -83,7 +83,7 @@ public class FunctionsTypingVisitor(facade: ExpressionTypingInternals) : Express
}
else {
functionDescriptor = services.getFunctionDescriptorResolver().resolveFunctionExpressionDescriptor(
context.scope.getContainingDeclaration(), context.scope, function, context.trace, context.dataFlowInfo)
context.scope.getContainingDeclaration(), context.scope, function, context.trace, context.dataFlowInfo, context.expectedType)
}
val functionInnerScope = FunctionDescriptorUtil.getFunctionInnerScope(context.scope, functionDescriptor, context.trace)