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

more precise type of TypeConstructor.getDeclarationDescriptor

Browse Source
This commit is contained in:
Stepan Koltsov
2012-02-04 03:55:57 +04:00
parent a7eb137b2f
commit d9ffa4c882
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java
+2 -1
View File
@@ -2,6 +2,7 @@ package org.jetbrains.jet.lang.types;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
import org.jetbrains.jet.lang.descriptors.annotations.Annotated; import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
@@ -22,5 +23,5 @@ public interface TypeConstructor extends Annotated {
boolean isSealed(); boolean isSealed();
@Nullable @Nullable
DeclarationDescriptor getDeclarationDescriptor(); ClassifierDescriptor getDeclarationDescriptor();
} }
compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java
+6 -6
View File
@@ -2,7 +2,7 @@ package org.jetbrains.jet.lang.types;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotatedImpl; import org.jetbrains.jet.lang.descriptors.annotations.AnnotatedImpl;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
@@ -22,17 +22,17 @@ public class TypeConstructorImpl extends AnnotatedImpl implements TypeConstructo
private final boolean sealed; private final boolean sealed;
@Nullable @Nullable
private final DeclarationDescriptor declarationDescriptor; private final ClassifierDescriptor classifierDescriptor;
public TypeConstructorImpl( public TypeConstructorImpl(
@Nullable DeclarationDescriptor declarationDescriptor, @Nullable ClassifierDescriptor classifierDescriptor,
@NotNull List<AnnotationDescriptor> annotations, @NotNull List<AnnotationDescriptor> annotations,
boolean sealed, boolean sealed,
@NotNull String debugName, @NotNull String debugName,
@NotNull List<TypeParameterDescriptor> parameters, @NotNull List<TypeParameterDescriptor> parameters,
@NotNull Collection<JetType> supertypes) { @NotNull Collection<JetType> supertypes) {
super(annotations); super(annotations);
this.declarationDescriptor = declarationDescriptor; this.classifierDescriptor = classifierDescriptor;
this.sealed = sealed; this.sealed = sealed;
this.debugName = debugName; this.debugName = debugName;
this.parameters = Collections.unmodifiableList(new ArrayList<TypeParameterDescriptor>(parameters)); this.parameters = Collections.unmodifiableList(new ArrayList<TypeParameterDescriptor>(parameters));
@@ -63,7 +63,7 @@ public class TypeConstructorImpl extends AnnotatedImpl implements TypeConstructo
@Override @Override
@Nullable @Nullable
public DeclarationDescriptor getDeclarationDescriptor() { public ClassifierDescriptor getDeclarationDescriptor() {
return declarationDescriptor; return classifierDescriptor;
} }
} }