Better handling of all non-block types in and .

Troy Melhase · Troy Melhase · commit 7befea3d56c6 · 2012-02-06T18:18:56.000-05:00
diff --git a/doc/translation.md b/doc/translation.md
@@ -58,7 +58,7 @@ equivalents:
 The bit shift right (`>>>`)and bit shift assign right (`>>>=`) operators are
 mapped to a function; if java2python detects code that uses either of these, it
 replaces the operator with that function and includes the function within the
-output.  This behavior is controlled by the `modulePrologueHandlers` config
+output.  This behavior is controlled by the [`modulePrologueHandlers`][6] config
 handler.
 
 #### Infix Operators
@@ -114,6 +114,9 @@ statements.
 
 Java `if` statements are translated to equivalent Python `if` statements.
 
+#### import
+
+The processing import statements is delegated to the [`moduleImportDeclarationHandler`][9].
 
 #### for
 
@@ -183,7 +186,7 @@ The `this` Java keyword is translated to the Python pseudo keyword `self`.
 
 #### instanceof
 
-The `instance of` Java keyword is translated to the `isinstance(…)` Python
+The `instanceof` Java keyword is translated to the `isinstance(…)` Python
 function call.
 
 #### super
@@ -205,7 +208,7 @@ the `void.class` form, the compiler translates the expression to
 ### Annotations
 
 Annotations are typically dropped by the compiler.  The following Java
-annotations have little or no meaning in Python, and are discarded:
+annotations have little or no meaning in Python and are discarded:
 
     public    protected    private    abstract    final    native    transient
     volatile  strictfp
@@ -247,3 +250,4 @@ Java language specification:  http://java.sun.com/docs/books/jls/third_edition/h
 [6]: https://github.com/natural/java2python/tree/master/doc/customization.md#modulePrologueHandlers
 [7]: https://github.com/natural/java2python/tree/master/doc/customization.md#methodPrologueHandlers
 [8]: https://github.com/natural/java2python/tree/master/doc/customization.md#commentPrefix
+[9]: https://github.com/natural/java2python/tree/master/doc/customization.md#moduleImportDeclarationHandler
diff --git a/doc/usage.md b/doc/usage.md
@@ -12,7 +12,7 @@ and the name of an input file and output file:
 $ j2py [INPUT] [OUTPUT]
 ```
 
-Both are optional, but you'll usually supply an input file.  For example:
+Both are optional, but you'll usually supply an input file:
 
 ```bash
 $ j2py SourceFile.java
@@ -75,7 +75,7 @@ page.
 
   * `-k`, `--skip-compile`
 
-    Do not check the output for valid Python syntax by byte compiling it.
+    Do not byte compile the output to test for valid Python syntax.
 
   * `-n`, `--no-defaults`
 
@@ -85,7 +85,7 @@ page.
 
     Disable colorized output.
 
-    Colorized output is not available on Windows and this option has no effect
+    Colorized output is not available on Windows and this option is ignored
     there.
 
 
diff --git a/java2python/compiler/visitor.py b/java2python/compiler/visitor.py
@@ -448,41 +448,39 @@ def acceptForEach(self, node, memo):
 
     def acceptIf(self, node, memo):
         """ Accept and process an if statement. """
-        # the parser will feed us one of three forms:
-        # bare if:          PARENTESIZED_EXPR - BLOCK_SCOPE
-        # if with else:     PARENTESIZED_EXPR - BLOCK_SCOPE - BLOCK_SCOPE
-        # if with else if:  PARENTESIZED_EXPR - BLOCK_SCOPE - IF
         children = node.children
         ifStat = self.factory.statement('if', fs=FS.lsrc, parent=self)
         ifStat.expr.walk(children[0], 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:
+
+        if node.children[1].type == tokens.EXPR:
             ifBlock = self.factory.expr(parent=ifStat)
             ifBlock.walk(node.children[1], memo)
+        else:
+            ifBlock = self.factory.methodContent(parent=self)
+            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)
-                if nextNode.children[1].type == tokens.BLOCK_SCOPE:
-                    nextBlock = self.factory.methodContent(parent=self)
-                else:
+                if nextNode.children[1].type == tokens.EXPR:
                     nextBlock = self.factory.expr(parent=nextStat)
+                else:
+                    nextBlock = self.factory.methodContent(parent=self)
                 nextBlock.walk(nextNode.children[1], memo)
                 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:
+            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:
+                self.factory.statement('else', fs=FS.lc, parent=self)
+                self.factory.methodContent(parent=self).walk(nextNode, memo)
 
 
     def acceptSwitch(self, node, memo):
@@ -582,6 +580,7 @@ def acceptReturn(self, node, memo):
             if node.children:
                 expr.fs, expr.right = FS.lsr, self.factory.expr(parent=expr)
                 expr.right.walk(node, memo)
+            return expr
 
     def acceptWhile(self, node, memo):
         """ Accept and process a while block. """
diff --git a/java2python/config/default.py b/java2python/config/default.py
@@ -181,7 +181,7 @@
     (r'(.*?)\.equals\((.*?)\)', r'\1 == \2'),
     (r'(.*?)\.equalsIgnoreCase\((.*?)\)', r'\1.lower() == \2.lower()'),
     (r'([\w.]+)\.size\(\)', r'len(\1)'),
-    (r'(\w+)\.get\((.*?)\)', r'\1[\2]'),
+    #(r'(\w+)\.get\((.*?)\)', r'\1[\2]'),
     (r'(\s)(\S*?)(\.toString\(\))', r'\1\2.__str__()'),
     (r'(\s)def toString', r'\1def __str__'),
     (r'(\s)(\S*?)(\.toLowerCase\(\))', r'\1\2.lower()'),
diff --git a/java2python/mod/basic.py b/java2python/mod/basic.py
@@ -30,9 +30,7 @@ def simpleDocString(obj):
 
     This generator works for modules, classes, and functions.
     """
-    yield '""" generated source for {0} {1}'.format(obj.typeName, obj.name)
-    yield ''
-    yield '"""'
+    yield '""" generated source for {0} {1} """'.format(obj.typeName, obj.name)
 
 
 def commentedImports(module, expr):
diff --git a/test/If5.java b/test/If5.java
@@ -0,0 +1,8 @@
+class If5 {
+    public static void main(String[] args) {
+	int x = 0;
+        System.out.println(x);
+	if (x == 0)
+            return;
+    }
+}
