From 4a4041c54f6a9a02a1453d816793d7675e4b143e Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 19 Jul 2012 18:39:35 +0400 Subject: [PATCH] Various code improvements (missing annotations, dead code elimination) in the classes touched by previous commit. --- .../lang/descriptors/PropertyDescriptor.java | 28 +++++++------------ .../descriptors/PropertyGetterDescriptor.java | 4 +-- .../descriptors/PropertySetterDescriptor.java | 4 +-- .../descriptors/VariableDescriptorImpl.java | 1 + 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java index 458500b92c7..acfe48f0f1c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java @@ -27,7 +27,10 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor; import org.jetbrains.jet.lang.resolve.scopes.receivers.TransientReceiver; -import org.jetbrains.jet.lang.types.*; +import org.jetbrains.jet.lang.types.DescriptorSubstitutor; +import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.jet.lang.types.Variance; import java.util.Collections; import java.util.List; @@ -53,16 +56,6 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab private List typeParameters; private PropertyGetterDescriptor getter; private PropertySetterDescriptor setter; - - private PropertyDescriptor() { - super(ErrorUtils.getErrorClass(), Collections.emptyList(), Name.special("")); - this.modality = null; - this.visibility = null; - this.isVar = false; - this.isObject = false; - this.original = null; - this.kind = Kind.DECLARATION; - } private PropertyDescriptor( @Nullable PropertyDescriptor original, @@ -73,7 +66,7 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab boolean isVar, boolean isObject, @NotNull Name name, - Kind kind) { + @NotNull Kind kind) { super(containingDeclaration, annotations, name); this.isVar = isVar; this.isObject = isObject; @@ -91,7 +84,7 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab boolean isVar, boolean isObject, @NotNull Name name, - Kind kind) { + @NotNull Kind kind) { this(null, containingDeclaration, annotations, modality, visibility, isVar, isObject, name, kind); } @@ -106,7 +99,7 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab @NotNull ReceiverDescriptor expectedThisObject, @NotNull Name name, @NotNull JetType outType, - Kind kind + @NotNull Kind kind ) { this(containingDeclaration, annotations, modality, visibility, isVar, isObject, name, kind); setType(outType, Collections.emptyList(), expectedThisObject, receiverType); @@ -143,6 +136,7 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab return typeParameters; } + @Override @NotNull public ReceiverDescriptor getReceiverParameter() { return receiver; @@ -154,11 +148,13 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab return expectedThisObject; } + @NotNull @Override public JetType getReturnType() { return getType(); } + @Override public boolean isVar() { return isVar; } @@ -309,8 +305,4 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab public PropertyDescriptor copy(DeclarationDescriptor newOwner, Modality modality, boolean makeInvisible, Kind kind, boolean copyOverrides) { return doSubstitute(TypeSubstitutor.EMPTY, newOwner, modality, makeInvisible ? Visibilities.INVISIBLE_FAKE : visibility, false, copyOverrides, kind); } - - public static PropertyDescriptor createDummy() { - return new PropertyDescriptor(); - } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java index 549346b379d..9ad4af24d89 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java @@ -41,7 +41,7 @@ public class PropertyGetterDescriptor extends PropertyAccessorDescriptor { @NotNull Visibility visibility, boolean hasBody, boolean isDefault, - Kind kind) { + @NotNull Kind kind) { this(correspondingProperty, annotations, modality, visibility, hasBody, isDefault, kind, null); } @@ -51,7 +51,7 @@ public class PropertyGetterDescriptor extends PropertyAccessorDescriptor { @NotNull Visibility visibility, boolean hasBody, boolean isDefault, - Kind kind, + @NotNull Kind kind, @Nullable PropertyGetterDescriptor original) { super(modality, visibility, correspondingProperty, annotations, Name.special(""), hasBody, isDefault, kind); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java index 8cb254fd467..fad4e04eace 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java @@ -43,7 +43,7 @@ public class PropertySetterDescriptor extends PropertyAccessorDescriptor { @NotNull Visibility visibility, boolean hasBody, boolean isDefault, - Kind kind) { + @NotNull Kind kind) { this(correspondingProperty, annotations, modality, visibility, hasBody, isDefault, kind, null); } @@ -54,7 +54,7 @@ public class PropertySetterDescriptor extends PropertyAccessorDescriptor { @NotNull Visibility visibility, boolean hasBody, boolean isDefault, - Kind kind, + @NotNull Kind kind, @Nullable PropertySetterDescriptor original) { super(modality, visibility, correspondingProperty, annotations, Name.special(""), hasBody, isDefault, kind); this.original = original != null ? original : this; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorImpl.java index 292928d4168..efc3a322ff9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorImpl.java @@ -99,6 +99,7 @@ public abstract class VariableDescriptorImpl extends DeclarationDescriptorNonRoo return ReceiverDescriptor.NO_RECEIVER; } + @NotNull @Override public JetType getReturnType() { return getType();