From 95c5e7ee2333e4d8c84ac33d61c8f5785745b84d Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Wed, 16 Oct 2013 15:39:31 +0400 Subject: [PATCH] rename: isSealed -> isFinal --- .../descriptors/DeserializedClassDescriptor.java | 2 +- .../org/jetbrains/jet/lang/resolve/BodyResolver.java | 2 +- .../resolve/lazy/descriptors/LazyClassDescriptor.java | 2 +- .../impl/AbstractLazyTypeParameterDescriptor.java | 2 +- .../jet/lang/descriptors/impl/ClassDescriptorImpl.java | 4 ++-- .../impl/LazySubstitutingClassDescriptor.java | 2 +- .../resolve/constants/NumberValueTypeConstructor.java | 2 +- .../jet/lang/types/IntersectionTypeConstructor.java | 2 +- .../org/jetbrains/jet/lang/types/TypeConstructor.java | 5 ++++- .../jetbrains/jet/lang/types/TypeConstructorImpl.java | 10 +++++----- .../src/org/jetbrains/jet/lang/types/TypeUtils.java | 2 +- 11 files changed, 19 insertions(+), 16 deletions(-) diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java index a3e90b386ca..e559c9d68d8 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java @@ -348,7 +348,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme } @Override - public boolean isSealed() { + public boolean isFinal() { return !getModality().isOverridable(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java index a6e722caf40..ecfd1908cd0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java @@ -320,7 +320,7 @@ public class BodyResolver { trace.report(SUPERTYPE_APPEARS_TWICE.on(typeReference)); } - if (constructor.isSealed() && !allowedFinalSupertypes.contains(constructor)) { + if (constructor.isFinal() && !allowedFinalSupertypes.contains(constructor)) { trace.report(FINAL_SUPERTYPE.on(typeReference)); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java index 93b8941a476..90cc13974bc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -461,7 +461,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc } @Override - public boolean isSealed() { + public boolean isFinal() { return !getModality().isOverridable(); } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java index 7f7cc67a3fe..bc362bd2732 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java @@ -163,7 +163,7 @@ public abstract class AbstractLazyTypeParameterDescriptor implements TypeParamet } @Override - public boolean isSealed() { + public boolean isFinal() { return false; } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java index 0dd73529082..c5a6bc36244 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java @@ -65,7 +65,7 @@ public class ClassDescriptorImpl extends DeclarationDescriptorNonRootImpl implem public final ClassDescriptorImpl initialize( - boolean sealed, + boolean isFinal, @NotNull List typeParameters, @NotNull Collection supertypes, @NotNull JetScope memberDeclarations, @@ -73,7 +73,7 @@ public class ClassDescriptorImpl extends DeclarationDescriptorNonRootImpl implem @Nullable ConstructorDescriptor primaryConstructor, boolean isInner ) { - this.typeConstructor = new TypeConstructorImpl(this, getAnnotations(), sealed, getName().asString(), typeParameters, supertypes); + this.typeConstructor = new TypeConstructorImpl(this, getAnnotations(), isFinal, getName().asString(), typeParameters, supertypes); this.memberDeclarations = memberDeclarations; this.constructors = constructors; this.primaryConstructor = primaryConstructor; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java index 901b8b21c58..3caea5e6ef7 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java @@ -75,7 +75,7 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor { typeConstructor = new TypeConstructorImpl( this, originalTypeConstructor.getAnnotations(), - originalTypeConstructor.isSealed(), + originalTypeConstructor.isFinal(), originalTypeConstructor.toString(), typeParameters, supertypes diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NumberValueTypeConstructor.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NumberValueTypeConstructor.java index 73fdf2581cf..4346236a8a5 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NumberValueTypeConstructor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NumberValueTypeConstructor.java @@ -34,7 +34,7 @@ public abstract class NumberValueTypeConstructor implements TypeConstructor { } @Override - public boolean isSealed() { + public boolean isFinal() { return false; } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java b/core/descriptors/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java index 1d2845bfe2e..5c83bb93c5e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java @@ -49,7 +49,7 @@ public class IntersectionTypeConstructor extends AnnotatedImpl implements TypeCo } @Override - public boolean isSealed() { + public boolean isFinal() { return false; } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructor.java b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructor.java index a8a63713e44..8615b11164b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructor.java @@ -32,7 +32,10 @@ public interface TypeConstructor extends Annotated { @NotNull Collection getSupertypes(); - boolean isSealed(); + /** + * Cannot have subtypes. + */ + boolean isFinal(); /** * If the type is non-denotable, it can't be written in code directly, it only can appear internally inside a type checker. diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java index 18cc84dd689..96801af7625 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java @@ -32,7 +32,7 @@ public class TypeConstructorImpl extends AnnotatedImpl implements TypeConstructo private final List parameters; private Collection supertypes; private final String debugName; - private final boolean sealed; + private final boolean isFinal; @Nullable private final ClassifierDescriptor classifierDescriptor; @@ -40,13 +40,13 @@ public class TypeConstructorImpl extends AnnotatedImpl implements TypeConstructo public TypeConstructorImpl( @Nullable ClassifierDescriptor classifierDescriptor, @NotNull List annotations, - boolean sealed, + boolean isFinal, @NotNull String debugName, @NotNull List parameters, @NotNull Collection supertypes) { super(annotations); this.classifierDescriptor = classifierDescriptor; - this.sealed = sealed; + this.isFinal = isFinal; this.debugName = debugName; this.parameters = Collections.unmodifiableList(new ArrayList(parameters)); this.supertypes = Collections.unmodifiableCollection(supertypes); @@ -70,8 +70,8 @@ public class TypeConstructorImpl extends AnnotatedImpl implements TypeConstructo } @Override - public boolean isSealed() { - return sealed; + public boolean isFinal() { + return isFinal; } @Override diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java index d239cd2fc56..d5355f9f3ed 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java @@ -282,7 +282,7 @@ public class TypeUtils { if (type.isNullable()) { return true; } - if (!type.getConstructor().isSealed()) { + if (!type.getConstructor().isFinal()) { return true; }