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

removed method 'isClassObjectAValue'

Browse Source 
There are no sensible usages of it.
Presence of class object can be determined by 'getClassObjectDescriptor() != null' check
This commit is contained in:
Svetlana Isakova
2013-07-05 14:49:49 +04:00
parent cf5c5dba3d
commit 9fd8a8d497
9 changed files with 10 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassifierDescriptor.java
-2
View File
@@ -30,6 +30,4 @@ public interface ClassifierDescriptor extends DeclarationDescriptorNonRoot {
@Nullable
JetType getClassObjectType();
boolean isClassObjectAValue();
}
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java
-5
View File
@@ -141,11 +141,6 @@ public class ClassDescriptorImpl extends DeclarationDescriptorNonRootImpl implem
return kind;
}
@Override
public boolean isClassObjectAValue() {
return true;
}
@Override
public <R, D> R accept(DeclarationDescriptorVisitor<R, D> visitor, D data) {
return visitor.visitClassDescriptor(this, data);
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java
-5
View File
@@ -180,11 +180,6 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor {
return original.isInner();
}
@Override
public boolean isClassObjectAValue() {
return original.isClassObjectAValue();
}
@Override
public <R, D> R accept(DeclarationDescriptorVisitor<R, D> visitor, D data) {
return visitor.visitClassDescriptor(this, data);
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java
-6
View File
@@ -133,12 +133,6 @@ public abstract class MutableClassDescriptorLite extends ClassDescriptorBase {
return classObjectType;
}
@Override
public boolean isClassObjectAValue() {
return true;
}
@NotNull
@Override
public ClassKind getKind() {
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java
-5
View File
@@ -245,11 +245,6 @@ public class TypeParameterDescriptorImpl extends DeclarationDescriptorNonRootImp
return classObjectBoundsAsType;
}
@Override
public boolean isClassObjectAValue() {
return true;
}
public void addClassObjectBound(@NotNull JetType bound) {
checkUninitialized();
classObjectUpperBounds.add(bound); // TODO : Duplicates?
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java
+3 -10
View File
@@ -72,9 +72,6 @@ public class CallExpressionResolver {
if (classObjectType != null) {
context.trace.record(REFERENCE_TARGET, expression, classifier);
JetType result = getExtendedClassObjectType(classObjectType, referencedName, classifier, context);
if (result == null) {
context.trace.report(NO_CLASS_OBJECT.on(expression, classifier));
}
return DataFlowUtils.checkType(result, expression, context);
}
}
@@ -120,7 +117,7 @@ public class CallExpressionResolver {
return result[0];
}
@Nullable
@NotNull
private JetType getExtendedClassObjectType(
@NotNull JetType classObjectType,
@NotNull Name referencedName,
@@ -135,18 +132,14 @@ public class CallExpressionResolver {
NamespaceDescriptor namespace = context.scope.getNamespace(referencedName);
if (namespace != null) {
//for enums loaded from java binaries
scopes.add(namespace.getMemberScope());
}
JetScope scope = new ChainedScope(classifier, scopes.toArray(new JetScope[scopes.size()]));
return new NamespaceType(referencedName, scope);
}
else if (context.expressionPosition == ExpressionPosition.LHS_OF_DOT || classifier.isClassObjectAValue()) {
return classObjectType;
}
else {
return null;
}
return classObjectType;
}
private boolean furtherNameLookup(
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java
+7 -2
View File
@@ -119,7 +119,12 @@ public class DataFlowValueFactory {
}
}
private static final IdentifierInfo NO_IDENTIFIER_INFO = new IdentifierInfo(null, false, false);
private static final IdentifierInfo NO_IDENTIFIER_INFO = new IdentifierInfo(null, false, false) {
@Override
public String toString() {
return "NO_IDENTIFIER_INFO";
}
};
@NotNull
private static IdentifierInfo createInfo(Object id, boolean isStable) {
@@ -199,7 +204,7 @@ public class DataFlowValueFactory {
}
if (declarationDescriptor instanceof ClassDescriptor) {
ClassDescriptor classDescriptor = (ClassDescriptor) declarationDescriptor;
return createInfo(classDescriptor, classDescriptor.isClassObjectAValue());
return createInfo(classDescriptor, classDescriptor.getClassObjectDescriptor() != null);
}
return NO_IDENTIFIER_INFO;
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
-6
View File
@@ -275,11 +275,6 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc
return classObjectDescriptor == null ? null : classObjectDescriptor.getDefaultType();
}
@Override
public boolean isClassObjectAValue() {
return true;
}
@Override
public ClassDescriptor getClassObjectDescriptor() {
return classObjectDescriptor.compute();
@@ -395,7 +390,6 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc
ForceResolveUtil.forceResolveAllContents(getTypeConstructor());
getUnsubstitutedPrimaryConstructor();
getVisibility();
isClassObjectAValue();
}
private class LazyClassTypeConstructor implements LazyDescriptor, TypeConstructor {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java
-5
View File
@@ -256,11 +256,6 @@ public class LazyTypeParameterDescriptor implements TypeParameterDescriptor, Laz
return null;
}
@Override
public boolean isClassObjectAValue() {
return false;
}
@NotNull
@Override
public DeclarationDescriptor getOriginal() {