From fa5fcbbad14e3db831f27f9af70cbf782c8106ec Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 11 Mar 2013 22:23:32 +0400 Subject: [PATCH] Removed isVar field & constructor parameter from ValueParameterDescriptorImpl, since it's always false. --- .../AlternativeMethodSignatureData.java | 1 - .../kotlinSignature/SignaturesPropagationData.java | 1 - .../java/resolver/JavaConstructorResolver.java | 1 - .../resolve/java/resolver/JavaPropertyResolver.java | 1 - .../java/resolver/JavaValueParameterResolver.java | 1 - .../descriptors/impl/FunctionDescriptorUtil.java | 1 - .../impl/PropertySetterDescriptorImpl.java | 2 +- .../impl/ValueParameterDescriptorImpl.java | 12 ++++-------- .../jet/lang/resolve/DescriptorResolver.java | 4 +--- .../jet/lang/resolve/ScriptHeaderResolver.java | 2 +- .../src/org/jetbrains/jet/lang/types/ErrorUtils.java | 1 - .../expressions/ClosureExpressionsTypingVisitor.java | 2 +- .../jet/lang/types/lang/KotlinBuiltIns.java | 2 +- 13 files changed, 9 insertions(+), 22 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java index 389c768fa22..42c2bf8bbb5 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java @@ -201,7 +201,6 @@ public class AlternativeMethodSignatureData extends ElementAlternativeSignatureD originalParameterDescriptor.getIndex(), originalParameterDescriptor.getAnnotations(), originalParameterDescriptor.getName(), - originalParameterDescriptor.isVar(), alternativeType, originalParameterDescriptor.declaresDefaultValue(), alternativeVarargElementType)); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java index c30acc3c4d0..c8d2e5ea7b7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java @@ -179,7 +179,6 @@ public class SignaturesPropagationData { index, originalParam.getAnnotations(), originalParam.getName(), - originalParam.isVar(), altType, originalParam.declaresDefaultValue(), varargCheckResult.isVararg ? KotlinBuiltIns.getInstance().getArrayElementType(altType) : null diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java index 79bf865a60e..812e92143cd 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java @@ -132,7 +132,6 @@ public final class JavaConstructorResolver { i, Collections.emptyList(), Name.identifier(method.getName()), - false, typeTransformer.transformToType(returnType, resolverForTypeParameters), annotationMethod.getDefaultValue() != null, varargElementType)); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java index d15e09471db..d03280f96f3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java @@ -282,7 +282,6 @@ public final class JavaPropertyResolver { 0, Collections.emptyList(), Name.identifier("p0") /*TODO*/, - false, propertyDescriptor.getType(), false, null)); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java index 0609c49c10f..5c337ef3449 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java @@ -102,7 +102,6 @@ public final class JavaValueParameterResolver { i, Collections.emptyList(), // TODO name, - false, transformedType, hasDefaultValue, varargElementType diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/FunctionDescriptorUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/FunctionDescriptorUtil.java index 2b7ff25476c..32373a64868 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/FunctionDescriptorUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/FunctionDescriptorUtil.java @@ -80,7 +80,6 @@ public class FunctionDescriptorUtil { substitutedDescriptor, unsubstitutedValueParameter, unsubstitutedValueParameter.getAnnotations(), - unsubstitutedValueParameter.isVar(), substitutedType, substituteVarargElementType )); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java index 746de181d66..a9cf0d86443 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java @@ -67,7 +67,7 @@ public class PropertySetterDescriptorImpl extends PropertyAccessorDescriptorImpl public void initializeDefault() { assert parameter == null; - parameter = new ValueParameterDescriptorImpl(this, 0, Collections.emptyList(), Name.special(""), false, getCorrespondingProperty().getReturnType(), false, null); + parameter = new ValueParameterDescriptorImpl(this, 0, Collections.emptyList(), Name.special(""), getCorrespondingProperty().getReturnType(), false, null); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ValueParameterDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ValueParameterDescriptorImpl.java index 8b149e45fe5..2e52abd0de7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ValueParameterDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ValueParameterDescriptorImpl.java @@ -35,7 +35,6 @@ public class ValueParameterDescriptorImpl extends VariableDescriptorImpl impleme private final boolean declaresDefaultValue; private final JetType varargElementType; - private final boolean isVar; private final int index; private final ValueParameterDescriptor original; @@ -48,23 +47,21 @@ public class ValueParameterDescriptorImpl extends VariableDescriptorImpl impleme int index, @NotNull List annotations, @NotNull Name name, - boolean isVar, @NotNull JetType outType, boolean declaresDefaultValue, - @Nullable JetType varargElementType) { + @Nullable JetType varargElementType + ) { super(containingDeclaration, annotations, name, outType); this.original = this; this.index = index; this.declaresDefaultValue = declaresDefaultValue; this.varargElementType = varargElementType; - this.isVar = isVar; } public ValueParameterDescriptorImpl( @NotNull DeclarationDescriptor containingDeclaration, @NotNull ValueParameterDescriptor original, @NotNull List annotations, - boolean isVar, @NotNull JetType outType, @Nullable JetType varargElementType ) { @@ -73,7 +70,6 @@ public class ValueParameterDescriptorImpl extends VariableDescriptorImpl impleme this.index = original.getIndex(); this.declaresDefaultValue = original.declaresDefaultValue(); this.varargElementType = varargElementType; - this.isVar = isVar; } @Override @@ -138,13 +134,13 @@ public class ValueParameterDescriptorImpl extends VariableDescriptorImpl impleme @Override public boolean isVar() { - return isVar; + return false; } @NotNull @Override public ValueParameterDescriptor copy(@NotNull DeclarationDescriptor newOwner) { - return new ValueParameterDescriptorImpl(newOwner, index, Lists.newArrayList(getAnnotations()), getName(), isVar, getType(), hasDefaultValue, varargElementType); + return new ValueParameterDescriptorImpl(newOwner, index, Lists.newArrayList(getAnnotations()), getName(), getType(), hasDefaultValue, varargElementType); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index 2bc72262ddb..f7652293fc0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -381,7 +381,7 @@ public class DescriptorResolver { boolean declaresDefaultValue = propertyDescriptor != null; ValueParameterDescriptorImpl parameterDescriptor = new ValueParameterDescriptorImpl(functionDescriptor, parameter.getIndex(), parameter.getAnnotations(), - parameter.getName(), parameter.isVar(), parameter.getType(), + parameter.getName(), parameter.getType(), declaresDefaultValue, parameter.getVarargElementType()); parameterDescriptors.add(parameterDescriptor); @@ -485,7 +485,6 @@ public class DescriptorResolver { index, annotationResolver.resolveAnnotations(scope, valueParameter.getModifierList(), trace), JetPsiUtil.safeName(valueParameter.getName()), - false, variableType, valueParameter.getDefaultValue() != null, varargElementType @@ -1355,7 +1354,6 @@ public class DescriptorResolver { 0, Collections.emptyList(), Name.identifier("value"), - false, KotlinBuiltIns.getInstance().getStringType(), false, null); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java index a5fdd0f5d69..ea303a205b4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java @@ -108,7 +108,7 @@ public class ScriptHeaderResolver { int index, @NotNull ScriptDescriptor script) { JetType type = resolveTypeName(scriptParameter.getType()); - return new ValueParameterDescriptorImpl(script, index, Collections.emptyList(), scriptParameter.getName(), false, type, false, null); + return new ValueParameterDescriptorImpl(script, index, Collections.emptyList(), scriptParameter.getName(), type, false, null); } public void processScriptHierarchy(@NotNull JetScript script, @NotNull JetScope outerScope) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java index 0f9008e16b1..6a2214a9db3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java @@ -198,7 +198,6 @@ public class ErrorUtils { i, Collections.emptyList(), Name.special(""), - true, ERROR_PARAMETER_TYPE, false, null)); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java index c1e4f1495e7..de289435cda 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java @@ -171,7 +171,7 @@ public class ClosureExpressionsTypingVisitor extends ExpressionTypingVisitor { if (functionTypeExpected && !hasDeclaredValueParameters && expectedValueParameters.size() == 1) { ValueParameterDescriptor valueParameterDescriptor = expectedValueParameters.get(0); ValueParameterDescriptor it = new ValueParameterDescriptorImpl( - functionDescriptor, 0, Collections.emptyList(), Name.identifier("it"), false, + functionDescriptor, 0, Collections.emptyList(), Name.identifier("it"), valueParameterDescriptor.getType(), valueParameterDescriptor.hasDefaultValue(), valueParameterDescriptor.getVarargElementType() ); valueParameterDescriptors.add(it); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java index afed3a3a885..2edc14aaf98 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java @@ -873,7 +873,7 @@ public class KotlinBuiltIns { TypeProjection parameterType = parameterTypes.get(i); ValueParameterDescriptorImpl valueParameterDescriptor = new ValueParameterDescriptorImpl( functionDescriptor, i, Collections.emptyList(), - Name.identifier("p" + (i + 1)), false, parameterType.getType(), false, null); + Name.identifier("p" + (i + 1)), parameterType.getType(), false, null); valueParameters.add(valueParameterDescriptor); } return valueParameters;