Acounts for local names in addition to method names.

Troy Melhase · Troy Melhase · commit 0f42d7f5d31b · 2011-10-17T01:08:14.000Z
diff --git a/java2python/compiler/template.py b/java2python/compiler/template.py
@@ -92,15 +92,20 @@ def adopt(self, child, index=-1):
 
     def altIdent(self, name):
 	""" Returns an alternate identifier for the one given. """
+        #print '## looking for name:', name, 'parent count:', [(type(x), type(x.parent)) for x in self.parents()]
 	for klass in self.parents(lambda v:v.isClass):
+            #print '#### looking inside', klass.name, klass.variables
 	    if name in klass.variables:
 		try:
 		    method = self.parents(lambda v:v.isMethod).next()
 		except (StopIteration, ):
 		    return name
 		if name in [p['name'] for p in method.parameters]:
 		    return name
+                if name in method.variables:
+                    return name
 		return ('cls' if method.isStatic else 'self') + '.' + name
+        #print
 	return name
 
     def configHandler(self, part, suffix='Handler', default=None):
diff --git a/java2python/compiler/visitor.py b/java2python/compiler/visitor.py
@@ -384,13 +384,15 @@ def acceptDo(self, node, memo):
 	tokens.BLOCK_SCOPE,
 	tokens.CASE,
 	tokens.DEFAULT,
-	tokens.FOR_EACH
+	tokens.FOR_EACH,
+        tokens.METHOD_CALL,
+        tokens.ARGUMENT_LIST,
     )
 
     def acceptExpr(self, node, memo):
 	""" Creates a new expression. """
 	# this works but isn't precise
-	if node.parentType in self.goodExprParents:
+        if node.parentType in self.goodExprParents:
 	    return self.factory.expr(parent=self)
 
     def acceptFor(self, node, memo):
@@ -519,7 +521,7 @@ def acceptTry(self, node, memo):
     def acceptReturn(self, node, memo):
 	""" Creates a new return expression. """
 	# again, this works but isn't as precise as it should be
-	if node.parentType in self.goodReturnParents:
+        if node.parentType: # in self.goodReturnParents:
 	    expr = self.factory.expr(left='return', parent=self)
 	    if node.children:
 		expr.fs, expr.right = FS.lsr, self.factory.expr(parent=expr)
@@ -681,7 +683,7 @@ def acceptDot(self, node, memo):
 	""" Accept and process a dotted expression. """
 	expr = self.factory.expr
 	self.fs = FS.l + '.' + FS.r
-	self.left, self.right = visitors = expr(), expr()
+	self.left, self.right = visitors = expr(parent=self), expr()
 	self.zipWalk(node.children, visitors, memo)
 
     def acceptExpr(self, node, memo):
diff --git a/java2python/config/default.py b/java2python/config/default.py
@@ -149,6 +149,7 @@
     (r'([\w.]+)\.size\(\)', r'len(\1)'),
     (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()'),
     (r'(\s)(\S*?)(\.length\(\))', r'\1len(\2)'),
     (r'(.*?)IndexOutOfBoundsException\((.*?)\)', r'\1IndexError(\2)'),
diff --git a/test/Class12.java b/test/Class12.java
@@ -0,0 +1,12 @@
+class Class12 {
+    private int c = 12;
+
+    private void x() {
+	System.out.println('x');
+    }
+
+    public static void main(String[] args) {
+	Class12 c = new Class12();
+	c.x();
+    }
+}
diff --git a/test/Class7.java b/test/Class7.java
@@ -21,9 +21,9 @@ public static void main(String[] args) {
 	System.out.println(a);
 	System.out.println(b);
 
-	Class7 d = new Class7();
-	d.x();
-	d.y();
-	d.z(3);
+	Class7 c = new Class7();
+	c.x();
+	c.y();
+	c.z(3);
     }
 }
diff --git a/test/ReallyQuickTest.java b/test/ReallyQuickTest.java

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ public static void main(String[] args) {`
`21`	`21`	`System.out.println(a);`
`22`	`22`	`System.out.println(b);`
`23`	`23`
`24`		`- Class7 d = new Class7();`
`25`		`- d.x();`
`26`		`- d.y();`
`27`		`- d.z(3);`
	`24`	`+ Class7 c = new Class7();`
	`25`	`+ c.x();`
	`26`	`+ c.y();`
	`27`	`+ c.z(3);`
`28`	`28`	`}`
`29`	`29`	`}`