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

JetStandardClasses -> KotlinBuiltIns

Browse Source
This commit is contained in:
Andrey Breslav
2012-10-17 11:39:45 +04:00
parent 363faaf6d5
commit c719ae427a
67 changed files with 256 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
+2 -2
View File
@@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeProjection;
import org.jetbrains.jet.lang.types.Variance;
import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.junit.Assert;
import org.junit.ComparisonFailure;
@@ -732,7 +732,7 @@ public class NamespaceComparator {
sb.append(">");
}
if (JetStandardClasses.getNothing() != klass && !klass.getTypeConstructor().getSupertypes().isEmpty()) {
if (KotlinBuiltIns.getInstance().getNothing() != klass && !klass.getTypeConstructor().getSupertypes().isEmpty()) {
sb.append(" : ");
new TypeSerializer(sb).serializeCommaSeparated(new ArrayList<JetType>(klass.getTypeConstructor().getSupertypes()));
}
compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
+9 -9
View File
@@ -45,7 +45,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
import org.jetbrains.jet.lexer.JetTokens;
@@ -117,15 +117,15 @@ public class JetTypeCheckerTest extends JetLiteFixture {
assertType("\"d\"", library.getStringType());
assertType("\"\"\"d\"\"\"", library.getStringType());
assertType("#()", JetStandardClasses.getUnitType());
assertType("#()", KotlinBuiltIns.getInstance().getUnitType());
assertType("null", JetStandardClasses.getNullableNothingType());
assertType("null", KotlinBuiltIns.getInstance().getNullableNothingType());
}
public void testTupleConstants() throws Exception {
assertType("#()", JetStandardClasses.getUnitType());
assertType("#()", KotlinBuiltIns.getInstance().getUnitType());
assertType("#(1, 'a')", JetStandardClasses.getTupleType(library.getIntType(), library.getCharType()));
assertType("#(1, 'a')", KotlinBuiltIns.getInstance().getTupleType(library.getIntType(), library.getCharType()));
}
public void testTypeInfo() throws Exception {
@@ -135,9 +135,9 @@ public class JetTypeCheckerTest extends JetLiteFixture {
}
public void testJumps() throws Exception {
assertType("throw java.lang.Exception()", JetStandardClasses.getNothingType());
assertType("continue", JetStandardClasses.getNothingType());
assertType("break", JetStandardClasses.getNothingType());
assertType("throw java.lang.Exception()", KotlinBuiltIns.getInstance().getNothingType());
assertType("continue", KotlinBuiltIns.getInstance().getNothingType());
assertType("break", KotlinBuiltIns.getInstance().getNothingType());
}
public void testIf() throws Exception {
@@ -713,7 +713,7 @@ public class JetTypeCheckerTest extends JetLiteFixture {
List<JetDelegationSpecifier> delegationSpecifiers = classElement.getDelegationSpecifiers();
// TODO : assuming that the hierarchy is acyclic
Collection<JetType> supertypes = delegationSpecifiers.isEmpty()
? Collections.singleton(JetStandardClasses.getAnyType())
? Collections.singleton(KotlinBuiltIns.getInstance().getAnyType())
: descriptorResolver.resolveDelegationSpecifiers(parameterScope, delegationSpecifiers, typeResolver, JetTestUtils.DUMMY_TRACE, true);
// for (JetType supertype: supertypes) {
// if (supertype.getConstructor().isSealed()) {