Corrects empty while loops.

Troy Melhase · Troy Melhase · commit 3294b0468266 · 2012-01-29T20:56:52.000-05:00
Corrects break statement removal on switch-to-if statements.

Corrects comment placement within expressions.
diff --git a/java2python/compiler/visitor.py b/java2python/compiler/visitor.py
@@ -41,11 +41,21 @@ def insertComments(self, tmpl, tree, index, memo):
 	prefix = self.config.last('commentPrefix', '# ')
 	cache, parser, comTypes = memo.comments, tree.parser, tokens.commentTypes
 	comNew = lambda t:t.type in comTypes and t.index not in cache
+
 	for tok in ifilter(comNew, parser.input.tokens[memo.last:index]):
 	    cache.add(tok.index)
-	    if tmpl.isExpression and tok.line==parser.input.tokens[index].line:
-  	        tmpl.tail += prefix if not tmpl.tail.startswith(prefix) else ''
-		tmpl.tail += ''.join(self.stripComment(tok.text))
+
+            # loop over parents until we find the top expression
+            base = tmpl
+            while base:
+                if base and base.parent and base.parent.isExpression:
+                    base = base.parent
+                else:
+                    break
+
+	    if hasattr(base, 'tail') and tok.line==parser.input.tokens[index].line:
+  	        base.tail += prefix if not base.tail.startswith(prefix) else ''
+		base.tail += ''.join(self.stripComment(tok.text))
 	    else:
 		for line in self.stripComment(tok.text):
 		    self.factory.comment(left=prefix, right=line, parent=self)
@@ -250,12 +260,14 @@ def acceptFunctionMethodDecl(self, node, memo):
 	ident = node.firstChildOfType(tokens.IDENT)
 	type = node.firstChildOfType(tokens.TYPE).children[0].text
 	mods = node.firstChildOfType(tokens.MODIFIER_LIST)
+        self.variables.append(ident.text)
         return self.factory.method(name=ident.text, type=type, parent=self)
 
     def acceptVoidMethodDecl(self, node, memo):
 	""" Accept and process a void method declaration. """
 	ident = node.firstChildOfType(tokens.IDENT)
 	mods = node.firstChildOfType(tokens.MODIFIER_LIST)
+        self.variables.append(ident.text)
 	return self.factory.method(name=ident.text, type='void', parent=self)
 
 
@@ -352,9 +364,17 @@ def acceptAssert(self, node, memo):
 
     def acceptBreak(self, node, memo):
 	""" Accept and process a break statement. """
-	if node.parent and node.parent.type in (tokens.CASE, tokens.DEFAULT):
-	    return
-	breakStat = self.factory.statement('break', parent=self)
+        # possible parents of a break statement:  switch, while, do, for
+        # we want to skip inserting a break statement if we're inside a switch.
+        insert, ok_types = True, [tokens.WHILE, tokens.DO, tokens.FOR]
+        for parent in node.parents():
+            if parent.type == tokens.SWITCH:
+                insert = False
+                break
+            if parent.type in ok_types:
+                break
+        if insert:
+            breakStat = self.factory.statement('break', parent=self)
 
     def acceptCatch(self, node, memo):
 	""" Accept and process a catch statement. """
@@ -536,7 +556,10 @@ def acceptWhile(self, node, memo):
 	parNode, blkNode = node.children
 	whileStat = self.factory.statement('while', fs=FS.lsrc, parent=self)
 	whileStat.expr.walk(parNode, memo)
-	whileStat.walk(blkNode, memo)
+        if not blkNode.children:
+            self.factory.expr(left='pass', parent=whileStat)
+        else:
+            whileStat.walk(blkNode, memo)
 
 
 class Method(VarAcceptor, ModifiersAcceptor, MethodContent):
@@ -720,6 +743,7 @@ def acceptMethodCall(self, node, memo):
 	    arg.left.walk(child, memo)
 	    arg.right = arg = expr(parent=self)
 
+
     def acceptThisConstructorCall(self, node, memo):
 	""" Accept and process a 'this(...)' constructor call. """
 	self.acceptMethodCall(node, memo)
diff --git a/java2python/lang/base.py b/java2python/lang/base.py
@@ -237,6 +237,13 @@ def parentType(self):
 	""" Returns the type of the parent tree. """
 	return self.parent.type
 
+    def parents(self, pred=lambda v:True):
+	""" Yield each parent in the family tree. """
+	while self:
+	    if pred(self):
+		yield self
+	    self = self.parent
+
     @property
     def parserTokens(self):
 	""" Returns the sequence of tokens used to create this tree. """
diff --git a/test/Comments3.java b/test/Comments3.java
@@ -0,0 +1,14 @@
+class Comments3 {
+
+    static void bar(int x) {
+        System.out.println(x);
+    }
+        public static void main(String[] args) {
+            int foo = 100;
+            if (foo < 38) {
+                // will never happen
+                bar(/* funk */ 0);
+            }
+            bar(1);
+        }
+}
diff --git a/test/Switch6.java b/test/Switch6.java
@@ -0,0 +1,15 @@
+class Switch6 {
+
+    public static void main(String[] args) {
+        int x = 0;
+
+        switch (x) {
+            case 0:
+                if (x==0) { 
+                    System.out.println(x);
+                    break;
+                }
+        }
+
+    }
+}
diff --git a/test/While3.java b/test/While3.java
@@ -0,0 +1,8 @@
+class While3 {
+    public static void main(String[] args) {
+	int x = 10;
+	while (x>10) {
+	}
+        System.out.println("ok");
+    }
+}
