Make generated code for switch/case more clean

liling · liling · commit e58fb46ad004 · 2007-09-28T18:21:22.000Z
diff --git a/java2python/lib/sourcetypes.py b/java2python/lib/sourcetypes.py
@@ -307,6 +307,9 @@ def declFormat(self):
 
     @property
     def className(self):
+        """ Return className of the source in.
+
+        """
         if isinstance(self, Class):
             return self.name
         elif self.parent is not None:
@@ -380,10 +383,7 @@ def newSwitch(self):
         while_stat = Statement(self, 'while')
         while_stat.setExpression('True')
         self.addSource(while_stat)
-        s = Statement(while_stat, 'if')
-        s.expr = 'False'
-        while_stat.addSource(s)
-        return while_stat, s
+        return while_stat
 
     def newStatement(self, name):
         """ creates a new Statement as a child of this block
@@ -407,7 +407,21 @@ def newStatementBefore(self, name, stat=None):
         self.addSourceBefore(s, stat)
         return s
 
+    def removeStatement(self, stat):
+        """ remove a statement from source.
+
+        @param stat Statement to be removed.
+        @return None
+        """
+        idx = self.lines.index(stat)
+        del self.lines[idx]
+
     def newVariable(self, name=None):
+        """ creates a new Variable for the block
+        
+        @param name name of the variable
+        @return Variable instance
+        """
         var = Variable(self)
         self.addVariable(var, True)
         return var
@@ -459,23 +473,6 @@ def setName(self, name):
         """
         self.name = name
 
-    def fixSwitch(self, while_block, block):
-        """ fixes the first clause in an generated switch statement
-
-        @param block Statement instance and child of this block
-        @return None
-        """
-        lines = while_block.lines
-        if (not block in lines) or (block.name != 'if'):
-            return
-        i = lines.index(block)
-        if (len(lines) > i):
-            next = lines[i+1]
-            if next.name == 'elif':
-                lines.remove(next)
-                block.expr = next.expr
-                block.lines = next.lines
-
     def trimLines(self):
         """ removes empty lines from the end of this block
 
diff --git a/java2python/lib/walker.g b/java2python/lib/walker.g
@@ -471,14 +471,13 @@ statement [block]
 
 
     |   {
-        while_block, switch_block = block.newSwitch()
+        while_block = block.newSwitch()
         }
         #("switch" switch_expr = expression[block, False]
                    (c:case_group[while_block, switch_expr])*
         )
         {
         while_block.newStatement("break")
-        block.fixSwitch(while_block, switch_block)
         }
 
     |   {
@@ -505,17 +504,24 @@ case_group [block, switch_expr]
             (#("case"
                newright = expression[other, False]
                {
-        if not right:
-            right = ("%s", newright)
-        else:
-            right = ("%s, %s", (right, newright))
+                if not right:
+                    right = ("%s", newright)
+                else:
+                    right = ("%s, %s", (right, newright))
+               }
+              )
+              | "default"
+               {
+                right = block.emptyAssign
+                block.removeStatement(other)
+                other = block
                }
-              ) | "default" { right = block.emptyAssign } )+
-               statement_list[other]
+            )+
+            statement_list[other]
         )
         {
         if right is block.emptyAssign:
-            other.setExpression("True")
+            pass
         elif right[0] == "%s":
             other.setExpression(("%s == %s", (switch_expr, right)))
         else:
diff --git a/java2python/tests/Switches.java b/java2python/tests/Switches.java
@@ -57,6 +57,7 @@ public int switch4(int i) {
         switch (i) {
             case 1:
                 if (i == 1) break;
+            case 5:
             default:
                 i = 2;
         }

Original file line number	Diff line number	Diff line change
`@@ -471,14 +471,13 @@ statement [block]`
`471`	`471`
`472`	`472`
`473`	`473`	`\| {`
`474`		`- while_block, switch_block = block.newSwitch()`
	`474`	`+ while_block = block.newSwitch()`
`475`	`475`	`}`
`476`	`476`	`#("switch" switch_expr = expression[block, False]`
`477`	`477`	`(c:case_group[while_block, switch_expr])*`
`478`	`478`	`)`
`479`	`479`	`{`
`480`	`480`	`while_block.newStatement("break")`
`481`		`- block.fixSwitch(while_block, switch_block)`
`482`	`481`	`}`
`483`	`482`
`484`	`483`	`\| {`
`@@ -505,17 +504,24 @@ case_group [block, switch_expr]`
`505`	`504`	`(#("case"`
`506`	`505`	`newright = expression[other, False]`
`507`	`506`	`{`
`508`		`- if not right:`
`509`		`- right = ("%s", newright)`
`510`		`- else:`
`511`		`- right = ("%s, %s", (right, newright))`
	`507`	`+ if not right:`
	`508`	`+ right = ("%s", newright)`
	`509`	`+ else:`
	`510`	`+ right = ("%s, %s", (right, newright))`
	`511`	`+ }`
	`512`	`+ )`
	`513`	`+ \| "default"`
	`514`	`+ {`
	`515`	`+ right = block.emptyAssign`
	`516`	`+ block.removeStatement(other)`
	`517`	`+ other = block`
`512`	`518`	`}`
`513`		`- ) \| "default" { right = block.emptyAssign } )+`
`514`		`- statement_list[other]`
	`519`	`+ )+`
	`520`	`+ statement_list[other]`
`515`	`521`	`)`
`516`	`522`	`{`
`517`	`523`	`if right is block.emptyAssign:`
`518`		`- other.setExpression("True")`
	`524`	`+ pass`
`519`	`525`	`elif right[0] == "%s":`
`520`	`526`	`other.setExpression(("%s == %s", (switch_expr, right)))`
`521`	`527`	`else:`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ public int switch4(int i) {`
`57`	`57`	`switch (i) {`
`58`	`58`	`case 1:`
`59`	`59`	`if (i == 1) break;`
	`60`	`+ case 5:`
`60`	`61`	`default:`
`61`	`62`	`i = 2;`
`62`	`63`	`}`