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

Rename: LazyDescriptor -> LazyEntity

Browse Source
This commit is contained in:
Andrey Breslav
2014-01-22 18:33:10 +04:00
parent 04b47439bd
commit 71dd3aaf86
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ForceResolveUtil.java
+5 -5
View File
@@ -25,9 +25,9 @@ public class ForceResolveUtil {
private ForceResolveUtil() {}
public static void forceResolveAllContents(@NotNull DeclarationDescriptor descriptor) {
if (descriptor instanceof LazyDescriptor) {
LazyDescriptor lazyDescriptor = (LazyDescriptor) descriptor;
lazyDescriptor.forceResolveAllContents();
if (descriptor instanceof LazyEntity) {
LazyEntity lazyEntity = (LazyEntity) descriptor;
lazyEntity.forceResolveAllContents();
}
}
@@ -38,8 +38,8 @@ public class ForceResolveUtil {
}
public static void forceResolveAllContents(@NotNull TypeConstructor typeConstructor) {
if (typeConstructor instanceof LazyDescriptor) {
LazyDescriptor lazyConstructor = (LazyDescriptor) typeConstructor;
if (typeConstructor instanceof LazyEntity) {
LazyEntity lazyConstructor = (LazyEntity) typeConstructor;
lazyConstructor.forceResolveAllContents();
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyDescriptor.java → compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyEntity.java
+1 -1
View File
@@ -16,6 +16,6 @@
package org.jetbrains.jet.lang.resolve.lazy;
public interface LazyDescriptor {
public interface LazyEntity {
void forceResolveAllContents();
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
+3 -4
View File
@@ -26,7 +26,6 @@ import jet.Unit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.descriptors.annotations.Annotations;
import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorBase;
import org.jetbrains.jet.lang.psi.*;
@@ -34,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.AnnotationResolver;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil;
import org.jetbrains.jet.lang.resolve.lazy.LazyDescriptor;
import org.jetbrains.jet.lang.resolve.lazy.LazyEntity;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider;
import org.jetbrains.jet.lang.resolve.lazy.data.JetClassInfoUtil;
@@ -57,7 +56,7 @@ import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isSyntheticClassObj
import static org.jetbrains.jet.lang.resolve.ModifiersChecker.*;
import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName;
public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDescriptor, ClassDescriptor {
public class LazyClassDescriptor extends ClassDescriptorBase implements LazyEntity, ClassDescriptor {
private static final Predicate<JetType> VALID_SUPERTYPE = new Predicate<JetType>() {
@Override
public boolean apply(JetType type) {
@@ -340,7 +339,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc
getVisibility();
}
private class LazyClassTypeConstructor implements LazyDescriptor, TypeConstructor {
private class LazyClassTypeConstructor implements LazyEntity, TypeConstructor {
private final NotNullLazyValue<Collection<JetType>> supertypes = resolveSession.getStorageManager().createLazyValueWithPostCompute(
new Function0<Collection<JetType>>() {
@Override
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java
+2 -2
View File
@@ -22,14 +22,14 @@ import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.annotations.Annotations;
import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorImpl;
import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil;
import org.jetbrains.jet.lang.resolve.lazy.LazyDescriptor;
import org.jetbrains.jet.lang.resolve.lazy.LazyEntity;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.TypeSubstitutor;
public class LazyPackageDescriptor extends DeclarationDescriptorImpl implements LazyDescriptor, PackageFragmentDescriptor {
public class LazyPackageDescriptor extends DeclarationDescriptorImpl implements LazyEntity, PackageFragmentDescriptor {
private final ResolveSession resolveSession;
private final ModuleDescriptor module;
private final JetScope memberScope;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java
+2 -2
View File
@@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
import org.jetbrains.jet.lang.descriptors.impl.AbstractLazyTypeParameterDescriptor;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.lazy.LazyDescriptor;
import org.jetbrains.jet.lang.resolve.lazy.LazyEntity;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils;
import org.jetbrains.jet.lang.types.JetType;
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lexer.JetTokens;
import java.util.Set;
public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescriptor implements TypeParameterDescriptor, LazyDescriptor {
public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescriptor implements TypeParameterDescriptor, LazyEntity {
private final ResolveSession resolveSession;
private final JetTypeParameter jetTypeParameter;