split Switch and AltSwitch nodes

2018-02-18 20:39:41 +02:00
parent d0296f78e3
commit e75a625528
9 changed files with 897 additions and 824 deletions
--- a/php7/php7.go
+++ b/php7/php7.go
--- a/php7/php7.y
+++ b/php7/php7.y
@@ -552,7 +552,11 @@ statement:
        }
    |   T_SWITCH '(' expr ')' switch_case_list
        {
-            $$ = stmt.NewSwitch($3, $5.nodes)
+            if ($5.endToken.Value == ";") {
+                $$ = stmt.NewAltSwitch($3, $5.nodes)
+            } else {
+                $$ = stmt.NewSwitch($3, $5.nodes)
+            }
            positions.AddPosition($$, positionBuilder.NewTokensPosition($1, $5.endToken))
            comments.AddComments($$, $1.Comments())
        }
--- a/php7/php7_test.go
+++ b/php7/php7_test.go
@@ -1423,7 +1423,7 @@ CAD;
 					},
 				},
 			},
-			&stmt.Switch{
+			&stmt.AltSwitch{
 				Cond: &scalar.Lnumber{Value: "1"},
 				Cases: []node.Node{
 					&stmt.Case{
@@ -1439,7 +1439,7 @@ CAD;
 					},
 				},
 			},
-			&stmt.Switch{
+			&stmt.AltSwitch{
 				Cond: &scalar.Lnumber{Value: "1"},
 				Cases: []node.Node{
 					&stmt.Case{