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

Lazy values unified in the project

Browse Source
This commit is contained in:
Andrey Breslav
2013-10-01 21:23:24 +04:00
parent 9064cbd664
commit 9bb77b09a3
10 changed files with 48 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java
+6 -5
View File
@@ -23,8 +23,6 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor;
import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.storage.NotNullLazyValue;
import org.jetbrains.jet.storage.StorageManager;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.resolve.scopes.LazyScopeAdapter;
@@ -32,7 +30,9 @@ import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
import org.jetbrains.jet.storage.NotNullLazyValue;
import org.jetbrains.jet.storage.NotNullLazyValueImpl;
import org.jetbrains.jet.storage.StorageManager;
import java.util.Collection;
import java.util.Collections;
@@ -198,9 +198,10 @@ public abstract class AbstractLazyTypeParameterDescriptor implements TypeParamet
@NotNull
private JetType createDefaultType() {
return new JetTypeImpl(getTypeConstructor(), new LazyScopeAdapter(new RecursionIntolerantLazyValue<JetScope>() {
return new JetTypeImpl(getTypeConstructor(), new LazyScopeAdapter(new NotNullLazyValueImpl<JetScope>() {
@NotNull
@Override
protected JetScope compute() {
protected JetScope doCompute() {
return getUpperBoundsAsType().getMemberScope();
}
}));
core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java
+4 -3
View File
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
import org.jetbrains.jet.storage.NotNullLazyValueImpl;
import java.util.Collections;
import java.util.List;
@@ -222,9 +222,10 @@ public class TypeParameterDescriptorImpl extends DeclarationDescriptorNonRootImp
getTypeConstructor(),
TypeUtils.hasNullableLowerBound(this),
Collections.<TypeProjection>emptyList(),
new LazyScopeAdapter(new RecursionIntolerantLazyValue<JetScope>() {
new LazyScopeAdapter(new NotNullLazyValueImpl<JetScope>() {
@NotNull
@Override
protected JetScope compute() {
protected JetScope doCompute() {
return getUpperBoundsAsType().getMemberScope();
}
}));
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java
+4 -4
View File
@@ -17,19 +17,19 @@
package org.jetbrains.jet.lang.resolve.scopes;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
import org.jetbrains.jet.storage.NotNullLazyValue;
public class LazyScopeAdapter extends AbstractScopeAdapter {
private final RecursionIntolerantLazyValue<JetScope> scope;
private final NotNullLazyValue<JetScope> scope;
public LazyScopeAdapter(RecursionIntolerantLazyValue<JetScope> scope) {
public LazyScopeAdapter(NotNullLazyValue<JetScope> scope) {
this.scope = scope;
}
@NotNull
@Override
protected JetScope getWorkerScope() {
return scope.get();
return scope.compute();
}
}