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

initialize ANY_NULLABLE without cyclic dependencies

Browse Source 
between <clinit> of ErrorUtils and JetStandardClasses
This commit is contained in:
Stepan Koltsov
2012-04-07 06:32:20 +04:00
parent 3ba2aa91fd
commit 0417df6429
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardClasses.java
+2 -3
View File
@@ -31,7 +31,6 @@ import org.jetbrains.jet.lang.types.JetTypeImpl;
import org.jetbrains.jet.lang.types.NamespaceType; import org.jetbrains.jet.lang.types.NamespaceType;
import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.TypeConstructor;
import org.jetbrains.jet.lang.types.TypeProjection; import org.jetbrains.jet.lang.types.TypeProjection;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.types.Variance; import org.jetbrains.jet.lang.types.Variance;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@@ -124,9 +123,9 @@ public class JetStandardClasses {
return "Scope for Any"; return "Scope for Any";
} }
}); });
private static final JetType NULLABLE_ANY_TYPE = TypeUtils.makeNullable(ANY_TYPE); private static final JetType NULLABLE_ANY_TYPE = new JetTypeImpl(ANY_TYPE.getAnnotations(), ANY_TYPE.getConstructor(), true, ANY_TYPE.getArguments(), ANY_TYPE.getMemberScope());
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
private static final JetType DEFAULT_BOUND = getNullableAnyType(); private static final JetType DEFAULT_BOUND = getNullableAnyType();