From f6cb2bff4d16ec439f8bd9dce56fb058e2bd5cbb Mon Sep 17 00:00:00 2001
From: Vadym Slizov <vadym.slizov@miacar.ch>
Date: Sun, 6 Sep 2020 12:45:08 +0300
Subject: [PATCH] [refactoring] update ast structure of "Switch", "Case",
 "Default" nodes; remove "CaseList" node

---
 internal/php5/parser_test.go            | 336 +++++++++++-------------
 internal/php5/php5.go                   | Bin 293827 -> 293045 bytes
 internal/php5/php5.y                    | 143 +++++-----
 internal/php5/php5_test.go              | 336 +++++++++++-------------
 internal/php7/parser_test.go            | 336 +++++++++++-------------
 internal/php7/php7.go                   | Bin 246441 -> 243941 bytes
 internal/php7/php7.y                    | 155 +++++------
 internal/php7/php7_test.go              | 336 +++++++++++-------------
 pkg/ast/ast.go                          |   2 -
 pkg/ast/node.go                         |  45 ++--
 pkg/ast/traverser/dfs.go                |  39 +--
 pkg/ast/visitor/dump.go                 |  17 +-
 pkg/ast/visitor/filter_parser_nodes.go  |  20 --
 pkg/ast/visitor/filter_tokens.go        |  22 ++
 pkg/ast/visitor/null.go                 |   8 -
 pkg/printer/pretty_printer.go           |  39 +--
 pkg/printer/pretty_printer_test.go      |  47 ++--
 pkg/printer/printer.go                  | 128 +++------
 pkg/printer/printer_parsed_php5_test.go |   6 +-
 pkg/printer/printer_parsed_php7_test.go |   6 +-
 pkg/printer/printer_test.go             |  63 +++--
 21 files changed, 883 insertions(+), 1201 deletions(-)

diff --git a/internal/php5/parser_test.go b/internal/php5/parser_test.go
index 1af3152..11e39da 100644
--- a/internal/php5/parser_test.go
+++ b/internal/php5/parser_test.go
@@ -9431,78 +9431,68 @@ func TestStmtSwitch(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 2,
-							EndLine:   5,
-							StartPos:  17,
-							EndPos:    58,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  22,
+								EndPos:    36,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  22,
-									EndPos:    36,
+									StartPos:  27,
+									EndPos:    28,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("1"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  27,
-										EndPos:    28,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 3,
-											EndLine:   3,
-											StartPos:  30,
-											EndPos:    36,
-										},
+										StartPos:  30,
+										EndPos:    36,
 									},
 								},
 							},
 						},
-						&ast.StmtCase{
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  40,
+								EndPos:    54,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
-									StartPos:  40,
-									EndPos:    54,
+									StartPos:  45,
+									EndPos:    46,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("2"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  45,
-										EndPos:    46,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 4,
-											EndLine:   4,
-											StartPos:  48,
-											EndPos:    54,
-										},
+										StartPos:  48,
+										EndPos:    54,
 									},
 								},
 							},
@@ -9560,78 +9550,68 @@ func TestStmtSwitch_Semicolon(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 2,
-							EndLine:   5,
-							StartPos:  17,
-							EndPos:    59,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  23,
+								EndPos:    37,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  23,
-									EndPos:    37,
+									StartPos:  28,
+									EndPos:    29,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("1"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  28,
-										EndPos:    29,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 3,
-											EndLine:   3,
-											StartPos:  31,
-											EndPos:    37,
-										},
+										StartPos:  31,
+										EndPos:    37,
 									},
 								},
 							},
 						},
-						&ast.StmtCase{
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  41,
+								EndPos:    55,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
-									StartPos:  41,
-									EndPos:    55,
+									StartPos:  46,
+									EndPos:    47,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("2"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  46,
-										EndPos:    47,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 4,
-											EndLine:   4,
-											StartPos:  49,
-											EndPos:    55,
-										},
+										StartPos:  49,
+										EndPos:    55,
 									},
 								},
 							},
@@ -9670,7 +9650,7 @@ func TestStmtSwitch_Alt(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtAltSwitch{
+			&ast.StmtSwitch{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 2,
@@ -9679,6 +9659,7 @@ func TestStmtSwitch_Alt(t *testing.T) {
 						EndPos:    65,
 					},
 				},
+				Alt: true,
 				Cond: &ast.ScalarLnumber{
 					Node: ast.Node{
 						Position: &position.Position{
@@ -9690,71 +9671,61 @@ func TestStmtSwitch_Alt(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 3,
-							EndLine:   -1,
-							StartPos:  22,
-							EndPos:    -1,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   -1,
+								StartPos:  22,
+								EndPos:    -1,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 3,
-									EndLine:   -1,
-									StartPos:  22,
-									EndPos:    -1,
+									EndLine:   3,
+									StartPos:  27,
+									EndPos:    28,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 3,
-										EndLine:   3,
-										StartPos:  27,
-										EndPos:    28,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("1"),
 						},
-						&ast.StmtDefault{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 4,
-									EndLine:   -1,
-									StartPos:  33,
-									EndPos:    -1,
-								},
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtDefault{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   -1,
+								StartPos:  33,
+								EndPos:    -1,
 							},
-							Stmts: []ast.Vertex{},
 						},
-						&ast.StmtCase{
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   -1,
+								StartPos:  45,
+								EndPos:    -1,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 5,
-									EndLine:   -1,
-									StartPos:  45,
-									EndPos:    -1,
+									EndLine:   5,
+									StartPos:  50,
+									EndPos:    51,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 5,
-										EndLine:   5,
-										StartPos:  50,
-										EndPos:    51,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("2"),
 						},
+						Stmts: []ast.Vertex{},
 					},
 				},
 			},
@@ -9788,7 +9759,7 @@ func TestStmtSwitch_AltSemicolon(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtAltSwitch{
+			&ast.StmtSwitch{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 2,
@@ -9797,6 +9768,7 @@ func TestStmtSwitch_AltSemicolon(t *testing.T) {
 						EndPos:    54,
 					},
 				},
+				Alt: true,
 				Cond: &ast.ScalarLnumber{
 					Node: ast.Node{
 						Position: &position.Position{
@@ -9808,60 +9780,50 @@ func TestStmtSwitch_AltSemicolon(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 3,
-							EndLine:   -1,
-							StartPos:  23,
-							EndPos:    -1,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   -1,
+								StartPos:  23,
+								EndPos:    -1,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 3,
-									EndLine:   -1,
-									StartPos:  23,
-									EndPos:    -1,
+									EndLine:   3,
+									StartPos:  28,
+									EndPos:    29,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 3,
-										EndLine:   3,
-										StartPos:  28,
-										EndPos:    29,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("1"),
 						},
-						&ast.StmtCase{
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   -1,
+								StartPos:  34,
+								EndPos:    -1,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 4,
-									EndLine:   -1,
-									StartPos:  34,
-									EndPos:    -1,
+									EndLine:   4,
+									StartPos:  39,
+									EndPos:    40,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 4,
-										EndLine:   4,
-										StartPos:  39,
-										EndPos:    40,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("2"),
 						},
+						Stmts: []ast.Vertex{},
 					},
 				},
 			},
diff --git a/internal/php5/php5.go b/internal/php5/php5.go
index 90079efcd239c7b6e05abbbb1cce5f3bc36269c1..86cad0f133cf710774b105fa374b81a072dc3323 100644
GIT binary patch
delta 13799
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
beWAjdC*k=0W_uEl9uC)|&yuj_0W0#qQh&uL

delta 12373
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
DdXs;6

diff --git a/internal/php5/php5.y b/internal/php5/php5.y
index 4bae606..cab691e 100644
--- a/internal/php5/php5.y
+++ b/internal/php5/php5.y
@@ -940,22 +940,13 @@ unticked_statement:
             }
     |   T_SWITCH parenthesis_expr switch_case_list
             {
-                switch n := $3.(type) {
-                case *ast.StmtSwitch:
-                    n.Cond = $2
-                case *ast.StmtAltSwitch:
-                    n.Cond = $2
-                default:
-                    panic("unexpected node type")
-                }
+                $3.(*ast.StmtSwitch).SwitchTkn = $1
+                $3.(*ast.StmtSwitch).OpenParenthesisTkn = $2.(*ast.ParserBrackets).OpenBracketTkn
+                $3.(*ast.StmtSwitch).Cond = $2.(*ast.ParserBrackets).Child
+                $3.(*ast.StmtSwitch).CloseParenthesisTkn = $2.(*ast.ParserBrackets).CloseBracketTkn
+                $3.(*ast.StmtSwitch).Node.Position = position.NewTokenNodePosition($1, $3)
 
                 $$ = $3
-
-                // save position
-                $$.GetNode().Position = position.NewTokenNodePosition($1, $3)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
             }
     |   T_BREAK ';'
             {
@@ -1790,62 +1781,53 @@ declare_list:
 switch_case_list:
         '{' case_list '}'
             {
-                caseList := &ast.StmtCaseList{ast.Node{}, $2}
-                $$ = &ast.StmtSwitch{ast.Node{}, nil, caseList}
-
-                // save position
-                caseList.GetNode().Position = position.NewTokensPosition($1, $3)
-                $$.GetNode().Position = position.NewTokensPosition($1, $3)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.SkippedTokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.SkippedTokens)
+                $$ = &ast.StmtSwitch{
+                    Node: ast.Node{
+                        Position: position.NewTokensPosition($1, $3),
+                    },
+                    OpenCurlyBracketTkn:  $1,
+                    CaseList:             $2,
+                    CloseCurlyBracketTkn: $3,
+                }
             }
     |   '{' ';' case_list '}'
             {
-                caseList := &ast.StmtCaseList{ast.Node{}, $3}
-                $$ = &ast.StmtSwitch{ast.Node{}, nil, caseList}
-
-                // save position
-                caseList.GetNode().Position = position.NewTokensPosition($1, $4)
-                $$.GetNode().Position = position.NewTokensPosition($1, $4)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.SkippedTokens)
-                yylex.(*Parser).setFreeFloatingTokens(caseList, token.CaseListStart, $2.SkippedTokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.SkippedTokens)
+                $$ = &ast.StmtSwitch{
+                    Node: ast.Node{
+                        Position: position.NewTokensPosition($1, $4),
+                    },
+                    OpenCurlyBracketTkn:  $1,
+                    CaseSeparatorTkn:     $2,
+                    CaseList:             $3,
+                    CloseCurlyBracketTkn: $4,
+                }
             }
     |   ':' case_list T_ENDSWITCH ';'
             {
-                caseList := &ast.StmtCaseList{ast.Node{}, $2}
-                $$ = &ast.StmtAltSwitch{ast.Node{}, nil, caseList}
-
-                // save position
-                caseList.GetNode().Position = position.NewNodeListPosition($2)
-                $$.GetNode().Position = position.NewTokensPosition($1, $4)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.SkippedTokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.SkippedTokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.SkippedTokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $4.SkippedTokens)
+                $$ = &ast.StmtSwitch{
+                    Node: ast.Node{
+                        Position: position.NewTokensPosition($1, $4),
+                    },
+                    Alt:          true,
+                    ColonTkn:     $1,
+                    CaseList:     $2,
+                    EndSwitchTkn: $3,
+                    SemiColonTkn: $4,
+                }
             }
     |   ':' ';' case_list T_ENDSWITCH ';'
             {
-
-                caseList := &ast.StmtCaseList{ast.Node{}, $3}
-                $$ = &ast.StmtAltSwitch{ast.Node{}, nil, caseList}
-
-                // save position
-                caseList.GetNode().Position = position.NewNodeListPosition($3)
-                $$.GetNode().Position = position.NewTokensPosition($1, $5)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.SkippedTokens)
-                yylex.(*Parser).setFreeFloatingTokens(caseList, token.CaseListStart, $2.SkippedTokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.SkippedTokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $5.SkippedTokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $5.SkippedTokens)
+                $$ = &ast.StmtSwitch{
+                    Node: ast.Node{
+                        Position: position.NewTokensPosition($1, $5),
+                    },
+                    Alt:              true,
+                    ColonTkn:         $1,
+                    CaseSeparatorTkn: $2,
+                    CaseList:         $3,
+                    EndSwitchTkn:     $4,
+                    SemiColonTkn:     $5,
+                }
             }
 ;
 
@@ -1853,33 +1835,30 @@ switch_case_list:
 case_list:
         /* empty */
             {
-                $$ = []ast.Vertex{}
+                $$ = nil
             }
     |   case_list T_CASE expr case_separator inner_statement_list
             {
-                _case := &ast.StmtCase{ast.Node{}, $3, $5}
-                $$ = append($1, _case)
-
-                // save position
-                _case.GetNode().Position = position.NewTokenNodeListPosition($2, $5)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating(_case, token.Start, $2.SkippedTokens)
-                yylex.(*Parser).setFreeFloating(_case, token.Expr, $4.SkippedTokens)
-                yylex.(*Parser).setToken(_case, token.CaseSeparator, $4.SkippedTokens)
+                $$ = append($1, &ast.StmtCase{
+                    Node: ast.Node{
+                        Position: position.NewTokenNodeListPosition($2, $5),
+                    },
+                    CaseTkn:          $2,
+                    Cond:             $3,
+                    CaseSeparatorTkn: $4,
+                    Stmts:            $5,
+                })
             }
     |   case_list T_DEFAULT case_separator inner_statement_list
             {
-                _default := &ast.StmtDefault{ast.Node{}, $4}
-                $$ = append($1, _default)
-
-                // save position
-                _default.GetNode().Position = position.NewTokenNodeListPosition($2, $4)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating(_default, token.Start, $2.SkippedTokens)
-                yylex.(*Parser).setFreeFloating(_default, token.Default, $3.SkippedTokens)
-                yylex.(*Parser).setToken(_default, token.CaseSeparator, $3.SkippedTokens)
+                $$ = append($1, &ast.StmtDefault{
+                    Node: ast.Node{
+                        Position: position.NewTokenNodeListPosition($2, $4),
+                    },
+                    DefaultTkn:       $2,
+                    CaseSeparatorTkn: $3,
+                    Stmts:            $4,
+                })
             }
 ;
 
diff --git a/internal/php5/php5_test.go b/internal/php5/php5_test.go
index 1fdd0e7..8537e6c 100644
--- a/internal/php5/php5_test.go
+++ b/internal/php5/php5_test.go
@@ -6894,7 +6894,7 @@ func TestPhp5(t *testing.T) {
 					},
 				},
 			},
-			&ast.StmtAltSwitch{
+			&ast.StmtSwitch{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 118,
@@ -6903,6 +6903,7 @@ func TestPhp5(t *testing.T) {
 						EndPos:    2606,
 					},
 				},
+				Alt: true,
 				Cond: &ast.ScalarLnumber{
 					Node: ast.Node{
 						Position: &position.Position{
@@ -6914,75 +6915,65 @@ func TestPhp5(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 119,
-							EndLine:   -1,
-							StartPos:  2563,
-							EndPos:    -1,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 119,
+								EndLine:   -1,
+								StartPos:  2563,
+								EndPos:    -1,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 119,
-									EndLine:   -1,
-									StartPos:  2563,
-									EndPos:    -1,
+									EndLine:   119,
+									StartPos:  2568,
+									EndPos:    2569,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 119,
-										EndLine:   119,
-										StartPos:  2568,
-										EndPos:    2569,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("1"),
 						},
-						&ast.StmtDefault{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 120,
-									EndLine:   -1,
-									StartPos:  2575,
-									EndPos:    -1,
-								},
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtDefault{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 120,
+								EndLine:   -1,
+								StartPos:  2575,
+								EndPos:    -1,
 							},
-							Stmts: []ast.Vertex{},
 						},
-						&ast.StmtCase{
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 121,
+								EndLine:   -1,
+								StartPos:  2588,
+								EndPos:    -1,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 121,
-									EndLine:   -1,
-									StartPos:  2588,
-									EndPos:    -1,
+									EndLine:   121,
+									StartPos:  2593,
+									EndPos:    2594,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 121,
-										EndLine:   121,
-										StartPos:  2593,
-										EndPos:    2594,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("2"),
 						},
+						Stmts: []ast.Vertex{},
 					},
 				},
 			},
-			&ast.StmtAltSwitch{
+			&ast.StmtSwitch{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 124,
@@ -6991,6 +6982,7 @@ func TestPhp5(t *testing.T) {
 						EndPos:    2656,
 					},
 				},
+				Alt: true,
 				Cond: &ast.ScalarLnumber{
 					Node: ast.Node{
 						Position: &position.Position{
@@ -7002,60 +6994,50 @@ func TestPhp5(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 125,
-							EndLine:   -1,
-							StartPos:  2626,
-							EndPos:    -1,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 125,
+								EndLine:   -1,
+								StartPos:  2626,
+								EndPos:    -1,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 125,
-									EndLine:   -1,
-									StartPos:  2626,
-									EndPos:    -1,
+									EndLine:   125,
+									StartPos:  2631,
+									EndPos:    2632,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 125,
-										EndLine:   125,
-										StartPos:  2631,
-										EndPos:    2632,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("1"),
 						},
-						&ast.StmtCase{
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 126,
+								EndLine:   -1,
+								StartPos:  2638,
+								EndPos:    -1,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 126,
-									EndLine:   -1,
-									StartPos:  2638,
-									EndPos:    -1,
+									EndLine:   126,
+									StartPos:  2643,
+									EndPos:    2644,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 126,
-										EndLine:   126,
-										StartPos:  2643,
-										EndPos:    2644,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("2"),
 						},
+						Stmts: []ast.Vertex{},
 					},
 				},
 			},
@@ -7079,78 +7061,68 @@ func TestPhp5(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 129,
-							EndLine:   132,
-							StartPos:  2669,
-							EndPos:    2710,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 130,
+								EndLine:   130,
+								StartPos:  2675,
+								EndPos:    2689,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 130,
 									EndLine:   130,
-									StartPos:  2675,
-									EndPos:    2689,
+									StartPos:  2680,
+									EndPos:    2681,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("1"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 130,
 										EndLine:   130,
-										StartPos:  2680,
-										EndPos:    2681,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 130,
-											EndLine:   130,
-											StartPos:  2683,
-											EndPos:    2689,
-										},
+										StartPos:  2683,
+										EndPos:    2689,
 									},
 								},
 							},
 						},
-						&ast.StmtCase{
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 131,
+								EndLine:   131,
+								StartPos:  2694,
+								EndPos:    2708,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 131,
 									EndLine:   131,
-									StartPos:  2694,
-									EndPos:    2708,
+									StartPos:  2699,
+									EndPos:    2700,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("2"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 131,
 										EndLine:   131,
-										StartPos:  2699,
-										EndPos:    2700,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 131,
-											EndLine:   131,
-											StartPos:  2702,
-											EndPos:    2708,
-										},
+										StartPos:  2702,
+										EndPos:    2708,
 									},
 								},
 							},
@@ -7178,78 +7150,68 @@ func TestPhp5(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 134,
-							EndLine:   137,
-							StartPos:  2723,
-							EndPos:    2765,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 135,
+								EndLine:   135,
+								StartPos:  2730,
+								EndPos:    2744,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 135,
 									EndLine:   135,
-									StartPos:  2730,
-									EndPos:    2744,
+									StartPos:  2735,
+									EndPos:    2736,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("1"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 135,
 										EndLine:   135,
-										StartPos:  2735,
-										EndPos:    2736,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 135,
-											EndLine:   135,
-											StartPos:  2738,
-											EndPos:    2744,
-										},
+										StartPos:  2738,
+										EndPos:    2744,
 									},
 								},
 							},
 						},
-						&ast.StmtCase{
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 136,
+								EndLine:   136,
+								StartPos:  2749,
+								EndPos:    2763,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 136,
 									EndLine:   136,
-									StartPos:  2749,
-									EndPos:    2763,
+									StartPos:  2754,
+									EndPos:    2755,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("2"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 136,
 										EndLine:   136,
-										StartPos:  2754,
-										EndPos:    2755,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 136,
-											EndLine:   136,
-											StartPos:  2757,
-											EndPos:    2763,
-										},
+										StartPos:  2757,
+										EndPos:    2763,
 									},
 								},
 							},
diff --git a/internal/php7/parser_test.go b/internal/php7/parser_test.go
index cfcf491..5efe233 100644
--- a/internal/php7/parser_test.go
+++ b/internal/php7/parser_test.go
@@ -10226,78 +10226,68 @@ func TestStmtSwitch(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 2,
-							EndLine:   5,
-							StartPos:  17,
-							EndPos:    58,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  22,
+								EndPos:    36,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  22,
-									EndPos:    36,
+									StartPos:  27,
+									EndPos:    28,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("1"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  27,
-										EndPos:    28,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 3,
-											EndLine:   3,
-											StartPos:  30,
-											EndPos:    36,
-										},
+										StartPos:  30,
+										EndPos:    36,
 									},
 								},
 							},
 						},
-						&ast.StmtCase{
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  40,
+								EndPos:    54,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
-									StartPos:  40,
-									EndPos:    54,
+									StartPos:  45,
+									EndPos:    46,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("2"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  45,
-										EndPos:    46,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 4,
-											EndLine:   4,
-											StartPos:  48,
-											EndPos:    54,
-										},
+										StartPos:  48,
+										EndPos:    54,
 									},
 								},
 							},
@@ -10355,78 +10345,68 @@ func TestStmtSwitch_Semicolon(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 2,
-							EndLine:   5,
-							StartPos:  17,
-							EndPos:    59,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  23,
+								EndPos:    37,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  23,
-									EndPos:    37,
+									StartPos:  28,
+									EndPos:    29,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("1"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  28,
-										EndPos:    29,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 3,
-											EndLine:   3,
-											StartPos:  31,
-											EndPos:    37,
-										},
+										StartPos:  31,
+										EndPos:    37,
 									},
 								},
 							},
 						},
-						&ast.StmtCase{
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  41,
+								EndPos:    55,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
-									StartPos:  41,
-									EndPos:    55,
+									StartPos:  46,
+									EndPos:    47,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("2"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  46,
-										EndPos:    47,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 4,
-											EndLine:   4,
-											StartPos:  49,
-											EndPos:    55,
-										},
+										StartPos:  49,
+										EndPos:    55,
 									},
 								},
 							},
@@ -10465,7 +10445,7 @@ func TestStmtSwitch_Alt(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtAltSwitch{
+			&ast.StmtSwitch{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 2,
@@ -10474,6 +10454,7 @@ func TestStmtSwitch_Alt(t *testing.T) {
 						EndPos:    65,
 					},
 				},
+				Alt: true,
 				Cond: &ast.ScalarLnumber{
 					Node: ast.Node{
 						Position: &position.Position{
@@ -10485,71 +10466,61 @@ func TestStmtSwitch_Alt(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 3,
-							EndLine:   -1,
-							StartPos:  22,
-							EndPos:    -1,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   -1,
+								StartPos:  22,
+								EndPos:    -1,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 3,
-									EndLine:   -1,
-									StartPos:  22,
-									EndPos:    -1,
+									EndLine:   3,
+									StartPos:  27,
+									EndPos:    28,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 3,
-										EndLine:   3,
-										StartPos:  27,
-										EndPos:    28,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("1"),
 						},
-						&ast.StmtDefault{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 4,
-									EndLine:   -1,
-									StartPos:  33,
-									EndPos:    -1,
-								},
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtDefault{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   -1,
+								StartPos:  33,
+								EndPos:    -1,
 							},
-							Stmts: []ast.Vertex{},
 						},
-						&ast.StmtCase{
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   -1,
+								StartPos:  45,
+								EndPos:    -1,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 5,
-									EndLine:   -1,
-									StartPos:  45,
-									EndPos:    -1,
+									EndLine:   5,
+									StartPos:  50,
+									EndPos:    51,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 5,
-										EndLine:   5,
-										StartPos:  50,
-										EndPos:    51,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("2"),
 						},
+						Stmts: []ast.Vertex{},
 					},
 				},
 			},
@@ -10583,7 +10554,7 @@ func TestStmtSwitch_AltSemicolon(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtAltSwitch{
+			&ast.StmtSwitch{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 2,
@@ -10592,6 +10563,7 @@ func TestStmtSwitch_AltSemicolon(t *testing.T) {
 						EndPos:    54,
 					},
 				},
+				Alt: true,
 				Cond: &ast.ScalarLnumber{
 					Node: ast.Node{
 						Position: &position.Position{
@@ -10603,60 +10575,50 @@ func TestStmtSwitch_AltSemicolon(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 3,
-							EndLine:   -1,
-							StartPos:  23,
-							EndPos:    -1,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   -1,
+								StartPos:  23,
+								EndPos:    -1,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 3,
-									EndLine:   -1,
-									StartPos:  23,
-									EndPos:    -1,
+									EndLine:   3,
+									StartPos:  28,
+									EndPos:    29,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 3,
-										EndLine:   3,
-										StartPos:  28,
-										EndPos:    29,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("1"),
 						},
-						&ast.StmtCase{
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   -1,
+								StartPos:  34,
+								EndPos:    -1,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 4,
-									EndLine:   -1,
-									StartPos:  34,
-									EndPos:    -1,
+									EndLine:   4,
+									StartPos:  39,
+									EndPos:    40,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 4,
-										EndLine:   4,
-										StartPos:  39,
-										EndPos:    40,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("2"),
 						},
+						Stmts: []ast.Vertex{},
 					},
 				},
 			},
diff --git a/internal/php7/php7.go b/internal/php7/php7.go
index 80adf9ad96ba4e6037ec9d7b4be8d9a6a062cd0b..90b19728dd6dd71eb116e10a471ddc385b771375 100644
GIT binary patch
delta 6682
zcmb7Id3@DHlK)h7PLAXSOhA&5#~}(zd`I%~5;+n>fE5T=08xYlK?LNI2q+-Qc%Te}
zi9kw3G$<NTAi)7z1{scF5byv2T@eO?tKfke&~*_9*l+jm<(U2K{;_|(?t1;}uCDsl
zx2k&mQ?XxPjH!uj$3EW^aqV<mJGyDOBs@TguHkbh7vKM2*Hq`XV5;niptiDO3N@3B
z4^XQJM=oVkDBTKL)PImWWBLU7sRt!U?E{olzm6tR|N8Om*Qvc6Sxl)?xr|!M(*MNT
zos;MW88(Y@g%Y@pxbi4kZ=FRqF!`mlh7-j#l_T|q*+!BkrQ;y+JV;^MJ%{3%(=+5^
zfZFR3^QbLL=}}IS!UB$v+RhxNmp?{vOqsHIo=S2)+P{D%F=uAV*-@0D2QQ*gL>_0d
zzl4a%D>MiHoc{x@RqRibv(Hkpu6mk+iqiucvu_nXz=mz4GM=O5zQxpB|N19NWA=o0
z9Z*K)#GZ70x}5G*<de;Q9PjD@g>qKn7VP)wQ9>;gr)3BR0jXWDT1zGFulK!3|0E9h
zB<>vDE*D>-JPripY!u%i_g2C%3)awpFy##f&4P}y`)=Gf>Q%~9-b|m-^#=XV0N+XS
z#%t8qxmbd@JF6IpTSt8*y9&!IKc;X!ZyhBuRNM0sb#it&{s#4BUxpMBAChxbSnchq
zd@}Y;>c?qm;;mHa@?0)=)#2-DWjJS~%bsv}uWT^I%AQTsNBJ@`jmRfi)zHTm3^Z9#
zRc#hzdYlFB8nYlXqj6KYUd*kfW(zbsT|?s(d;R9m{!&vzse0=c`UY0>Ho5aZH16k@
zq5vnzkaDOt<6WciY?Y*sjOI9!FSld9Mw3fQ4pWPeaKsMWF_7+TZR{=812}x!d$gUE
zKNvdF`k~z}It!0_W%GV&Ev~&Z77lHgG}C|DOQpo#pt$zYBl7zmoYQ_EwbpO$GrsrR
zrEa-*KNU#KK62?@`>B!;FS8EgPyi=U$`3%n%>DSVrjlK9sEtaH8F4DQ%C%jQBpkxO
zm6hz)3l32VQ-<VJaf;sYAsrx2%QX887k55|$*GTN1w7qhB~V*-n7$&Jc^E#GPv~p-
zV%KN1Q)eBcMU2DE8d>n~2)7?TrB66LsCR!xegHe@Ky=6#2=R`2*v&P8hD!Fo!L|9P
zIX1Fr_QZjcXBSJ!1nkm#AjQa;s|ep$0@OloJq3)WXF8i7IYp6nhl<{mBd(iNn4B0u
ziFOwkb{Rf#X3@h%#WNl*m^wX6u3x02=-kleS&~ynH%fjgH<S1JLeUwie51sju{gFo
zfVd71x7;Kh^2lqCIQ0Wmp7R?tsxzbG*_0I3u;G0kYS%0}Z~BA~V|{X!lI8jl#CX=1
z)F%|`(p2YLr8ol)vb)asjiThS->|FQy5|*45By4P!i>g})1TT%$!!$Vyx{_Fx7?A+
z$t@cWw3mD@4fo$T87NvGM8qEa+5#7Gmmo(*ag6jn2Tb~H+@&_}QZ&0bb$Ic#;@l!B
z`h|K(;rm#(JDgj?@LqT>%A98RjT-^zyDm|4IrSU0lKeVqqZ$;0?OMunbrdd(Ccrj3
zGbvhr%%>JH3%fRpj$YU-`hF~R`y}TnZYPC)>Kf(^09A<nR9AxzeI`Co^vFZS*4Q%S
zD)o!3m*n)Nj!nz}FtloNP<3BwK?^1Bdm1LO=K%1-;nZ2=dxy(Pt6{jpa7vQ63zP@)
zTiX#_YFJ<9UZ9US5Oi4IaJ-QOjGr|;GNXa1r~X815qud^a+#`D)~Qz3LQ=heqx6>-
z=|hqMKj9FBS(2Rn8Hc3FqRVuf#9pPl8kc{#2g?urLLL*Bh%P6s2sXE7@2VI5O4mqb
zWCS(Nxdb-wn*(o=nrm=o%@m54#Ov_RkJpeLXWjw*fB&7%%j1`+yT(c9!B_#qSn(@c
zauKI_?AZ7`cI67rGu&TK;mOjDAW8RXIKTz^_i8Zy3#6Ne@v$%!%uF})^AS!$3=#Sd
zu^gi4i7t%jekUU(%NZB<k)d^*q<hEl1cHST_lbr9TakRynseEUXwAa^j;K#O=Sqh-
z1RD%C4v8datPwh;O9J<S$P$hvu4t*8qqO9<;e7A}Xed!{Y{R=ryxC6j4j0UC6xXdt
zj<pMDp42?2a-{MVb)(cRr(0!N3)Mmr!*IYqVpLGd=BgO&O5{keW+TBT%iT$w*M#6Z
z$`LoOl&Q(wr@jclF;SA5!Yy@eGIujhw6%c|Ylt5tc`1nx%ft@2u?O)L;B5J>1NUK1
zuz`k?WPC?l&=a)S|3Hd6nOUawo6WAta-|bo<MHd9&b*in=rGtRgIaR5F1wj~n<}L-
z3ng}A1aqeGY^s!FBIPBa(nHovfMVCXajKzWi#HTD;T4adEEv|E=UYJ6R|--3=Tx3W
zNc0{jNp513A8TOkLmsXOXRoagLMpBeKt(Uggi!u}hQR#h1YH^AQi6u|xVq;lLgIUH
zdtH>p&y&T77@>x6C&`mR<e`*vNDnA0lBIPocp%W^a_b;46+(Rui<8mWe3y*r&Bxhi
zQ;0=KoQ61&*k^NsTWSWNd|Q*le<As<7s&lse@@k?BuZh;O!=Tc2h6M|%TxW~9KT;f
zw2u)Vx_khiFwx+cprJ^zNn5gqaDx7NkTD$C^DJy7%Lj9wEE~Yh^?wZJYNT|O7$^=?
z^uRK@i{#pH_`{Sy8kuAu6tp%p;h7|7Mwq(=beEC590|5DSPM+?6N=&_8Fe?7r8nYq
zylfZ&*xL$Z`e^P8d)bgcWR1i&)>bz3T9b?%10beZ?A417-e*KMxavhc#sT4>z``#0
zuDTHM%vYRv#k}Kq%v+9yuVw}~(wuFBV}<zdhjRX=z}RjjnFg|JH1PK=aXP?&nL%Sp
z1B$PZ^qUOir)PL&*<?P0K~r|Bo&v|9NH8_C49-T8Ryd7Mll<31R#y{t8dyG0(rX4*
z`T!c@4`lF68^ZM^X0m*01Zk$$us}(YL9?K-Lxk~`8RcCgaSZG@#`CZd1f3o4oLvve
zY&kF+3I{TLI<}aHDHX`{>IrjsGQ)V#Gf}e35LiDv3I>euW+3U!m$A##NIATO!{xWf
z!5X{f^D$eCuXvn)WD}?zn*7^qF+3>EpFljL#h^XhUMiPzgr55Z$Cz>qorYV#@e~)5
zl$P?%y8B|@Kr-YBzIofTyvd}hwJ9pa`R4c%^Izm*EUQ||Z<BoS40qA<mKo`$B^cgS
z#?>SxOEFA&-bjZn!|>vAeutz}89qC-k~foFF30dyG15cJF`U234A-s1+TpAD&m;>3
z!`s%FwIfzRzpF3vYb4!QW4ODL$CIJX8kCWDz6v>5sL@d2>&)Mv5M#O_TNoAY>)6It
z>7`5YNnsVgYo<Y2TM6V~8lkh-o0BHK&bJ7Lk=p$>ZzL08U7Y!q4QAeMJ?16v;Q!;B
z%-w!|tA4(*#{B=$1}KgHw~$nA!tkCgTmxg&VCdOq7L0xecMW?NRu%si3{Pw~+eB~U
zTlB^qW_Vg-?V_D#?Vq<}!SG#1`t%M+Z`xz*GI}S5*Y=ttZrcT89Notg&26oVmTW-g
ztlkTc)o67>=DrV%d2NC;hCoB|zR9BK1WXeNNrawwknaawXFA_oQ~Y!Y=Y-<cvEP9Y
zd0Qwe&fLkddfmsy#|IBVlShwml*t<nmXybj!#tag@>`ZPfVP|TqT{SXmB~$d%xBgn
zM{zm-=a9>&<G6jRFO2=uKjRMitCQw(Ek6fKlyz38NXpJ2Zjh~t4nV8OT2mp|?)rJ;
zt!cH4mcn+|DS}BCee_GdU;*fMJp0vGK$gj<b5u$Nqd7fz&PE<WHxyZ^=Z$)P$4)lZ
zBEAL1v)>^&C;ZNSXIQ`Gd0c1r1!InL-*9LB;*aJAd%nZ)kviUrJbeMf{7YuRoFCzy
z&cE<ICP`Z0z5FXrHogMOB#5UIe2{h7DFRFczH%A3RcUBFbH*urd4<Pfiga!xcIh>4
zrMLdh9>`F`G|Jju<pQ+mj!0wKVUsc&Znt&50zUi>Q`s|Hvohrf!lSVYYN4NG^+1E7
z&B7H&7^*TEz}!Dvr#4p`!%VKOZ<S+&T&l0h)wWZfZzev!{LQ6iAhYVUI8}tq=QC_~
zNQ!PyeWjmEH74aGIS&~uliisIn+Jnd*3Pne4Rz4ZR4XsZ*9po#8PrBG%GeEX-E*CJ
zfa4DIn8Vo=*amodcZ%vp@?fIMg>}pG5d<y+jt>*n7vQwPFtl|m<`pDkQj}?!P)FDg
zr(4&D%E~yBdpkl^_evDquoj5Eqp~Haofbh~TQb<c{@zI;mt>l}9B*DG3QVM1(7IXL
zc2aSs0&&aPE-FvTI;rN`d$UR+Hg5}PnUJd!rQ{aa0B<lRjbI0t{BR4Dv$Ss!k}MOu
zT5WB3*DX=u`s1$3K6hC5Yj&GDX!M6OlXP8ob+-+=%~in9l-m_>0m8SlT8|n|a<seZ
zr1R5N0?9*um8*itjrMOx_D!0R1si3f2^D+e6ra^*z#PV+Iy<NeokGu?*6R+l>E~In
z2+AtECq(yvHM+tZCAql0v*bum+$T+F1ztpqPxZ`R>KydM%NF*LKjy0L`t@wp3*ndP
zynzkzsR+4HuA+48ow#5aN+D;l#^QNqju;s_7DZDq5BmGfi<l{)s`Kh?8;bMzzRC}c
zJ#um|k8u$3RzEeG*_ZaOqIj0a2I8I$3i5%1OPD&vI^1FeQwBj00)u^&IyT6nIm9xp
zWI#S(REsntf6E7qQMEfx9;^yw=Rnogw29${;7*dv8w!N9&BxQvrJ*WU%JNm3Odf_P
zwa7>et$MuxI}Yt>fSC_Ow;zFz{yJ3or2->_yrtmm7gRez!hc9=BiLWjN@Y0xO4&=u
zY$dO#EOG5Xr#|RKg?E)v*unZ|cUKj&ZKQgEWYuWg`}+d;tWoyjy^x(80WV*>SA9-$
zaun3JIy4)r&{6?JF#jWRYIME)3gif}@=o=UIBuNU3ZK9=_VKO0{%wr;c)g@Z%{95n
zA{{IcZ=R4^NcAez<#=Wdmm_g%dc`(%U&TZmlUjn;nd@_uOaF0#>R}kq#DifE`(3m)
zPfsKflVBPrJL##D)J_{7rI!);4^0AgWPAzUX?7Q=Zl=;hZ)v@oB*Cfp3_QJ*-4%;f
z7)&E1nbRC_|G({=H3L@i1v7N%40Q~Z%~aLFDAO02?Irfe_YcFbk57Ynn+V@8#{c$G
zwweYnWzB&EkxnW_qi<bB4m^j<Q$<dTj1n8mPCsgK2zGPW-K-q}zs`pbOXesyQeZ2I
zT>wa;)o9?M#a3V&ABXR8?G6&VP!*UgXj6rCxGcm~{HRY)FI3Brb$ojIBGn0n&jQs`
ze_W#0kephmn#p&g96k>>`{<2-FuaEs=*p+DEb2*Bfy@xpn4y6TG~_C?I9`W6t3W$x
z86I7@MD13{fEj|(blG%@+MB3#_WX32nqUg#`i6BrQlS2*Tx~=%WLuuli}GKVo4k}J
z_^V&T<8*{{e_lndtV8KMXNBr*7}Qg#8XvEl;<8%>aLMT&(`&4%KR>Kuq>7j7)wrr@
zp9Sr6odM{i|0~)aG;g)oVX^MDTK&$E=|P_@<Y~1^wQr?zWEQp5Prj_)B9)F;62!?Y
zbd^X2=E3}5vY#=)|4=|re@$Hlk=Y^%<^3GcLg5Kudq^htlpzJ^7N%6$P_XT@rBwGu
zut?o#z9^^PgpJ^kF6-4@NUDDQ@Y`w``Vd$iD(C+%*%^`QG<H&Z62*agvpNA~gF1B@
z#glezRXt2mW>T#D^sb83v$YyyyL7k4d=l&#S}R!FPA}e}+|1w+o0JdiRO68*?b}U?
n9<a--$Mbdl6H}60+6|01y59DT%Oz}YJwM{{Cqd@!RlffQ1pIs}

delta 7052
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

diff --git a/internal/php7/php7.y b/internal/php7/php7.y
index 0ecf1de..9cf8c08 100644
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -909,34 +909,13 @@ statement:
             }
     |   T_SWITCH '(' expr ')' switch_case_list
             {
-                exprBrackets := &ast.ParserBrackets{
-                    Node: ast.Node{
-                        Position: position.NewTokensPosition($2, $4),
-                    },
-                    OpenBracketTkn:  $2,
-                    Child:           $3,
-                    CloseBracketTkn: $4,
-                }
-
-                switch n := $5.(type) {
-                case *ast.StmtSwitch:
-                    n.Cond = exprBrackets
-                case *ast.StmtAltSwitch:
-                    n.Cond = exprBrackets
-                default:
-                    panic("unexpected node type")
-                }
+                $5.(*ast.StmtSwitch).SwitchTkn = $1
+                $5.(*ast.StmtSwitch).OpenParenthesisTkn = $2
+                $5.(*ast.StmtSwitch).Cond = $3
+                $5.(*ast.StmtSwitch).CloseParenthesisTkn = $4
+                $5.(*ast.StmtSwitch).Node.Position = position.NewTokenNodePosition($1, $5)
 
                 $$ = $5
-
-                // save position
-                exprBrackets.GetNode().Position = position.NewTokensPosition($2, $4)
-                $$.GetNode().Position = position.NewTokenNodePosition($1, $5)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
-                yylex.(*Parser).setFreeFloatingTokens(exprBrackets, token.Start, $2.SkippedTokens)
-                yylex.(*Parser).setFreeFloatingTokens(exprBrackets, token.End, $4.SkippedTokens)
             }
     |   T_BREAK optional_expr ';'
             {
@@ -1599,95 +1578,83 @@ declare_statement:
 switch_case_list:
         '{' case_list '}'
             {
-                caseList := &ast.StmtCaseList{ast.Node{}, $2}
-                $$ = &ast.StmtSwitch{ast.Node{}, nil, caseList}
-
-                // save position
-                caseList.GetNode().Position = position.NewTokensPosition($1, $3)
-                $$.GetNode().Position = position.NewTokensPosition($1, $3)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.SkippedTokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.SkippedTokens)
+                $$ = &ast.StmtSwitch{
+                    Node: ast.Node{
+                        Position: position.NewTokensPosition($1, $3),
+                    },
+                    OpenCurlyBracketTkn:  $1,
+                    CaseList:             $2,
+                    CloseCurlyBracketTkn: $3,
+                }
             }
     |   '{' ';' case_list '}'
             {
-                caseList := &ast.StmtCaseList{ast.Node{}, $3}
-                $$ = &ast.StmtSwitch{ast.Node{}, nil, caseList}
-
-                // save position
-                caseList.GetNode().Position = position.NewTokensPosition($1, $4)
-                $$.GetNode().Position = position.NewTokensPosition($1, $4)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.SkippedTokens)
-                yylex.(*Parser).setFreeFloatingTokens(caseList, token.CaseListStart, $2.SkippedTokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.SkippedTokens)
+                $$ = &ast.StmtSwitch{
+                    Node: ast.Node{
+                        Position: position.NewTokensPosition($1, $4),
+                    },
+                    OpenCurlyBracketTkn:  $1,
+                    CaseSeparatorTkn:     $2,
+                    CaseList:             $3,
+                    CloseCurlyBracketTkn: $4,
+                }
             }
     |   ':' case_list T_ENDSWITCH ';'
             {
-                caseList := &ast.StmtCaseList{ast.Node{}, $2}
-                $$ = &ast.StmtAltSwitch{ast.Node{}, nil, caseList}
-
-                // save position
-                caseList.GetNode().Position = position.NewNodeListPosition($2)
-                $$.GetNode().Position = position.NewTokensPosition($1, $4)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.SkippedTokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.SkippedTokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.SkippedTokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $4.SkippedTokens)
+                $$ = &ast.StmtSwitch{
+                    Node: ast.Node{
+                        Position: position.NewTokensPosition($1, $4),
+                    },
+                    Alt:          true,
+                    ColonTkn:     $1,
+                    CaseList:     $2,
+                    EndSwitchTkn: $3,
+                    SemiColonTkn: $4,
+                }
             }
     |   ':' ';' case_list T_ENDSWITCH ';'
             {
-
-                caseList := &ast.StmtCaseList{ast.Node{}, $3}
-                $$ = &ast.StmtAltSwitch{ast.Node{}, nil, caseList}
-
-                // save position
-                caseList.GetNode().Position = position.NewNodeListPosition($3)
-                $$.GetNode().Position = position.NewTokensPosition($1, $5)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.SkippedTokens)
-                yylex.(*Parser).setFreeFloatingTokens(caseList, token.CaseListStart, $2.SkippedTokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.SkippedTokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $5.SkippedTokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $5.SkippedTokens)
+                $$ = &ast.StmtSwitch{
+                    Node: ast.Node{
+                        Position: position.NewTokensPosition($1, $5),
+                    },
+                    Alt:              true,
+                    ColonTkn:         $1,
+                    CaseSeparatorTkn: $2,
+                    CaseList:         $3,
+                    EndSwitchTkn:     $4,
+                    SemiColonTkn:     $5,
+                }
             }
 ;
 
 case_list:
         /* empty */
             {
-                $$ = []ast.Vertex{}
+                $$ = nil
             }
     |   case_list T_CASE expr case_separator inner_statement_list
             {
-                _case := &ast.StmtCase{ast.Node{}, $3, $5}
-                $$ = append($1, _case)
-
-                // save position
-                _case.GetNode().Position = position.NewTokenNodeListPosition($2, $5)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating(_case, token.Start, $2.SkippedTokens)
-                yylex.(*Parser).setFreeFloating(_case, token.Expr, append($4.SkippedTokens))
-                yylex.(*Parser).setToken(_case, token.CaseSeparator, $4.SkippedTokens)
+                $$ = append($1, &ast.StmtCase{
+                    Node: ast.Node{
+                        Position: position.NewTokenNodeListPosition($2, $5),
+                    },
+                    CaseTkn:          $2,
+                    Cond:             $3,
+                    CaseSeparatorTkn: $4,
+                    Stmts:            $5,
+                })
             }
     |   case_list T_DEFAULT case_separator inner_statement_list
             {
-                _default := &ast.StmtDefault{ast.Node{}, $4}
-                $$ = append($1, _default)
-
-                // save position
-                _default.GetNode().Position = position.NewTokenNodeListPosition($2, $4)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating(_default, token.Start, $2.SkippedTokens)
-                yylex.(*Parser).setFreeFloating(_default, token.Default, $3.SkippedTokens)
-                yylex.(*Parser).setToken(_default, token.CaseSeparator, $3.SkippedTokens)
+                $$ = append($1, &ast.StmtDefault{
+                    Node: ast.Node{
+                        Position: position.NewTokenNodeListPosition($2, $4),
+                    },
+                    DefaultTkn:       $2,
+                    CaseSeparatorTkn: $3,
+                    Stmts:            $4,
+                })
             }
 ;
 
diff --git a/internal/php7/php7_test.go b/internal/php7/php7_test.go
index 24499be..06528b4 100644
--- a/internal/php7/php7_test.go
+++ b/internal/php7/php7_test.go
@@ -7338,7 +7338,7 @@ func TestPhp7(t *testing.T) {
 					},
 				},
 			},
-			&ast.StmtAltSwitch{
+			&ast.StmtSwitch{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 122,
@@ -7347,6 +7347,7 @@ func TestPhp7(t *testing.T) {
 						EndPos:    2694,
 					},
 				},
+				Alt: true,
 				Cond: &ast.ScalarLnumber{
 					Node: ast.Node{
 						Position: &position.Position{
@@ -7358,75 +7359,65 @@ func TestPhp7(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 123,
-							EndLine:   -1,
-							StartPos:  2651,
-							EndPos:    -1,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 123,
+								EndLine:   -1,
+								StartPos:  2651,
+								EndPos:    -1,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 123,
-									EndLine:   -1,
-									StartPos:  2651,
-									EndPos:    -1,
+									EndLine:   123,
+									StartPos:  2656,
+									EndPos:    2657,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 123,
-										EndLine:   123,
-										StartPos:  2656,
-										EndPos:    2657,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("1"),
 						},
-						&ast.StmtDefault{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 124,
-									EndLine:   -1,
-									StartPos:  2663,
-									EndPos:    -1,
-								},
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtDefault{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 124,
+								EndLine:   -1,
+								StartPos:  2663,
+								EndPos:    -1,
 							},
-							Stmts: []ast.Vertex{},
 						},
-						&ast.StmtCase{
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 125,
+								EndLine:   -1,
+								StartPos:  2676,
+								EndPos:    -1,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 125,
-									EndLine:   -1,
-									StartPos:  2676,
-									EndPos:    -1,
+									EndLine:   125,
+									StartPos:  2681,
+									EndPos:    2682,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 125,
-										EndLine:   125,
-										StartPos:  2681,
-										EndPos:    2682,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("2"),
 						},
+						Stmts: []ast.Vertex{},
 					},
 				},
 			},
-			&ast.StmtAltSwitch{
+			&ast.StmtSwitch{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 128,
@@ -7435,6 +7426,7 @@ func TestPhp7(t *testing.T) {
 						EndPos:    2744,
 					},
 				},
+				Alt: true,
 				Cond: &ast.ScalarLnumber{
 					Node: ast.Node{
 						Position: &position.Position{
@@ -7446,60 +7438,50 @@ func TestPhp7(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 129,
-							EndLine:   -1,
-							StartPos:  2714,
-							EndPos:    -1,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 129,
+								EndLine:   -1,
+								StartPos:  2714,
+								EndPos:    -1,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 129,
-									EndLine:   -1,
-									StartPos:  2714,
-									EndPos:    -1,
+									EndLine:   129,
+									StartPos:  2719,
+									EndPos:    2720,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 129,
-										EndLine:   129,
-										StartPos:  2719,
-										EndPos:    2720,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("1"),
 						},
-						&ast.StmtCase{
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 130,
+								EndLine:   -1,
+								StartPos:  2726,
+								EndPos:    -1,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 130,
-									EndLine:   -1,
-									StartPos:  2726,
-									EndPos:    -1,
+									EndLine:   130,
+									StartPos:  2731,
+									EndPos:    2732,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 130,
-										EndLine:   130,
-										StartPos:  2731,
-										EndPos:    2732,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{},
+							Value: []byte("2"),
 						},
+						Stmts: []ast.Vertex{},
 					},
 				},
 			},
@@ -7523,78 +7505,68 @@ func TestPhp7(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 133,
-							EndLine:   136,
-							StartPos:  2757,
-							EndPos:    2798,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 134,
+								EndLine:   134,
+								StartPos:  2763,
+								EndPos:    2777,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 134,
 									EndLine:   134,
-									StartPos:  2763,
-									EndPos:    2777,
+									StartPos:  2768,
+									EndPos:    2769,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("1"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 134,
 										EndLine:   134,
-										StartPos:  2768,
-										EndPos:    2769,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 134,
-											EndLine:   134,
-											StartPos:  2771,
-											EndPos:    2777,
-										},
+										StartPos:  2771,
+										EndPos:    2777,
 									},
 								},
 							},
 						},
-						&ast.StmtCase{
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 135,
+								EndLine:   135,
+								StartPos:  2782,
+								EndPos:    2796,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 135,
 									EndLine:   135,
-									StartPos:  2782,
-									EndPos:    2796,
+									StartPos:  2787,
+									EndPos:    2788,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("2"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 135,
 										EndLine:   135,
-										StartPos:  2787,
-										EndPos:    2788,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 135,
-											EndLine:   135,
-											StartPos:  2790,
-											EndPos:    2796,
-										},
+										StartPos:  2790,
+										EndPos:    2796,
 									},
 								},
 							},
@@ -7622,78 +7594,68 @@ func TestPhp7(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				CaseList: &ast.StmtCaseList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 138,
-							EndLine:   141,
-							StartPos:  2811,
-							EndPos:    2853,
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 139,
+								EndLine:   139,
+								StartPos:  2818,
+								EndPos:    2832,
+							},
 						},
-					},
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 139,
 									EndLine:   139,
-									StartPos:  2818,
-									EndPos:    2832,
+									StartPos:  2823,
+									EndPos:    2824,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("1"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 139,
 										EndLine:   139,
-										StartPos:  2823,
-										EndPos:    2824,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 139,
-											EndLine:   139,
-											StartPos:  2826,
-											EndPos:    2832,
-										},
+										StartPos:  2826,
+										EndPos:    2832,
 									},
 								},
 							},
 						},
-						&ast.StmtCase{
+					},
+					&ast.StmtCase{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 140,
+								EndLine:   140,
+								StartPos:  2837,
+								EndPos:    2851,
+							},
+						},
+						Cond: &ast.ScalarLnumber{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 140,
 									EndLine:   140,
-									StartPos:  2837,
-									EndPos:    2851,
+									StartPos:  2842,
+									EndPos:    2843,
 								},
 							},
-							Cond: &ast.ScalarLnumber{
+							Value: []byte("2"),
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 140,
 										EndLine:   140,
-										StartPos:  2842,
-										EndPos:    2843,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Stmts: []ast.Vertex{
-								&ast.StmtBreak{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 140,
-											EndLine:   140,
-											StartPos:  2845,
-											EndPos:    2851,
-										},
+										StartPos:  2845,
+										EndPos:    2851,
 									},
 								},
 							},
diff --git a/pkg/ast/ast.go b/pkg/ast/ast.go
index d86bf68..33713e7 100644
--- a/pkg/ast/ast.go
+++ b/pkg/ast/ast.go
@@ -28,10 +28,8 @@ type NodeVisitor interface {
 	Argument(n *Argument)
 
 	StmtAltForeach(n *StmtAltForeach)
-	StmtAltSwitch(n *StmtAltSwitch)
 	StmtBreak(n *StmtBreak)
 	StmtCase(n *StmtCase)
-	StmtCaseList(n *StmtCaseList)
 	StmtCatch(n *StmtCatch)
 	StmtClass(n *StmtClass)
 	StmtClassConstList(n *StmtClassConstList)
diff --git a/pkg/ast/node.go b/pkg/ast/node.go
index 80685cd..26850a4 100644
--- a/pkg/ast/node.go
+++ b/pkg/ast/node.go
@@ -188,17 +188,6 @@ func (n *StmtAltForeach) Accept(v NodeVisitor) {
 	v.StmtAltForeach(n)
 }
 
-// StmtAltSwitch node
-type StmtAltSwitch struct {
-	Node
-	Cond     Vertex
-	CaseList *StmtCaseList
-}
-
-func (n *StmtAltSwitch) Accept(v NodeVisitor) {
-	v.StmtAltSwitch(n)
-}
-
 // StmtBreak node
 type StmtBreak struct {
 	Node
@@ -212,24 +201,16 @@ func (n *StmtBreak) Accept(v NodeVisitor) {
 // StmtCase node
 type StmtCase struct {
 	Node
-	Cond  Vertex
-	Stmts []Vertex
+	CaseTkn          *token.Token
+	Cond             Vertex
+	CaseSeparatorTkn *token.Token
+	Stmts            []Vertex
 }
 
 func (n *StmtCase) Accept(v NodeVisitor) {
 	v.StmtCase(n)
 }
 
-// StmtCaseList node
-type StmtCaseList struct {
-	Node
-	Cases []Vertex
-}
-
-func (n *StmtCaseList) Accept(v NodeVisitor) {
-	v.StmtCaseList(n)
-}
-
 // StmtCatch node
 type StmtCatch struct {
 	Node
@@ -355,7 +336,9 @@ func (n *StmtDeclare) Accept(v NodeVisitor) {
 // StmtDefault node
 type StmtDefault struct {
 	Node
-	Stmts []Vertex
+	DefaultTkn       *token.Token
+	CaseSeparatorTkn *token.Token
+	Stmts            []Vertex
 }
 
 func (n *StmtDefault) Accept(v NodeVisitor) {
@@ -674,8 +657,18 @@ func (n *StmtStmtList) Accept(v NodeVisitor) {
 // StmtSwitch node
 type StmtSwitch struct {
 	Node
-	Cond     Vertex
-	CaseList *StmtCaseList
+	Alt                  bool
+	SwitchTkn            *token.Token
+	OpenParenthesisTkn   *token.Token
+	Cond                 Vertex
+	CloseParenthesisTkn  *token.Token
+	ColonTkn             *token.Token
+	OpenCurlyBracketTkn  *token.Token
+	CaseSeparatorTkn     *token.Token
+	CaseList             []Vertex
+	CloseCurlyBracketTkn *token.Token
+	EndSwitchTkn         *token.Token
+	SemiColonTkn         *token.Token
 }
 
 func (n *StmtSwitch) Accept(v NodeVisitor) {
diff --git a/pkg/ast/traverser/dfs.go b/pkg/ast/traverser/dfs.go
index 629d6ec..cca893c 100644
--- a/pkg/ast/traverser/dfs.go
+++ b/pkg/ast/traverser/dfs.go
@@ -146,23 +146,6 @@ func (t *DFS) Traverse(n ast.Vertex) {
 			t.Traverse(nn.Stmt)
 			t.visitor.Leave("Stmt", true)
 		}
-	case *ast.StmtAltSwitch:
-		if nn == nil {
-			return
-		}
-		if !t.visitor.EnterNode(nn) {
-			return
-		}
-		if nn.Cond != nil {
-			t.visitor.Enter("Cond", true)
-			t.Traverse(nn.Cond)
-			t.visitor.Leave("Cond", true)
-		}
-		if nn.CaseList != nil {
-			t.visitor.Enter("CaseList", true)
-			t.Traverse(nn.CaseList)
-			t.visitor.Leave("CaseList", true)
-		}
 	case *ast.StmtBreak:
 		if nn == nil {
 			return
@@ -194,20 +177,6 @@ func (t *DFS) Traverse(n ast.Vertex) {
 			}
 			t.visitor.Leave("Stmts", false)
 		}
-	case *ast.StmtCaseList:
-		if nn == nil {
-			return
-		}
-		if !t.visitor.EnterNode(nn) {
-			return
-		}
-		if nn.Cases != nil {
-			t.visitor.Enter("Cases", false)
-			for _, c := range nn.Cases {
-				t.Traverse(c)
-			}
-			t.visitor.Leave("Cases", false)
-		}
 	case *ast.StmtCatch:
 		if nn == nil {
 			return
@@ -869,9 +838,11 @@ func (t *DFS) Traverse(n ast.Vertex) {
 			t.visitor.Leave("Cond", true)
 		}
 		if nn.CaseList != nil {
-			t.visitor.Enter("CaseList", true)
-			t.Traverse(nn.CaseList)
-			t.visitor.Leave("CaseList", true)
+			t.visitor.Enter("CaseList", false)
+			for _, c := range nn.CaseList {
+				t.Traverse(c)
+			}
+			t.visitor.Leave("CaseList", false)
 		}
 	case *ast.StmtThrow:
 		if nn == nil {
diff --git a/pkg/ast/visitor/dump.go b/pkg/ast/visitor/dump.go
index bd9cc4e..5569a60 100644
--- a/pkg/ast/visitor/dump.go
+++ b/pkg/ast/visitor/dump.go
@@ -258,12 +258,6 @@ func (v *Dump) StmtAltForeach(n *ast.StmtAltForeach) {
 	v.printNode(n.GetNode())
 }
 
-func (v *Dump) StmtAltSwitch(n *ast.StmtAltSwitch) {
-	v.printIndentIfNotSingle(v.indent - 1)
-	v.print("&ast.StmtAltSwitch{\n")
-	v.printNode(n.GetNode())
-}
-
 func (v *Dump) StmtBreak(n *ast.StmtBreak) {
 	v.printIndentIfNotSingle(v.indent - 1)
 	v.print("&ast.StmtBreak{\n")
@@ -276,12 +270,6 @@ func (v *Dump) StmtCase(n *ast.StmtCase) {
 	v.printNode(n.GetNode())
 }
 
-func (v *Dump) StmtCaseList(n *ast.StmtCaseList) {
-	v.printIndentIfNotSingle(v.indent - 1)
-	v.print("&ast.StmtCaseList{\n")
-	v.printNode(n.GetNode())
-}
-
 func (v *Dump) StmtCatch(n *ast.StmtCatch) {
 	v.printIndentIfNotSingle(v.indent - 1)
 	v.print("&ast.StmtCatch{\n")
@@ -540,6 +528,11 @@ func (v *Dump) StmtSwitch(n *ast.StmtSwitch) {
 	v.printIndentIfNotSingle(v.indent - 1)
 	v.print("&ast.StmtSwitch{\n")
 	v.printNode(n.GetNode())
+
+	if n.Alt {
+		v.printIndent(v.indent)
+		v.print("Alt: true,\n")
+	}
 }
 
 func (v *Dump) StmtThrow(n *ast.StmtThrow) {
diff --git a/pkg/ast/visitor/filter_parser_nodes.go b/pkg/ast/visitor/filter_parser_nodes.go
index 9160d72..0d7ce76 100644
--- a/pkg/ast/visitor/filter_parser_nodes.go
+++ b/pkg/ast/visitor/filter_parser_nodes.go
@@ -13,26 +13,6 @@ func (v *FilterParserNodes) EnterNode(n ast.Vertex) bool {
 	return true
 }
 
-func (v *FilterParserNodes) StmtSwitch(n *ast.StmtSwitch) {
-	for {
-		if nn, ok := n.Cond.(*ast.ParserBrackets); ok {
-			n.Cond = nn.Child
-		} else {
-			break
-		}
-	}
-}
-
-func (v *FilterParserNodes) StmtAltSwitch(n *ast.StmtAltSwitch) {
-	for {
-		if nn, ok := n.Cond.(*ast.ParserBrackets); ok {
-			n.Cond = nn.Child
-		} else {
-			break
-		}
-	}
-}
-
 func (v *FilterParserNodes) ExprExit(n *ast.ExprExit) {
 	for {
 		if nn, ok := n.Expr.(*ast.ParserBrackets); ok {
diff --git a/pkg/ast/visitor/filter_tokens.go b/pkg/ast/visitor/filter_tokens.go
index 9ec8a3d..b59f05b 100644
--- a/pkg/ast/visitor/filter_tokens.go
+++ b/pkg/ast/visitor/filter_tokens.go
@@ -141,3 +141,25 @@ func (v *FilterTokens) StmtFor(n *ast.StmtFor) {
 	n.EndForTkn = nil
 	n.SemiColonTkn = nil
 }
+
+func (v *FilterTokens) StmtSwitch(n *ast.StmtSwitch) {
+	n.SwitchTkn = nil
+	n.OpenParenthesisTkn = nil
+	n.CloseParenthesisTkn = nil
+	n.OpenCurlyBracketTkn = nil
+	n.CaseSeparatorTkn = nil
+	n.ColonTkn = nil
+	n.CloseCurlyBracketTkn = nil
+	n.EndSwitchTkn = nil
+	n.SemiColonTkn = nil
+}
+
+func (v *FilterTokens) StmtCase(n *ast.StmtCase) {
+	n.CaseTkn = nil
+	n.CaseSeparatorTkn = nil
+}
+
+func (v *FilterTokens) StmtDefault(n *ast.StmtDefault) {
+	n.DefaultTkn = nil
+	n.CaseSeparatorTkn = nil
+}
diff --git a/pkg/ast/visitor/null.go b/pkg/ast/visitor/null.go
index 7fd4992..225a604 100644
--- a/pkg/ast/visitor/null.go
+++ b/pkg/ast/visitor/null.go
@@ -58,10 +58,6 @@ func (v *Null) StmtAltForeach(_ *ast.StmtAltForeach) {
 	// do nothing
 }
 
-func (v *Null) StmtAltSwitch(_ *ast.StmtAltSwitch) {
-	// do nothing
-}
-
 func (v *Null) StmtBreak(_ *ast.StmtBreak) {
 	// do nothing
 }
@@ -70,10 +66,6 @@ func (v *Null) StmtCase(_ *ast.StmtCase) {
 	// do nothing
 }
 
-func (v *Null) StmtCaseList(_ *ast.StmtCaseList) {
-	// do nothing
-}
-
 func (v *Null) StmtCatch(_ *ast.StmtCatch) {
 	// do nothing
 }
diff --git a/pkg/printer/pretty_printer.go b/pkg/printer/pretty_printer.go
index 1053b76..987655d 100644
--- a/pkg/printer/pretty_printer.go
+++ b/pkg/printer/pretty_printer.go
@@ -299,8 +299,6 @@ func (p *PrettyPrinter) printNode(n ast.Vertex) {
 
 	case *ast.StmtAltForeach:
 		p.printStmtAltForeach(n)
-	case *ast.StmtAltSwitch:
-		p.printStmtAltSwitch(n)
 	case *ast.StmtBreak:
 		p.printStmtBreak(n)
 	case *ast.StmtCase:
@@ -1412,21 +1410,6 @@ func (p *PrettyPrinter) printStmtAltIf(n ast.Vertex) {
 	io.WriteString(p.w, "endif;")
 }
 
-func (p *PrettyPrinter) printStmtAltSwitch(n ast.Vertex) {
-	nn := n.(*ast.StmtAltSwitch)
-
-	io.WriteString(p.w, "switch (")
-	p.Print(nn.Cond)
-	io.WriteString(p.w, ") :\n")
-
-	s := nn.CaseList.Cases
-	p.printNodes(s)
-
-	io.WriteString(p.w, "\n")
-	p.printIndent()
-	io.WriteString(p.w, "endswitch;")
-}
-
 func (p *PrettyPrinter) printStmtBreak(n ast.Vertex) {
 	nn := n.(*ast.StmtBreak)
 
@@ -2005,17 +1988,37 @@ func (p *PrettyPrinter) printStmtStmtList(n ast.Vertex) {
 func (p *PrettyPrinter) printStmtSwitch(n ast.Vertex) {
 	nn := n.(*ast.StmtSwitch)
 
+	if nn.Alt {
+		p.printStmtAltSwitch(n)
+		return
+	}
+
 	io.WriteString(p.w, "switch (")
 	p.Print(nn.Cond)
 	io.WriteString(p.w, ")")
 
 	io.WriteString(p.w, " {\n")
-	p.printNodes(nn.CaseList.Cases)
+	p.printNodes(nn.CaseList)
 	io.WriteString(p.w, "\n")
 	p.printIndent()
 	io.WriteString(p.w, "}")
 }
 
+func (p *PrettyPrinter) printStmtAltSwitch(n ast.Vertex) {
+	nn := n.(*ast.StmtSwitch)
+
+	io.WriteString(p.w, "switch (")
+	p.Print(nn.Cond)
+	io.WriteString(p.w, ") :\n")
+
+	s := nn.CaseList
+	p.printNodes(s)
+
+	io.WriteString(p.w, "\n")
+	p.printIndent()
+	io.WriteString(p.w, "endswitch;")
+}
+
 func (p *PrettyPrinter) printStmtThrow(n ast.Vertex) {
 	nn := n.(*ast.StmtThrow)
 
diff --git a/pkg/printer/pretty_printer_test.go b/pkg/printer/pretty_printer_test.go
index 0eec375..54fcdd0 100644
--- a/pkg/printer/pretty_printer_test.go
+++ b/pkg/printer/pretty_printer_test.go
@@ -2300,21 +2300,20 @@ func TestPrintStmtAltSwitch(t *testing.T) {
 	p := printer.NewPrettyPrinter(o, "    ")
 	p.Print(&ast.StmtNamespace{
 		Stmts: []ast.Vertex{
-			&ast.StmtAltSwitch{
+			&ast.StmtSwitch{
+				Alt:  true,
 				Cond: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("var")}},
-				CaseList: &ast.StmtCaseList{
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
-							Cond: &ast.ScalarString{Value: []byte("'a'")},
-							Stmts: []ast.Vertex{
-								&ast.StmtExpression{Expr: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("a")}}},
-							},
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Cond: &ast.ScalarString{Value: []byte("'a'")},
+						Stmts: []ast.Vertex{
+							&ast.StmtExpression{Expr: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("a")}}},
 						},
-						&ast.StmtCase{
-							Cond: &ast.ScalarString{Value: []byte("'b'")},
-							Stmts: []ast.Vertex{
-								&ast.StmtExpression{Expr: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("b")}}},
-							},
+					},
+					&ast.StmtCase{
+						Cond: &ast.ScalarString{Value: []byte("'b'")},
+						Stmts: []ast.Vertex{
+							&ast.StmtExpression{Expr: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("b")}}},
 						},
 					},
 				},
@@ -3682,19 +3681,17 @@ func TestPrintStmtSwitch(t *testing.T) {
 		Stmts: []ast.Vertex{
 			&ast.StmtSwitch{
 				Cond: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("var")}},
-				CaseList: &ast.StmtCaseList{
-					Cases: []ast.Vertex{
-						&ast.StmtCase{
-							Cond: &ast.ScalarString{Value: []byte("'a'")},
-							Stmts: []ast.Vertex{
-								&ast.StmtExpression{Expr: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("a")}}},
-							},
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Cond: &ast.ScalarString{Value: []byte("'a'")},
+						Stmts: []ast.Vertex{
+							&ast.StmtExpression{Expr: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("a")}}},
 						},
-						&ast.StmtCase{
-							Cond: &ast.ScalarString{Value: []byte("'b'")},
-							Stmts: []ast.Vertex{
-								&ast.StmtExpression{Expr: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("b")}}},
-							},
+					},
+					&ast.StmtCase{
+						Cond: &ast.ScalarString{Value: []byte("'b'")},
+						Stmts: []ast.Vertex{
+							&ast.StmtExpression{Expr: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("b")}}},
 						},
 					},
 				},
diff --git a/pkg/printer/printer.go b/pkg/printer/printer.go
index b7ded2f..5064d70 100644
--- a/pkg/printer/printer.go
+++ b/pkg/printer/printer.go
@@ -361,8 +361,6 @@ func (p *Printer) printNode(n ast.Vertex) {
 
 	case *ast.StmtAltForeach:
 		p.printStmtAltForeach(n)
-	case *ast.StmtAltSwitch:
-		p.printStmtAltSwitch(n)
 	case *ast.StmtBreak:
 		p.printStmtBreak(n)
 	case *ast.StmtCase:
@@ -2019,41 +2017,6 @@ func (p *Printer) printStmtAltForeach(n ast.Vertex) {
 	p.printFreeFloating(nn, token.End)
 }
 
-func (p *Printer) printStmtAltSwitch(n ast.Vertex) {
-	nn := n.(*ast.StmtAltSwitch)
-	p.printFreeFloating(nn, token.Start)
-
-	io.WriteString(p.w, "switch")
-
-	if _, ok := nn.Cond.(*ast.ParserBrackets); !ok {
-		io.WriteString(p.w, "(")
-	}
-
-	p.Print(nn.Cond)
-
-	if _, ok := nn.Cond.(*ast.ParserBrackets); !ok {
-		io.WriteString(p.w, ")")
-	}
-
-	p.printFreeFloating(nn, token.Cond)
-	io.WriteString(p.w, ":")
-
-	p.printFreeFloating(nn.CaseList, token.Start)
-	p.printFreeFloating(nn.CaseList, token.CaseListStart)
-	p.printNodes(nn.CaseList.Cases)
-	p.printFreeFloating(nn.CaseList, token.CaseListEnd)
-	p.printFreeFloating(nn.CaseList, token.End)
-
-	io.WriteString(p.w, "endswitch")
-	p.printFreeFloating(nn, token.AltEnd)
-	p.printFreeFloating(nn, token.SemiColon)
-	if nn.GetNode().Tokens.IsEmpty() {
-		io.WriteString(p.w, ";")
-	}
-
-	p.printFreeFloating(nn, token.End)
-}
-
 func (p *Printer) printStmtBreak(n ast.Vertex) {
 	nn := n.(*ast.StmtBreak)
 	p.printFreeFloating(nn, token.Start)
@@ -2075,26 +2038,12 @@ func (p *Printer) printStmtBreak(n ast.Vertex) {
 	p.printFreeFloating(nn, token.End)
 }
 
-func (p *Printer) printStmtCase(n ast.Vertex) {
-	nn := n.(*ast.StmtCase)
-	p.printFreeFloating(nn, token.Start)
-
-	io.WriteString(p.w, "case")
-	if nn.Cond.GetNode().Tokens.IsEmpty() {
-		io.WriteString(p.w, " ")
-	}
-	p.Print(nn.Cond)
-	p.printFreeFloating(nn, token.Expr)
-	p.printFreeFloating(nn, token.CaseSeparator)
-	if nn.GetNode().Tokens.IsEmpty() {
-		io.WriteString(p.w, ":")
-	}
-
-	if len(nn.Stmts) > 0 {
-		p.printNodes(nn.Stmts)
-	}
-
-	p.printFreeFloating(nn, token.End)
+func (p *Printer) printStmtCase(n *ast.StmtCase) {
+	p.printToken(n.CaseTkn, "case")
+	p.bufStart = " "
+	p.Print(n.Cond)
+	p.printToken(n.CaseSeparatorTkn, ":")
+	p.printNodes(n.Stmts)
 }
 
 func (p *Printer) printStmtCatch(n ast.Vertex) {
@@ -2308,22 +2257,10 @@ func (p *Printer) printStmtDeclare(n ast.Vertex) {
 	p.printFreeFloating(nn, token.End)
 }
 
-func (p *Printer) printStmtDefault(n ast.Vertex) {
-	nn := n.(*ast.StmtDefault)
-	p.printFreeFloating(nn, token.Start)
-
-	io.WriteString(p.w, "default")
-	p.printFreeFloating(nn, token.Default)
-	p.printFreeFloating(nn, token.CaseSeparator)
-	if nn.GetNode().Tokens.IsEmpty() {
-		io.WriteString(p.w, ":")
-	}
-
-	if len(nn.Stmts) > 0 {
-		p.printNodes(nn.Stmts)
-	}
-
-	p.printFreeFloating(nn, token.End)
+func (p *Printer) printStmtDefault(n *ast.StmtDefault) {
+	p.printToken(n.DefaultTkn, "default")
+	p.printToken(n.CaseSeparatorTkn, ":")
+	p.printNodes(n.Stmts)
 }
 
 func (p *Printer) printStmtDo(n *ast.StmtDo) {
@@ -2828,31 +2765,32 @@ func (p *Printer) printStmtStmtList(n *ast.StmtStmtList) {
 	p.printToken(n.CloseCurlyBracket, "}")
 }
 
-func (p *Printer) printStmtSwitch(n ast.Vertex) {
-	nn := n.(*ast.StmtSwitch)
-	p.printFreeFloating(nn, token.Start)
-
-	io.WriteString(p.w, "switch")
-
-	if _, ok := nn.Cond.(*ast.ParserBrackets); !ok {
-		io.WriteString(p.w, "(")
+func (p *Printer) printStmtSwitch(n *ast.StmtSwitch) {
+	if n.Alt {
+		p.printStmtAltSwitch(n)
+		return
 	}
 
-	p.Print(nn.Cond)
+	p.printToken(n.SwitchTkn, "switch")
+	p.printToken(n.OpenParenthesisTkn, "(")
+	p.Print(n.Cond)
+	p.printToken(n.CloseParenthesisTkn, ")")
+	p.printToken(n.OpenCurlyBracketTkn, "{")
+	p.printToken(n.CaseSeparatorTkn, "")
+	p.printNodes(n.CaseList)
+	p.printToken(n.CloseCurlyBracketTkn, "}")
+}
 
-	if _, ok := nn.Cond.(*ast.ParserBrackets); !ok {
-		io.WriteString(p.w, ")")
-	}
-
-	p.printFreeFloating(nn.CaseList, token.Start)
-	io.WriteString(p.w, "{")
-	p.printFreeFloating(nn.CaseList, token.CaseListStart)
-	p.printNodes(nn.CaseList.Cases)
-	p.printFreeFloating(nn.CaseList, token.CaseListEnd)
-	io.WriteString(p.w, "}")
-	p.printFreeFloating(nn.CaseList, token.End)
-
-	p.printFreeFloating(nn, token.End)
+func (p *Printer) printStmtAltSwitch(n *ast.StmtSwitch) {
+	p.printToken(n.SwitchTkn, "switch")
+	p.printToken(n.OpenParenthesisTkn, "(")
+	p.Print(n.Cond)
+	p.printToken(n.CloseParenthesisTkn, ")")
+	p.printToken(n.ColonTkn, ":")
+	p.printToken(n.CaseSeparatorTkn, "")
+	p.printNodes(n.CaseList)
+	p.printToken(n.EndSwitchTkn, "endswitch")
+	p.printToken(n.SemiColonTkn, ";")
 }
 
 func (p *Printer) printStmtThrow(n ast.Vertex) {
diff --git a/pkg/printer/printer_parsed_php5_test.go b/pkg/printer/printer_parsed_php5_test.go
index c607b65..2ea9ea4 100644
--- a/pkg/printer/printer_parsed_php5_test.go
+++ b/pkg/printer/printer_parsed_php5_test.go
@@ -791,7 +791,8 @@ func TestParseAndPrintPhp5AltForeach(t *testing.T) {
 }
 
 func TestParseAndPrintPhp5AltSwitch(t *testing.T) {
-	src := `<?php
+	// TODO: remove ; after <?php
+	src := `<?php ;
 
 	switch ( $a ) : 
 	case 1 : 
@@ -1232,7 +1233,8 @@ func TestParseAndPrintPhp5StmtList(t *testing.T) {
 }
 
 func TestParseAndPrintPhp5Switch(t *testing.T) {
-	src := `<?php
+	// TODO: remove ; after <?php
+	src := `<?php ;
 
 	switch ( $a ) {
 		case 1 : ;
diff --git a/pkg/printer/printer_parsed_php7_test.go b/pkg/printer/printer_parsed_php7_test.go
index 53cd8fc..39ea6a7 100644
--- a/pkg/printer/printer_parsed_php7_test.go
+++ b/pkg/printer/printer_parsed_php7_test.go
@@ -904,7 +904,8 @@ func TestParseAndPrintAltForeach(t *testing.T) {
 }
 
 func TestParseAndPrintAltSwitch(t *testing.T) {
-	src := `<?php
+	// TODO: remove ; after <?php
+	src := `<?php ;
 
 	switch ( $a ) : 
 	case 1 : 
@@ -1365,7 +1366,8 @@ func TestParseAndPrintStmtList(t *testing.T) {
 }
 
 func TestParseAndPrintSwitch(t *testing.T) {
-	src := `<?php
+	// TODO: remove ; after <?php
+	src := `<?php ;
 
 	switch ( $a ) {
 		case 1 : ;
diff --git a/pkg/printer/printer_test.go b/pkg/printer/printer_test.go
index d6b8b24..2e01fd0 100644
--- a/pkg/printer/printer_test.go
+++ b/pkg/printer/printer_test.go
@@ -2778,27 +2778,26 @@ func TestPrinterPrintStmtAltSwitch(t *testing.T) {
 	o := bytes.NewBufferString("")
 
 	p := printer.NewPrinter(o)
-	p.Print(&ast.StmtAltSwitch{
+	p.Print(&ast.StmtSwitch{
 		Cond: &ast.ExprVariable{
 			VarName: &ast.Identifier{Value: []byte("$var")},
 		},
-		CaseList: &ast.StmtCaseList{
-			Cases: []ast.Vertex{
-				&ast.StmtCase{
-					Cond: &ast.ScalarString{Value: []byte("'a'")},
-					Stmts: []ast.Vertex{
-						&ast.StmtExpression{Expr: &ast.ExprVariable{
-							VarName: &ast.Identifier{Value: []byte("$a")},
-						}},
-					},
+		Alt: true,
+		CaseList: []ast.Vertex{
+			&ast.StmtCase{
+				Cond: &ast.ScalarString{Value: []byte("'a'")},
+				Stmts: []ast.Vertex{
+					&ast.StmtExpression{Expr: &ast.ExprVariable{
+						VarName: &ast.Identifier{Value: []byte("$a")},
+					}},
 				},
-				&ast.StmtCase{
-					Cond: &ast.ScalarString{Value: []byte("'b'")},
-					Stmts: []ast.Vertex{
-						&ast.StmtExpression{Expr: &ast.ExprVariable{
-							VarName: &ast.Identifier{Value: []byte("$b")},
-						}},
-					},
+			},
+			&ast.StmtCase{
+				Cond: &ast.ScalarString{Value: []byte("'b'")},
+				Stmts: []ast.Vertex{
+					&ast.StmtExpression{Expr: &ast.ExprVariable{
+						VarName: &ast.Identifier{Value: []byte("$b")},
+					}},
 				},
 			},
 		},
@@ -4103,23 +4102,21 @@ func TestPrinterPrintStmtSwitch(t *testing.T) {
 		Cond: &ast.ExprVariable{
 			VarName: &ast.Identifier{Value: []byte("$var")},
 		},
-		CaseList: &ast.StmtCaseList{
-			Cases: []ast.Vertex{
-				&ast.StmtCase{
-					Cond: &ast.ScalarString{Value: []byte("'a'")},
-					Stmts: []ast.Vertex{
-						&ast.StmtExpression{Expr: &ast.ExprVariable{
-							VarName: &ast.Identifier{Value: []byte("$a")},
-						}},
-					},
+		CaseList: []ast.Vertex{
+			&ast.StmtCase{
+				Cond: &ast.ScalarString{Value: []byte("'a'")},
+				Stmts: []ast.Vertex{
+					&ast.StmtExpression{Expr: &ast.ExprVariable{
+						VarName: &ast.Identifier{Value: []byte("$a")},
+					}},
 				},
-				&ast.StmtCase{
-					Cond: &ast.ScalarString{Value: []byte("'b'")},
-					Stmts: []ast.Vertex{
-						&ast.StmtExpression{Expr: &ast.ExprVariable{
-							VarName: &ast.Identifier{Value: []byte("$b")},
-						}},
-					},
+			},
+			&ast.StmtCase{
+				Cond: &ast.ScalarString{Value: []byte("'b'")},
+				Stmts: []ast.Vertex{
+					&ast.StmtExpression{Expr: &ast.ExprVariable{
+						VarName: &ast.Identifier{Value: []byte("$b")},
+					}},
 				},
 			},
 		},