Corrects expression parents in switch blocks, which allows for finding alternate idents.

Troy Melhase · Troy Melhase · commit fdff9c4b0a6c · 2012-01-29T15:31:37.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,11 @@
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+
+.DS_Store
+
+java2python/lang/Java.tokens
+java2python/lang/JavaLexer.py
+java2python/lang/JavaParser.py
diff --git a/java2python/compiler/visitor.py b/java2python/compiler/visitor.py
@@ -250,7 +250,7 @@ def acceptFunctionMethodDecl(self, node, memo):
 	ident = node.firstChildOfType(tokens.IDENT)
 	type = node.firstChildOfType(tokens.TYPE).children[0].text
 	mods = node.firstChildOfType(tokens.MODIFIER_LIST)
-	return self.factory.method(name=ident.text, type=type, parent=self)
+        return self.factory.method(name=ident.text, type=type, parent=self)
 
     def acceptVoidMethodDecl(self, node, memo):
 	""" Accept and process a void method declaration. """
@@ -456,7 +456,7 @@ def acceptSwitch(self, node, memo):
 	if not len(caseNodes):
 	    return
 	# we have at least one node...
-	parExpr = self.factory.expr()
+	parExpr = self.factory.expr(parent=self)
 	parExpr.walk(parNode)
 	eqFs = FS.l + '==' + FS.r
 	for caseIdx, caseNode in enumerate(caseNodes):
@@ -470,7 +470,7 @@ def acceptSwitch(self, node, memo):
 		caseExpr = self.factory.statement('else', fs=FS.lc, parent=self)
 
 	    if not isDefault:
-		right = self.factory.expr()
+		right = self.factory.expr(parent=parExpr)
 		right.walk(caseNode.firstChildOfType(tokens.EXPR))
 		caseExpr.expr.right = self.factory.expr(left=parExpr, right=right, fs=eqFs)
 		caseContent = self.factory.methodContent(parent=self)
@@ -486,6 +486,7 @@ def acceptSwitch(self, node, memo):
 		    caseContent.walk(child, memo)
 		if not caseNode.children:
 		    self.factory.expr(left='pass', parent=caseContent)
+        self.children.remove(parExpr)
 
     def acceptThrow(self, node, memo):
 	""" Accept and process a throw statement. """
diff --git a/java2python/config/default.py b/java2python/config/default.py
@@ -141,11 +141,19 @@
     (Type('TRUE'),  transform.true2True),
     (Type('IDENT'), transform.keywordSafeIdent),
 
+
     (Type('FLOATING_POINT_LITERAL'),
      transform.syntaxSafeFloatLiteral),
 
+    (Type('TYPE') > Type('BOOLEAN'),
+     transform.typeSub),
+
+    (Type('TYPE') > Type('DOUBLE'),
+     transform.typeSub),
+
     (Type('TYPE') > Type('QUALIFIED_TYPE_IDENT') > Type('IDENT'),
-     transform.typeSub)
+     transform.typeSub),
+
 ]
 
 
@@ -184,6 +192,7 @@
 
 typeSubs = {
     'Boolean' : 'bool',
+    'boolean' : 'bool',
     'IndexOutOfBoundsException' : 'IndexError',
     'Integer' : 'int',
     'Object' : 'object',
diff --git a/java2python/mod/basic.py b/java2python/mod/basic.py
@@ -43,7 +43,7 @@ def simpleImports(module, expr):
 
 
 def commentedPackages(module, expr):
-    module.factory.comment(parent=module, left=expr, fs='package: {left}')
+    module.factory.comment(parent=module, left=expr, fs='# package: {left}')
 
 
 def namespacePackages(module, expr):
diff --git a/test/Switch5.java b/test/Switch5.java
@@ -0,0 +1,21 @@
+// tests switches with class attributes
+
+class Switch5 {
+    public static final int RT_VOLUME = 48;
+
+    public static String getField( int val) {
+        switch( val) {
+            case RT_VOLUME:  return "rt volume";
+            default:         return "unknown";
+
+        }
+    }
+
+    public static void main(String[] args) {
+	Switch5 c = new Switch5();
+	System.out.println( c.getField(48) );
+	System.out.println( c.getField(49) );
+    }
+
+
+}
diff --git a/test/TypeTransform.java b/test/TypeTransform.java
@@ -0,0 +1,6 @@
+class TypeTransform {
+    public boolean b;
+    public double d;
+
+    public static void main(String[] args) {}
+}
