Blindly moves class-level expressions containing the class name

Troy Melhase · Troy Melhase · commit 7a6f0fb085da · 2012-02-07T21:41:47.000-05:00
to the module scope. See issue natural#5.
diff --git a/java2python/config/default.py b/java2python/config/default.py
@@ -69,6 +69,7 @@
 # name.  It's commented out because its output differs so greatly
 # from its input, and because it's really not very useful.
 classPostWalkHandlers = [
+    basic.moveStaticExpressions,
     ## basic.classContentSort,
 ]
 
diff --git a/java2python/mod/basic.py b/java2python/mod/basic.py
@@ -225,3 +225,15 @@ def zopeImplementsClassHead(obj):
     if implAny(obj):
         for cls in obj.bases:
             yield 'zope.interface.implements({})'.format(cls)
+
+
+def moveStaticExpressions(cls):
+    name = '{}.'.format(cls.name) # notice the dot
+    exprs = [child for child in cls.children if child.isExpression and name in str(child)]
+    module = cls.parents(lambda x:x.isModule).next()
+    for expr in exprs:
+        cls.children.remove(expr)
+        newExpr = module.factory.expr(fs=name + '{right}', right=expr)
+        module.adopt(newExpr, index=len(module.children))
+
+
diff --git a/test/Class13.java b/test/Class13.java
@@ -0,0 +1,12 @@
+public class Class13 {
+
+    static int x = 0;
+    static int y = Class13.x;
+
+    Class klass = Class13.class;
+
+    public static void main(String[] args) {
+        System.out.println(Class13.x == Class13.y ? 1 : 0);
+    }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@`
`69`	`69`	`# name. It's commented out because its output differs so greatly`
`70`	`70`	`# from its input, and because it's really not very useful.`
`71`	`71`	`classPostWalkHandlers = [`
	`72`	`+ basic.moveStaticExpressions,`
`72`	`73`	`## basic.classContentSort,`
`73`	`74`	`]`
`74`	`75`