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

Revert "refactored conditional jump generation to enable and/or generation"

Browse Source 
This reverts commit b74bdb9cfd.
This commit is contained in:
Dmitry Jemerov
2011-04-08 20:02:26 +02:00
parent b74bdb9cfd
commit 5a0a03c1e4
5 changed files with 92 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+2 -17
View File
@@ -109,7 +109,7 @@ public class NamespaceGenTest extends LightCodeInsightFixtureTestCase {
}
public void testIf() throws Exception {
loadText("fun foo(b: Boolean): Int { return if (b) 15 else 20 }");
loadFile("if.jet");
System.out.println(generateToText());
final Method main = generateFunction();
@@ -118,7 +118,7 @@ public class NamespaceGenTest extends LightCodeInsightFixtureTestCase {
}
public void testSingleBranchIf() throws Exception {
loadText("fun foo(b: Boolean) : Int { if (b) return 15;\n return 20; }");
loadFile("singleBranchIf.jet");
System.out.println(generateToText());
final Method main = generateFunction();
@@ -451,21 +451,6 @@ public class NamespaceGenTest extends LightCodeInsightFixtureTestCase {
assertEquals(0, main.invoke(null, 4));
}
public void _testAnd() throws Exception {
loadText("fun foo(a : Int): Boolean = a > 0 && a/0 > 0");
final Method main = generateFunction();
assertEquals(false, main.invoke(null, 0));
boolean hadException = false;
try {
main.invoke(null, 5);
} catch (InvocationTargetException e) {
if (e.getTargetException() instanceof ArithmeticException) {
hadException = true;
}
}
assertTrue(hadException);
}
private void binOpTest(final String text, final Object arg1, final Object arg2, final Object expected) throws Exception {
loadText(text);
System.out.println(generateToText());