Minor. Remove redundant parameter

LexicalWritableScope.implicitReceiver is always null for all constructor's usages
This commit is contained in:
Denis Zharkov
2016-10-24 19:01:56 +03:00
parent 8a73a1da2c
commit b8e8206c4f
5 changed files with 11 additions and 9 deletions
@@ -665,7 +665,7 @@ public class DescriptorResolver {
} }
else { else {
LexicalWritableScope writableScope = new LexicalWritableScope( LexicalWritableScope writableScope = new LexicalWritableScope(
scope, containingDeclaration, false, null, new TraceBasedLocalRedeclarationChecker(trace, overloadChecker), scope, containingDeclaration, false, new TraceBasedLocalRedeclarationChecker(trace, overloadChecker),
LexicalScopeKind.TYPE_ALIAS_HEADER); LexicalScopeKind.TYPE_ALIAS_HEADER);
typeParameterDescriptors = resolveTypeParametersForDescriptor( typeParameterDescriptors = resolveTypeParametersForDescriptor(
typeAliasDescriptor, writableScope, scope, typeParameters, trace); typeAliasDescriptor, writableScope, scope, typeParameters, trace);
@@ -780,7 +780,7 @@ public class DescriptorResolver {
} }
else { else {
LexicalWritableScope writableScope = new LexicalWritableScope( LexicalWritableScope writableScope = new LexicalWritableScope(
scope, containingDeclaration, false, null, new TraceBasedLocalRedeclarationChecker(trace, overloadChecker), scope, containingDeclaration, false, new TraceBasedLocalRedeclarationChecker(trace, overloadChecker),
LexicalScopeKind.PROPERTY_HEADER); LexicalScopeKind.PROPERTY_HEADER);
typeParameterDescriptors = resolveTypeParametersForDescriptor( typeParameterDescriptors = resolveTypeParametersForDescriptor(
propertyDescriptor, writableScope, scope, typeParameters, trace); propertyDescriptor, writableScope, scope, typeParameters, trace);
@@ -145,8 +145,8 @@ class FunctionDescriptorResolver(
trace: BindingTrace, trace: BindingTrace,
expectedFunctionType: KotlinType expectedFunctionType: KotlinType
) { ) {
val headerScope = LexicalWritableScope(scope, functionDescriptor, true, null, val headerScope = LexicalWritableScope(scope, functionDescriptor, true,
TraceBasedLocalRedeclarationChecker(trace, overloadChecker), LexicalScopeKind.FUNCTION_HEADER) TraceBasedLocalRedeclarationChecker(trace, overloadChecker), LexicalScopeKind.FUNCTION_HEADER)
val typeParameterDescriptors = descriptorResolver. val typeParameterDescriptors = descriptorResolver.
resolveTypeParametersForDescriptor(functionDescriptor, headerScope, scope, function.typeParameters, trace) resolveTypeParametersForDescriptor(functionDescriptor, headerScope, scope, function.typeParameters, trace)
@@ -298,7 +298,7 @@ class FunctionDescriptorResolver(
val parameterScope = LexicalWritableScope( val parameterScope = LexicalWritableScope(
scope, scope,
constructorDescriptor, constructorDescriptor,
false, null, false,
TraceBasedLocalRedeclarationChecker(trace, overloadChecker), TraceBasedLocalRedeclarationChecker(trace, overloadChecker),
LexicalScopeKind.CONSTRUCTOR_HEADER LexicalScopeKind.CONSTRUCTOR_HEADER
) )
@@ -186,7 +186,7 @@ public class ExpressionTypingServices {
DeclarationDescriptor containingDescriptor = context.scope.getOwnerDescriptor(); DeclarationDescriptor containingDescriptor = context.scope.getOwnerDescriptor();
TraceBasedLocalRedeclarationChecker redeclarationChecker TraceBasedLocalRedeclarationChecker redeclarationChecker
= new TraceBasedLocalRedeclarationChecker(context.trace, expressionTypingComponents.overloadChecker); = new TraceBasedLocalRedeclarationChecker(context.trace, expressionTypingComponents.overloadChecker);
LexicalWritableScope scope = new LexicalWritableScope(context.scope, containingDescriptor, false, null, redeclarationChecker, LexicalWritableScope scope = new LexicalWritableScope(context.scope, containingDescriptor, false, redeclarationChecker,
LexicalScopeKind.CODE_BLOCK); LexicalScopeKind.CODE_BLOCK);
KotlinTypeInfo r; KotlinTypeInfo r;
@@ -86,7 +86,7 @@ public class ExpressionTypingUtils {
@NotNull LexicalScopeKind scopeKind, @NotNull LexicalScopeKind scopeKind,
@NotNull OverloadChecker overloadChecker @NotNull OverloadChecker overloadChecker
) { ) {
return new LexicalWritableScope(context.scope, context.scope.getOwnerDescriptor(), false, null, return new LexicalWritableScope(context.scope, context.scope.getOwnerDescriptor(), false,
new TraceBasedLocalRedeclarationChecker(context.trace, overloadChecker), scopeKind); new TraceBasedLocalRedeclarationChecker(context.trace, overloadChecker), scopeKind);
} }
@@ -25,11 +25,13 @@ class LexicalWritableScope(
parent: LexicalScope, parent: LexicalScope,
override val ownerDescriptor: DeclarationDescriptor, override val ownerDescriptor: DeclarationDescriptor,
override val isOwnerDescriptorAccessibleByLabel: Boolean, override val isOwnerDescriptorAccessibleByLabel: Boolean,
override val implicitReceiver: ReceiverParameterDescriptor?,
redeclarationChecker: LocalRedeclarationChecker, redeclarationChecker: LocalRedeclarationChecker,
override val kind: LexicalScopeKind override val kind: LexicalScopeKind
) : LexicalScopeStorage(parent, redeclarationChecker) { ) : LexicalScopeStorage(parent, redeclarationChecker) {
override val implicitReceiver: ReceiverParameterDescriptor?
get() = null
private var canWrite: Boolean = true private var canWrite: Boolean = true
private var lastSnapshot: Snapshot? = null private var lastSnapshot: Snapshot? = null
@@ -96,4 +98,4 @@ class LexicalWritableScope(
p.popIndent() p.popIndent()
p.println("}") p.println("}")
} }
} }