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

Unsorted replacements "jet" -> "kotlin"

Browse Source 
#KT-2896 Fixed
This commit is contained in:
Alexander Udalov
2014-02-19 21:34:06 +04:00
parent ac71911720
commit 6b0fce8cd5
22 changed files with 185 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/ScriptTest.java
+1 -1
View File
@@ -106,6 +106,6 @@ public class ScriptTest {
@NotNull
private static List<AnalyzerScriptParameter> numIntParam() {
return Collections.singletonList(new AnalyzerScriptParameter(Name.identifier("num"), JetTypeName.parse("jet.Int")));
return Collections.singletonList(new AnalyzerScriptParameter(Name.identifier("num"), JetTypeName.parse("kotlin.Int")));
}
}
compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java
+5 -5
View File
@@ -126,20 +126,20 @@ public class CodegenTestFiles {
String valueString = scriptParametersMatcher.group(3);
Object value;
if (type.equals("jet.String")) {
if (type.equals("kotlin.String")) {
value = valueString;
}
else if (type.equals("jet.Long")) {
else if (type.equals("kotlin.Long")) {
value = Long.parseLong(valueString);
}
else if (type.equals("jet.Int")) {
else if (type.equals("kotlin.Int")) {
value = Integer.parseInt(valueString);
}
else if (type.equals("jet.Array<jet.String>")) {
else if (type.equals("kotlin.Array<kotlin.String>")) {
value = valueString.split(" ");
}
else {
throw new AssertionError("TODO");
throw new AssertionError("TODO: " + type);
}
scriptParameterTypes.add(new AnalyzerScriptParameter(Name.identifier(name), JetTypeName.parse(type)));
compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class ScriptGenTest extends CodegenTestCase {
protected Object scriptInstance;
public static final JetScriptDefinition FIB_SCRIPT_DEFINITION =
new JetScriptDefinition(".lang.kt", new AnalyzerScriptParameter("num", "jet.Int"));
new JetScriptDefinition(".lang.kt", new AnalyzerScriptParameter("num", "kotlin.Int"));
@Override
protected void setUp() throws Exception {