Adds support for if-expr and else-expr forms. See issue natural#4.

Troy Melhase · Troy Melhase · commit 873f67acc8db · 2012-02-05T23:14:14.000-05:00
diff --git a/java2python/compiler/visitor.py b/java2python/compiler/visitor.py
@@ -455,24 +455,35 @@ def acceptIf(self, node, memo):
         children = node.children
         ifStat = self.factory.statement('if', fs=FS.lsrc, parent=self)
         ifStat.expr.walk(children[0], memo)
-        ifBlock = self.factory.methodContent(parent=self)
-        ifBlock.walk(node.children[1], memo)
+        if node.children[1].type == tokens.BLOCK_SCOPE:
+            ifBlock = self.factory.methodContent(parent=self)
+            ifBlock.walk(node.children[1], memo)
+        elif node.children[1].type == tokens.EXPR:
+            ifBlock = self.factory.expr(parent=ifStat)
+            ifBlock.walk(node.children[1], memo)
         if len(children) == 3:
             nextNode = children[2]
             nextType = nextNode.type
+
             while nextType == tokens.IF:
                 nextStat = self.factory.statement('elif', fs=FS.lsrc, parent=self)
                 nextStat.expr.walk(nextNode.children[0], memo)
-                nextBlock = self.factory.methodContent(parent=self)
+                if nextNode.children[1].type == tokens.BLOCK_SCOPE:
+                    nextBlock = self.factory.methodContent(parent=self)
+                else:
+                    nextBlock = self.factory.expr(parent=nextStat)
                 nextBlock.walk(nextNode.children[1], memo)
-                try:
-                    nextNode = nextNode.children[2]
-                    nextType = nextNode.type
-                except (IndexError, ):
-                    nextType = None
+                nextNode = nextNode.children[2]
+                nextType = nextNode.type
+
             if nextType == tokens.BLOCK_SCOPE:
                 self.factory.statement('else', fs=FS.lc, parent=self)
                 self.factory.methodContent(parent=self).walk(nextNode, memo)
+            elif nextType == tokens.EXPR:
+                elseStat = self.factory.statement('else', fs=FS.lc, parent=self)
+                elseBlock = self.factory.expr(parent=elseStat)
+                elseBlock.walk(nextNode, memo)
+
 
     def acceptSwitch(self, node, memo):
         """ Accept and process a switch block. """
diff --git a/test/If2.java b/test/If2.java
@@ -0,0 +1,8 @@
+class If2 {
+    public static void main(String[] args) {
+	int x = 0;
+
+	if (x == 0)
+	    System.out.println(0);
+    }
+}
diff --git a/test/If3.java b/test/If3.java
@@ -0,0 +1,10 @@
+class If3 {
+    public static void main(String[] args) {
+	int x = 0;
+
+	if (x == 1)
+	    System.out.println(0);
+        else
+	    System.out.println(1);
+    }
+}
diff --git a/test/If4.java b/test/If4.java
@@ -0,0 +1,14 @@
+class If4 {
+    public static void main(String[] args) {
+	int x = 0;
+
+	if (x == 1)
+	    System.out.println(1);
+        else if (x == 2)
+	    System.out.println(2);
+        else if (x == 3)
+	    System.out.println(3);
+        else
+	    System.out.println(0);
+    }
+}
