Adds support for 'else if' without 'else'. Fixes natural#15.

Troy Melhase · Troy Melhase · commit 9590d4870483 · 2012-05-03T16:07:57.000-04:00
diff --git a/java2python/compiler/visitor.py b/java2python/compiler/visitor.py
@@ -482,14 +482,19 @@ def acceptIf(self, node, memo):
                 else:
                     nextBlock = self.factory.methodContent(parent=self)
                 nextBlock.walk(nextNode.children[1], memo)
-                nextNode = nextNode.children[2]
-                nextType = nextNode.type
+
+                try:
+                    nextNode = nextNode.children[2]
+                except (IndexError, ):
+                    nextType = None
+                else:
+                    nextType = nextNode.type
 
             if nextType == tokens.EXPR:
                 elseStat = self.factory.statement('else', fs=FS.lc, parent=self)
                 elseBlock = self.factory.expr(parent=elseStat)
                 elseBlock.walk(nextNode, memo)
-            else: # nextType != tokens.BLOCK_SCOPE:
+            elif nextType: # nextType != tokens.BLOCK_SCOPE:
                 self.factory.statement('else', fs=FS.lc, parent=self)
                 self.factory.methodContent(parent=self).walk(nextNode, memo)
 
diff --git a/test/If6.java b/test/If6.java
@@ -0,0 +1,10 @@
+class If6 {
+    public static void main(String[] args) {
+        if (false) {
+            System.out.println("fail");
+        } else if (true) {
+            System.out.println("okay");
+        }
+    }
+
+}
