jet.typeinfo.TypeInfo -> jet.TypeInfo
This commit is contained in:
@@ -18,7 +18,7 @@ public class ClassGenTest extends CodegenTestCase {
|
||||
final Class aClass = loadClass("SimpleClass", generateClassesInFile());
|
||||
final Method[] methods = aClass.getDeclaredMethods();
|
||||
// public int SimpleClass.foo()
|
||||
// public jet.typeinfo.TypeInfo SimpleClass.getTypeInfo()
|
||||
// public jet.TypeInfo SimpleClass.getTypeInfo()
|
||||
assertEquals(2, methods.length);
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package org.jetbrains.jet.codegen;
|
||||
import jet.IntRange;
|
||||
import jet.Tuple2;
|
||||
import jet.Tuple4;
|
||||
import jet.typeinfo.TypeInfo;
|
||||
import jet.TypeInfo;
|
||||
|
||||
import java.awt.*;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
|
||||
@@ -2,7 +2,7 @@ package org.jetbrains.jet.codegen;
|
||||
|
||||
import jet.JetObject;
|
||||
import jet.TypeCastException;
|
||||
import jet.typeinfo.TypeInfo;
|
||||
import jet.TypeInfo;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
@@ -31,7 +31,7 @@ public class TypeInfoTest extends CodegenTestCase {
|
||||
}
|
||||
|
||||
public void testNoArgTypeinfo() throws Exception {
|
||||
loadText("fun foo() = typeinfo.typeinfo<Int>()");
|
||||
loadText("fun foo() = typeinfo<Int>()");
|
||||
Method foo = generateFunction();
|
||||
TypeInfo typeInfo = (TypeInfo) foo.invoke(null);
|
||||
assertSame(TypeInfo.INT_TYPE_INFO, typeInfo);
|
||||
|
||||
@@ -90,8 +90,8 @@ public class JetTypeCheckerTest extends JetLiteFixture {
|
||||
}
|
||||
|
||||
public void testTypeInfo() throws Exception {
|
||||
assertType("typeinfo.typeinfo<Int>", "typeinfo.TypeInfo<Int>");
|
||||
assertType("typeinfo.typeinfo<typeinfo.TypeInfo<Int>>", "typeinfo.TypeInfo<typeinfo.TypeInfo<Int>>");
|
||||
assertType("typeinfo<Int>", "TypeInfo<Int>");
|
||||
assertType("typeinfo<TypeInfo<Int>>", "TypeInfo<TypeInfo<Int>>");
|
||||
}
|
||||
|
||||
public void testJumps() throws Exception {
|
||||
|
||||
Reference in New Issue
Block a user