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

All JetType subinterfaces migrated to capabilities

Browse Source
This commit is contained in:
Andrey Breslav
2014-09-24 20:23:07 +04:00
parent 013dd7261e
commit 57bffaf8fa
17 changed files with 81 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValueFactory.java
+1
View File
@@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lang.resolve.scopes.receivers.*;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.types.TypesPackage;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ForceResolveUtil.java
+4 -3
View File
@@ -27,6 +27,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeConstructor;
import org.jetbrains.jet.lang.types.TypeProjection;
import org.jetbrains.jet.lang.types.TypesPackage;
import java.util.Collection;
@@ -86,9 +87,9 @@ public class ForceResolveUtil {
public static JetType forceResolveAllContents(@Nullable JetType type) {
if (type == null) return null;
if (type.isFlexible()) {
forceResolveAllContents(type.getLowerBound());
forceResolveAllContents(type.getUpperBound());
if (TypesPackage.isFlexible(type)) {
forceResolveAllContents(TypesPackage.flexibility(type).getLowerBound());
forceResolveAllContents(TypesPackage.flexibility(type).getUpperBound());
}
else {
forceResolveAllContents(type.getConstructor());