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

Drop JetTypeName and related code

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-06-10 16:50:33 +04:00
parent 8d2038ec1a
commit 024ed5a236
17 changed files with 36 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/ScriptTest.java
+2 -2
View File
@@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.ref.JetTypeName;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.utils.KotlinPaths;
import org.jetbrains.jet.utils.PathUtil;
import org.junit.Test;
@@ -106,6 +106,6 @@ public class ScriptTest {
@NotNull
private static List<AnalyzerScriptParameter> numIntParam() {
return Collections.singletonList(new AnalyzerScriptParameter(Name.identifier("num"), JetTypeName.parse("kotlin.Int")));
return Collections.singletonList(new AnalyzerScriptParameter(Name.identifier("num"), KotlinBuiltIns.getInstance().getIntType()));
}
}
compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java
+9 -2
View File
@@ -28,7 +28,8 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.ref.JetTypeName;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import java.io.IOException;
import java.util.ArrayList;
@@ -121,23 +122,29 @@ public class CodegenTestFiles {
String valueString = scriptParametersMatcher.group(3);
Object value;
JetType jetType;
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
if (type.equals("kotlin.String")) {
value = valueString;
jetType = builtIns.getStringType();
}
else if (type.equals("kotlin.Long")) {
value = Long.parseLong(valueString);
jetType = builtIns.getLongType();
}
else if (type.equals("kotlin.Int")) {
value = Integer.parseInt(valueString);
jetType = builtIns.getIntType();
}
else if (type.equals("kotlin.Array<kotlin.String>")) {
value = valueString.split(" ");
jetType = builtIns.getArrayType(builtIns.getStringType());
}
else {
throw new AssertionError("TODO: " + type);
}
scriptParameterTypes.add(new AnalyzerScriptParameter(Name.identifier(name), JetTypeName.parse(type)));
scriptParameterTypes.add(new AnalyzerScriptParameter(Name.identifier(name), jetType));
scriptParameterValues.add(value);
}
compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java
+4 -1
View File
@@ -24,6 +24,8 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.utils.UtilsPackage;
import org.jetbrains.org.objectweb.asm.Opcodes;
@@ -35,7 +37,8 @@ public class ScriptGenTest extends CodegenTestCase {
protected Object scriptInstance;
public static final JetScriptDefinition FIB_SCRIPT_DEFINITION =
new JetScriptDefinition(".lang.kt", new AnalyzerScriptParameter("num", "kotlin.Int"));
new JetScriptDefinition(".lang.kt",
new AnalyzerScriptParameter(Name.identifier("num"), KotlinBuiltIns.getInstance().getIntType()));
@Override
protected void setUp() throws Exception {