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

Minor. Refine variable name: innerScope -> headerScope

Browse Source
This commit is contained in:
Denis Zharkov
2016-09-15 12:16:45 +03:00
parent 75a51d915f
commit 3df3187e25
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt
+7 -7
View File
@@ -141,28 +141,28 @@ class FunctionDescriptorResolver(
trace: BindingTrace, trace: BindingTrace,
expectedFunctionType: KotlinType expectedFunctionType: KotlinType
) { ) {
val innerScope = LexicalWritableScope(scope, functionDescriptor, true, null, val headerScope = LexicalWritableScope(scope, functionDescriptor, true, null,
TraceBasedLocalRedeclarationChecker(trace, overloadChecker), LexicalScopeKind.FUNCTION_HEADER) TraceBasedLocalRedeclarationChecker(trace, overloadChecker), LexicalScopeKind.FUNCTION_HEADER)
val typeParameterDescriptors = descriptorResolver. val typeParameterDescriptors = descriptorResolver.
resolveTypeParametersForDescriptor(functionDescriptor, innerScope, scope, function.typeParameters, trace) resolveTypeParametersForDescriptor(functionDescriptor, headerScope, scope, function.typeParameters, trace)
descriptorResolver.resolveGenericBounds(function, functionDescriptor, innerScope, typeParameterDescriptors, trace) descriptorResolver.resolveGenericBounds(function, functionDescriptor, headerScope, typeParameterDescriptors, trace)
val receiverTypeRef = function.receiverTypeReference val receiverTypeRef = function.receiverTypeReference
val receiverType = val receiverType =
if (receiverTypeRef != null) { if (receiverTypeRef != null) {
typeResolver.resolveType(innerScope, receiverTypeRef, trace, true) typeResolver.resolveType(headerScope, receiverTypeRef, trace, true)
} }
else { else {
if (function is KtFunctionLiteral) expectedFunctionType.getReceiverType() else null if (function is KtFunctionLiteral) expectedFunctionType.getReceiverType() else null
} }
val valueParameterDescriptors = createValueParameterDescriptors(function, functionDescriptor, innerScope, trace, expectedFunctionType) val valueParameterDescriptors = createValueParameterDescriptors(function, functionDescriptor, headerScope, trace, expectedFunctionType)
innerScope.freeze() headerScope.freeze()
val returnType = function.typeReference?.let { typeResolver.resolveType(innerScope, it, trace, true) } val returnType = function.typeReference?.let { typeResolver.resolveType(headerScope, it, trace, true) }
val visibility = resolveVisibilityFromModifiers(function, getDefaultVisibility(function, containingDescriptor)) val visibility = resolveVisibilityFromModifiers(function, getDefaultVisibility(function, containingDescriptor))
val modality = resolveMemberModalityFromModifiers(function, getDefaultModality(containingDescriptor, visibility, function.hasBody())) val modality = resolveMemberModalityFromModifiers(function, getDefaultModality(containingDescriptor, visibility, function.hasBody()))