diff --git a/.idea/workspace.xml b/.idea/workspace.xml index bd85c49fbca..9550df47b4a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,12 +6,9 @@ - - + + - - - @@ -132,19 +129,10 @@ - - - - - - - - - - + @@ -159,31 +147,56 @@ - + - + - - + + - + - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -191,34 +204,16 @@ - + - - + + - - - - - - - - - - - - - - - - - - - + @@ -339,8 +334,6 @@ @@ -996,7 +991,7 @@ - + @@ -1012,7 +1007,7 @@ - + @@ -1050,7 +1045,7 @@ @@ -1092,48 +1088,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1148,13 +1102,6 @@ - - - - - - - @@ -1166,7 +1113,7 @@ - + @@ -1185,13 +1132,6 @@ - - - - - - - @@ -1199,9 +1139,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/translator/test/org/jetbrains/k2js/test/ExpressionTest.java b/translator/test/org/jetbrains/k2js/test/ExpressionTest.java index c716e9c6972..04259b9fe53 100644 --- a/translator/test/org/jetbrains/k2js/test/ExpressionTest.java +++ b/translator/test/org/jetbrains/k2js/test/ExpressionTest.java @@ -95,4 +95,14 @@ public final class ExpressionTest extends TranslationTest { public void postfixIntOperations() throws Exception { testFooBoxIsTrue("postfixIntOperations.kt"); } + + @Test + public void notBoolean() throws Exception { + testFooBoxIsTrue("notBoolean.kt"); + } + + @Test + public void positiveAndNegativeNumbers() throws Exception { + testFooBoxIsTrue("positiveAndNegativeNumbers.kt"); + } } diff --git a/translator/testFiles/expression/cases/notBoolean.kt b/translator/testFiles/expression/cases/notBoolean.kt new file mode 100644 index 00000000000..47bf9e9dcac --- /dev/null +++ b/translator/testFiles/expression/cases/notBoolean.kt @@ -0,0 +1,6 @@ +namespace foo + +fun box() : Boolean +{ + return !false; +} \ No newline at end of file diff --git a/translator/testFiles/expression/cases/positiveAndNegativeNumbers.kt b/translator/testFiles/expression/cases/positiveAndNegativeNumbers.kt new file mode 100644 index 00000000000..cd4965ad5c2 --- /dev/null +++ b/translator/testFiles/expression/cases/positiveAndNegativeNumbers.kt @@ -0,0 +1,8 @@ +namespace foo + +fun box() : Boolean +{ + val b = -3 + val c = +3 + return (c - b) == 6 +} \ No newline at end of file