diff --git a/internal/php5/parser_test.go b/internal/php5/parser_test.go
index a60a8fb..6ff6707 100644
--- a/internal/php5/parser_test.go
+++ b/internal/php5/parser_test.go
@@ -31770,7 +31770,7 @@ func TestExprClosure_Use(t *testing.T) {
 						EndPos:    36,
 					},
 					FunctionTkn: &token.Token{
-						ID:    token.T_FUNCTION,
+						ID: token.T_FUNCTION,
 						Value: []byte("function"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -31780,7 +31780,7 @@ func TestExprClosure_Use(t *testing.T) {
 						},
 						FreeFloating: []*token.Token{
 							{
-								ID:    token.T_OPEN_TAG,
+								ID: token.T_OPEN_TAG,
 								Value: []byte("<?"),
 								Position: &position.Position{
 									StartLine: 1,
@@ -31790,7 +31790,7 @@ func TestExprClosure_Use(t *testing.T) {
 								},
 							},
 							{
-								ID:    token.T_WHITESPACE,
+								ID: token.T_WHITESPACE,
 								Value: []byte(" "),
 								Position: &position.Position{
 									StartLine: 1,
@@ -31802,7 +31802,7 @@ func TestExprClosure_Use(t *testing.T) {
 						},
 					},
 					OpenParenthesisTkn: &token.Token{
-						ID:    token.ID(40),
+						ID: token.ID(40),
 						Value: []byte("("),
 						Position: &position.Position{
 							StartLine: 1,
@@ -31834,7 +31834,7 @@ func TestExprClosure_Use(t *testing.T) {
 										EndPos:    14,
 									},
 									IdentifierTkn: &token.Token{
-										ID:    token.T_VARIABLE,
+										ID: token.T_VARIABLE,
 										Value: []byte("$a"),
 										Position: &position.Position{
 											StartLine: 1,
@@ -31869,7 +31869,7 @@ func TestExprClosure_Use(t *testing.T) {
 										EndPos:    18,
 									},
 									IdentifierTkn: &token.Token{
-										ID:    token.T_VARIABLE,
+										ID: token.T_VARIABLE,
 										Value: []byte("$b"),
 										Position: &position.Position{
 											StartLine: 1,
@@ -31879,7 +31879,7 @@ func TestExprClosure_Use(t *testing.T) {
 										},
 										FreeFloating: []*token.Token{
 											{
-												ID:    token.T_WHITESPACE,
+												ID: token.T_WHITESPACE,
 												Value: []byte(" "),
 												Position: &position.Position{
 													StartLine: 1,
@@ -31897,7 +31897,7 @@ func TestExprClosure_Use(t *testing.T) {
 					},
 					SeparatorTkns: []*token.Token{
 						{
-							ID:    token.ID(44),
+							ID: token.ID(44),
 							Value: []byte(","),
 							Position: &position.Position{
 								StartLine: 1,
@@ -31908,7 +31908,7 @@ func TestExprClosure_Use(t *testing.T) {
 						},
 					},
 					CloseParenthesisTkn: &token.Token{
-						ID:    token.ID(41),
+						ID: token.ID(41),
 						Value: []byte(")"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -31917,59 +31917,59 @@ func TestExprClosure_Use(t *testing.T) {
 							EndPos:    19,
 						},
 					},
-					ClosureUse: &ast.ExprClosureUse{
+					UseTkn: &token.Token{
+						ID: token.T_USE,
+						Value: []byte("use"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  20,
-							EndPos:    33,
+							EndPos:    23,
 						},
-						UseTkn: &token.Token{
-							ID:    token.T_USE,
-							Value: []byte("use"),
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  20,
-								EndPos:    23,
-							},
-							FreeFloating: []*token.Token{
-								{
-									ID:    token.T_WHITESPACE,
-									Value: []byte(" "),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  19,
-										EndPos:    20,
-									},
+						FreeFloating: []*token.Token{
+							{
+								ID: token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  19,
+									EndPos:    20,
 								},
 							},
 						},
-						OpenParenthesisTkn: &token.Token{
-							ID:    token.ID(40),
-							Value: []byte("("),
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  24,
-								EndPos:    25,
-							},
-							FreeFloating: []*token.Token{
-								{
-									ID:    token.T_WHITESPACE,
-									Value: []byte(" "),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  23,
-										EndPos:    24,
-									},
+					},
+					UseOpenParenthesisTkn: &token.Token{
+						ID: token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  24,
+							EndPos:    25,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID: token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
+									EndPos:    24,
 								},
 							},
 						},
-						Uses: []ast.Vertex{
-							&ast.ExprVariable{
+					},
+					Use: []ast.Vertex{
+						&ast.ExprClosureUse{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  25,
+								EndPos:    27,
+							},
+							Var: &ast.ExprVariable{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -31984,7 +31984,7 @@ func TestExprClosure_Use(t *testing.T) {
 										EndPos:    27,
 									},
 									IdentifierTkn: &token.Token{
-										ID:    token.T_VARIABLE,
+										ID: token.T_VARIABLE,
 										Value: []byte("$c"),
 										Position: &position.Position{
 											StartLine: 1,
@@ -31996,89 +31996,89 @@ func TestExprClosure_Use(t *testing.T) {
 									Value: []byte("$c"),
 								},
 							},
-							&ast.ExprReference{
+						},
+						&ast.ExprClosureUse{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  29,
+								EndPos:    32,
+							},
+							AmpersandTkn: &token.Token{
+								ID: token.ID(38),
+								Value: []byte("&"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  29,
-									EndPos:    32,
+									EndPos:    30,
 								},
-								AmpersandTkn: &token.Token{
-									ID:    token.ID(38),
-									Value: []byte("&"),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  29,
-										EndPos:    30,
-									},
-									FreeFloating: []*token.Token{
-										{
-											ID:    token.T_WHITESPACE,
-											Value: []byte(" "),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  28,
-												EndPos:    29,
-											},
+								FreeFloating: []*token.Token{
+									{
+										ID: token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  28,
+											EndPos:    29,
 										},
 									},
 								},
-								Var: &ast.ExprVariable{
+							},
+							Var: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  30,
+									EndPos:    32,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  30,
 										EndPos:    32,
 									},
-									VarName: &ast.Identifier{
+									IdentifierTkn: &token.Token{
+										ID: token.T_VARIABLE,
+										Value: []byte("$d"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
 											EndPos:    32,
 										},
-										IdentifierTkn: &token.Token{
-											ID:    token.T_VARIABLE,
-											Value: []byte("$d"),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  30,
-												EndPos:    32,
-											},
-										},
-										Value: []byte("$d"),
 									},
+									Value: []byte("$d"),
 								},
 							},
 						},
-						SeparatorTkns: []*token.Token{
-							{
-								ID:    token.ID(44),
-								Value: []byte(","),
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  27,
-									EndPos:    28,
-								},
-							},
-						},
-						CloseParenthesisTkn: &token.Token{
-							ID:    token.ID(41),
-							Value: []byte(")"),
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  32,
-								EndPos:    33,
-							},
-						},
+					},
+					UseSeparatorTkns: []*token.Token{
+						{
+							ID: token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  27,
+								EndPos:    28,
+							},
+						},
+					},
+					UseCloseParenthesisTkn: &token.Token{
+						ID: token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  32,
+							EndPos:    33,
+						},
 					},
 					OpenCurlyBracketTkn: &token.Token{
-						ID:    token.ID(123),
+						ID: token.ID(123),
 						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -32088,7 +32088,7 @@ func TestExprClosure_Use(t *testing.T) {
 						},
 						FreeFloating: []*token.Token{
 							{
-								ID:    token.T_WHITESPACE,
+								ID: token.T_WHITESPACE,
 								Value: []byte(" "),
 								Position: &position.Position{
 									StartLine: 1,
@@ -32101,7 +32101,7 @@ func TestExprClosure_Use(t *testing.T) {
 					},
 					Stmts: []ast.Vertex{},
 					CloseCurlyBracketTkn: &token.Token{
-						ID:    token.ID(125),
+						ID: token.ID(125),
 						Value: []byte("}"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -32112,7 +32112,7 @@ func TestExprClosure_Use(t *testing.T) {
 					},
 				},
 				SemiColonTkn: &token.Token{
-					ID:    token.ID(59),
+					ID: token.ID(59),
 					Value: []byte(";"),
 					Position: &position.Position{
 						StartLine: 1,
@@ -32123,7 +32123,8 @@ func TestExprClosure_Use(t *testing.T) {
 				},
 			},
 		},
-		EndTkn: &token.Token{},
+		EndTkn: &token.Token{
+		},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
@@ -32159,7 +32160,7 @@ func TestExprClosure_Use2(t *testing.T) {
 						EndPos:    36,
 					},
 					FunctionTkn: &token.Token{
-						ID:    token.T_FUNCTION,
+						ID: token.T_FUNCTION,
 						Value: []byte("function"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -32169,7 +32170,7 @@ func TestExprClosure_Use2(t *testing.T) {
 						},
 						FreeFloating: []*token.Token{
 							{
-								ID:    token.T_OPEN_TAG,
+								ID: token.T_OPEN_TAG,
 								Value: []byte("<?"),
 								Position: &position.Position{
 									StartLine: 1,
@@ -32179,7 +32180,7 @@ func TestExprClosure_Use2(t *testing.T) {
 								},
 							},
 							{
-								ID:    token.T_WHITESPACE,
+								ID: token.T_WHITESPACE,
 								Value: []byte(" "),
 								Position: &position.Position{
 									StartLine: 1,
@@ -32191,7 +32192,7 @@ func TestExprClosure_Use2(t *testing.T) {
 						},
 					},
 					OpenParenthesisTkn: &token.Token{
-						ID:    token.ID(40),
+						ID: token.ID(40),
 						Value: []byte("("),
 						Position: &position.Position{
 							StartLine: 1,
@@ -32223,7 +32224,7 @@ func TestExprClosure_Use2(t *testing.T) {
 										EndPos:    14,
 									},
 									IdentifierTkn: &token.Token{
-										ID:    token.T_VARIABLE,
+										ID: token.T_VARIABLE,
 										Value: []byte("$a"),
 										Position: &position.Position{
 											StartLine: 1,
@@ -32258,7 +32259,7 @@ func TestExprClosure_Use2(t *testing.T) {
 										EndPos:    18,
 									},
 									IdentifierTkn: &token.Token{
-										ID:    token.T_VARIABLE,
+										ID: token.T_VARIABLE,
 										Value: []byte("$b"),
 										Position: &position.Position{
 											StartLine: 1,
@@ -32268,7 +32269,7 @@ func TestExprClosure_Use2(t *testing.T) {
 										},
 										FreeFloating: []*token.Token{
 											{
-												ID:    token.T_WHITESPACE,
+												ID: token.T_WHITESPACE,
 												Value: []byte(" "),
 												Position: &position.Position{
 													StartLine: 1,
@@ -32286,7 +32287,7 @@ func TestExprClosure_Use2(t *testing.T) {
 					},
 					SeparatorTkns: []*token.Token{
 						{
-							ID:    token.ID(44),
+							ID: token.ID(44),
 							Value: []byte(","),
 							Position: &position.Position{
 								StartLine: 1,
@@ -32297,7 +32298,7 @@ func TestExprClosure_Use2(t *testing.T) {
 						},
 					},
 					CloseParenthesisTkn: &token.Token{
-						ID:    token.ID(41),
+						ID: token.ID(41),
 						Value: []byte(")"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -32306,104 +32307,104 @@ func TestExprClosure_Use2(t *testing.T) {
 							EndPos:    19,
 						},
 					},
-					ClosureUse: &ast.ExprClosureUse{
+					UseTkn: &token.Token{
+						ID: token.T_USE,
+						Value: []byte("use"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  20,
-							EndPos:    33,
+							EndPos:    23,
 						},
-						UseTkn: &token.Token{
-							ID:    token.T_USE,
-							Value: []byte("use"),
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  20,
-								EndPos:    23,
-							},
-							FreeFloating: []*token.Token{
-								{
-									ID:    token.T_WHITESPACE,
-									Value: []byte(" "),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  19,
-										EndPos:    20,
-									},
+						FreeFloating: []*token.Token{
+							{
+								ID: token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  19,
+									EndPos:    20,
 								},
 							},
 						},
-						OpenParenthesisTkn: &token.Token{
-							ID:    token.ID(40),
-							Value: []byte("("),
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  24,
-								EndPos:    25,
-							},
-							FreeFloating: []*token.Token{
-								{
-									ID:    token.T_WHITESPACE,
-									Value: []byte(" "),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  23,
-										EndPos:    24,
-									},
+					},
+					UseOpenParenthesisTkn: &token.Token{
+						ID: token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  24,
+							EndPos:    25,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID: token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
+									EndPos:    24,
 								},
 							},
 						},
-						Uses: []ast.Vertex{
-							&ast.ExprReference{
+					},
+					Use: []ast.Vertex{
+						&ast.ExprClosureUse{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  25,
+								EndPos:    28,
+							},
+							AmpersandTkn: &token.Token{
+								ID: token.ID(38),
+								Value: []byte("&"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  25,
+									EndPos:    26,
+								},
+							},
+							Var: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  26,
 									EndPos:    28,
 								},
-								AmpersandTkn: &token.Token{
-									ID:    token.ID(38),
-									Value: []byte("&"),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  25,
-										EndPos:    26,
-									},
-								},
-								Var: &ast.ExprVariable{
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  26,
 										EndPos:    28,
 									},
-									VarName: &ast.Identifier{
+									IdentifierTkn: &token.Token{
+										ID: token.T_VARIABLE,
+										Value: []byte("$c"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  26,
 											EndPos:    28,
 										},
-										IdentifierTkn: &token.Token{
-											ID:    token.T_VARIABLE,
-											Value: []byte("$c"),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  26,
-												EndPos:    28,
-											},
-										},
-										Value: []byte("$c"),
 									},
+									Value: []byte("$c"),
 								},
 							},
-							&ast.ExprVariable{
+						},
+						&ast.ExprClosureUse{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  30,
+								EndPos:    32,
+							},
+							Var: &ast.ExprVariable{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -32418,7 +32419,7 @@ func TestExprClosure_Use2(t *testing.T) {
 										EndPos:    32,
 									},
 									IdentifierTkn: &token.Token{
-										ID:    token.T_VARIABLE,
+										ID: token.T_VARIABLE,
 										Value: []byte("$d"),
 										Position: &position.Position{
 											StartLine: 1,
@@ -32428,7 +32429,7 @@ func TestExprClosure_Use2(t *testing.T) {
 										},
 										FreeFloating: []*token.Token{
 											{
-												ID:    token.T_WHITESPACE,
+												ID: token.T_WHITESPACE,
 												Value: []byte(" "),
 												Position: &position.Position{
 													StartLine: 1,
@@ -32443,31 +32444,31 @@ func TestExprClosure_Use2(t *testing.T) {
 								},
 							},
 						},
-						SeparatorTkns: []*token.Token{
-							{
-								ID:    token.ID(44),
-								Value: []byte(","),
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  28,
-									EndPos:    29,
-								},
-							},
-						},
-						CloseParenthesisTkn: &token.Token{
-							ID:    token.ID(41),
-							Value: []byte(")"),
+					},
+					UseSeparatorTkns: []*token.Token{
+						{
+							ID: token.ID(44),
+							Value: []byte(","),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
-								StartPos:  32,
-								EndPos:    33,
+								StartPos:  28,
+								EndPos:    29,
 							},
 						},
 					},
+					UseCloseParenthesisTkn: &token.Token{
+						ID: token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  32,
+							EndPos:    33,
+						},
+					},
 					OpenCurlyBracketTkn: &token.Token{
-						ID:    token.ID(123),
+						ID: token.ID(123),
 						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -32477,7 +32478,7 @@ func TestExprClosure_Use2(t *testing.T) {
 						},
 						FreeFloating: []*token.Token{
 							{
-								ID:    token.T_WHITESPACE,
+								ID: token.T_WHITESPACE,
 								Value: []byte(" "),
 								Position: &position.Position{
 									StartLine: 1,
@@ -32490,7 +32491,7 @@ func TestExprClosure_Use2(t *testing.T) {
 					},
 					Stmts: []ast.Vertex{},
 					CloseCurlyBracketTkn: &token.Token{
-						ID:    token.ID(125),
+						ID: token.ID(125),
 						Value: []byte("}"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -32501,7 +32502,7 @@ func TestExprClosure_Use2(t *testing.T) {
 					},
 				},
 				SemiColonTkn: &token.Token{
-					ID:    token.ID(59),
+					ID: token.ID(59),
 					Value: []byte(";"),
 					Position: &position.Position{
 						StartLine: 1,
@@ -32512,7 +32513,8 @@ func TestExprClosure_Use2(t *testing.T) {
 				},
 			},
 		},
-		EndTkn: &token.Token{},
+		EndTkn: &token.Token{
+		},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
diff --git a/internal/php5/php5.go b/internal/php5/php5.go
index 0aaa2b9..6ab59b9 100644
--- a/internal/php5/php5.go
+++ b/internal/php5/php5.go
@@ -339,7 +339,7 @@ const yyEofCode = 1
 const yyErrCode = 2
 const yyInitialStackSize = 16
 
-// line internal/php5/php5.y:5637
+// line internal/php5/php5.y:5644
 
 // line yacctab:1
 var yyExca = [...]int{
@@ -5740,42 +5740,44 @@ yydefault:
 		yyDollar = yyS[yypt-9 : yypt+1]
 		// line internal/php5/php5.y:3369
 		{
-			yyVAL.node = &ast.ExprClosure{
-				Position:             yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[9].token),
-				FunctionTkn:          yyDollar[1].token,
-				AmpersandTkn:         yyDollar[2].token,
-				OpenParenthesisTkn:   yyDollar[3].token,
-				Params:               yyDollar[4].node.(*ast.ParserSeparatedList).Items,
-				SeparatorTkns:        yyDollar[4].node.(*ast.ParserSeparatedList).SeparatorTkns,
-				CloseParenthesisTkn:  yyDollar[5].token,
-				ClosureUse:           yyDollar[6].node,
-				OpenCurlyBracketTkn:  yyDollar[7].token,
-				Stmts:                yyDollar[8].list,
-				CloseCurlyBracketTkn: yyDollar[9].token,
-			}
+			closure := yyDollar[6].node.(*ast.ExprClosure)
+
+			closure.Position = yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[9].token)
+			closure.FunctionTkn = yyDollar[1].token
+			closure.AmpersandTkn = yyDollar[2].token
+			closure.OpenParenthesisTkn = yyDollar[3].token
+			closure.Params = yyDollar[4].node.(*ast.ParserSeparatedList).Items
+			closure.SeparatorTkns = yyDollar[4].node.(*ast.ParserSeparatedList).SeparatorTkns
+			closure.CloseParenthesisTkn = yyDollar[5].token
+			closure.OpenCurlyBracketTkn = yyDollar[7].token
+			closure.Stmts = yyDollar[8].list
+			closure.CloseCurlyBracketTkn = yyDollar[9].token
+
+			yyVAL.node = closure
 		}
 	case 305:
 		yyDollar = yyS[yypt-10 : yypt+1]
-		// line internal/php5/php5.y:3385
+		// line internal/php5/php5.y:3386
 		{
-			yyVAL.node = &ast.ExprClosure{
-				Position:             yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[10].token),
-				StaticTkn:            yyDollar[1].token,
-				FunctionTkn:          yyDollar[2].token,
-				AmpersandTkn:         yyDollar[3].token,
-				OpenParenthesisTkn:   yyDollar[4].token,
-				Params:               yyDollar[5].node.(*ast.ParserSeparatedList).Items,
-				SeparatorTkns:        yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns,
-				CloseParenthesisTkn:  yyDollar[6].token,
-				ClosureUse:           yyDollar[7].node,
-				OpenCurlyBracketTkn:  yyDollar[8].token,
-				Stmts:                yyDollar[9].list,
-				CloseCurlyBracketTkn: yyDollar[10].token,
-			}
+			closure := yyDollar[7].node.(*ast.ExprClosure)
+
+			closure.Position = yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[10].token)
+			closure.StaticTkn = yyDollar[1].token
+			closure.FunctionTkn = yyDollar[2].token
+			closure.AmpersandTkn = yyDollar[3].token
+			closure.OpenParenthesisTkn = yyDollar[4].token
+			closure.Params = yyDollar[5].node.(*ast.ParserSeparatedList).Items
+			closure.SeparatorTkns = yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns
+			closure.CloseParenthesisTkn = yyDollar[6].token
+			closure.OpenCurlyBracketTkn = yyDollar[8].token
+			closure.Stmts = yyDollar[9].list
+			closure.CloseCurlyBracketTkn = yyDollar[10].token
+
+			yyVAL.node = closure
 		}
 	case 306:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:3405
+		// line internal/php5/php5.y:3407
 		{
 			yyVAL.node = &ast.ExprYield{
 				Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -5785,7 +5787,7 @@ yydefault:
 		}
 	case 307:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:3413
+		// line internal/php5/php5.y:3415
 		{
 			yyVAL.node = &ast.ExprYield{
 				Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -5795,7 +5797,7 @@ yydefault:
 		}
 	case 308:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3421
+		// line internal/php5/php5.y:3423
 		{
 			yyVAL.node = &ast.ExprYield{
 				Position:       yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[4].node),
@@ -5807,7 +5809,7 @@ yydefault:
 		}
 	case 309:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3431
+		// line internal/php5/php5.y:3433
 		{
 			yyVAL.node = &ast.ExprYield{
 				Position:       yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[4].node),
@@ -5819,7 +5821,7 @@ yydefault:
 		}
 	case 310:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3444
+		// line internal/php5/php5.y:3446
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token),
@@ -5831,7 +5833,7 @@ yydefault:
 		}
 	case 311:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3454
+		// line internal/php5/php5.y:3456
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token),
@@ -5843,7 +5845,7 @@ yydefault:
 		}
 	case 312:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3464
+		// line internal/php5/php5.y:3466
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -5859,7 +5861,7 @@ yydefault:
 		}
 	case 313:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3478
+		// line internal/php5/php5.y:3480
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token),
@@ -5871,7 +5873,7 @@ yydefault:
 		}
 	case 314:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3491
+		// line internal/php5/php5.y:3493
 		{
 			yyVAL.node = &ast.ExprArray{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -5884,7 +5886,7 @@ yydefault:
 		}
 	case 315:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:3502
+		// line internal/php5/php5.y:3504
 		{
 			yyVAL.node = &ast.ExprArray{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -5896,39 +5898,41 @@ yydefault:
 		}
 	case 316:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3515
+		// line internal/php5/php5.y:3517
 		{
 			yyVAL.token = yyDollar[1].token
 		}
 	case 317:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php5/php5.y:3522
+		// line internal/php5/php5.y:3524
 		{
-			yyVAL.node = nil
+			yyVAL.node = &ast.ExprClosure{}
 		}
 	case 318:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3526
+		// line internal/php5/php5.y:3528
 		{
-			yyVAL.node = &ast.ExprClosureUse{
-				Position:            yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
-				UseTkn:              yyDollar[1].token,
-				OpenParenthesisTkn:  yyDollar[2].token,
-				Uses:                yyDollar[3].node.(*ast.ParserSeparatedList).Items,
-				SeparatorTkns:       yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns,
-				CloseParenthesisTkn: yyDollar[4].token,
+			yyVAL.node = &ast.ExprClosure{
+				UseTkn:                 yyDollar[1].token,
+				UseOpenParenthesisTkn:  yyDollar[2].token,
+				Use:                    yyDollar[3].node.(*ast.ParserSeparatedList).Items,
+				UseSeparatorTkns:       yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns,
+				UseCloseParenthesisTkn: yyDollar[4].token,
 			}
 		}
 	case 319:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:3540
+		// line internal/php5/php5.y:3541
 		{
-			variable := &ast.ExprVariable{
+			variable := &ast.ExprClosureUse{
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
-				VarName: &ast.Identifier{
-					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
-					IdentifierTkn: yyDollar[3].token,
-					Value:         yyDollar[3].token.Value,
+				Var: &ast.ExprVariable{
+					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
+					VarName: &ast.Identifier{
+						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
+						IdentifierTkn: yyDollar[3].token,
+						Value:         yyDollar[3].token.Value,
+					},
 				},
 			}
 
@@ -5939,9 +5943,9 @@ yydefault:
 		}
 	case 320:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3556
+		// line internal/php5/php5.y:3560
 		{
-			reference := &ast.ExprReference{
+			variable := &ast.ExprClosureUse{
 				Position:     yylex.(*Parser).builder.NewTokensPosition(yyDollar[3].token, yyDollar[4].token),
 				AmpersandTkn: yyDollar[3].token,
 				Var: &ast.ExprVariable{
@@ -5955,51 +5959,54 @@ yydefault:
 			}
 
 			yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token)
-			yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, reference)
+			yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, variable)
 
 			yyVAL.node = yyDollar[1].node
 		}
 	case 321:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3576
+		// line internal/php5/php5.y:3580
 		{
-			yyVAL.node = &ast.ParserSeparatedList{
-				Items: []ast.Vertex{
-					&ast.ExprVariable{
-						Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-						VarName: &ast.Identifier{
-							Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-							IdentifierTkn: yyDollar[1].token,
-							Value:         yyDollar[1].token.Value,
-						},
+			variable := &ast.ExprClosureUse{
+				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
+				Var: &ast.ExprVariable{
+					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
+					VarName: &ast.Identifier{
+						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
+						IdentifierTkn: yyDollar[1].token,
+						Value:         yyDollar[1].token.Value,
 					},
 				},
 			}
+
+			yyVAL.node = &ast.ParserSeparatedList{
+				Items: []ast.Vertex{variable},
+			}
 		}
 	case 322:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:3591
+		// line internal/php5/php5.y:3598
 		{
-			yyVAL.node = &ast.ParserSeparatedList{
-				Items: []ast.Vertex{
-					&ast.ExprReference{
-						Position:     yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token),
-						AmpersandTkn: yyDollar[1].token,
-						Var: &ast.ExprVariable{
-							Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
-							VarName: &ast.Identifier{
-								Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
-								IdentifierTkn: yyDollar[2].token,
-								Value:         yyDollar[2].token.Value,
-							},
-						},
+			variable := &ast.ExprClosureUse{
+				Position:     yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token),
+				AmpersandTkn: yyDollar[1].token,
+				Var: &ast.ExprVariable{
+					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
+					VarName: &ast.Identifier{
+						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
+						IdentifierTkn: yyDollar[2].token,
+						Value:         yyDollar[2].token.Value,
 					},
 				},
 			}
+
+			yyVAL.node = &ast.ParserSeparatedList{
+				Items: []ast.Vertex{variable},
+			}
 		}
 	case 323:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:3613
+		// line internal/php5/php5.y:3620
 		{
 			yyVAL.node = &ast.ExprFunctionCall{
 				Position: yylex.(*Parser).builder.NewNodeListNodePosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[2].node),
@@ -6016,7 +6023,7 @@ yydefault:
 		}
 	case 324:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3628
+		// line internal/php5/php5.y:3635
 		{
 			yyVAL.node = &ast.ExprFunctionCall{
 				Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[4].node),
@@ -6035,7 +6042,7 @@ yydefault:
 		}
 	case 325:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:3645
+		// line internal/php5/php5.y:3652
 		{
 			yyVAL.node = &ast.ExprFunctionCall{
 				Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node),
@@ -6053,7 +6060,7 @@ yydefault:
 		}
 	case 326:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3661
+		// line internal/php5/php5.y:3668
 		{
 			yyVAL.node = &ast.ExprStaticCall{
 				Position:            yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node),
@@ -6068,7 +6075,7 @@ yydefault:
 		}
 	case 327:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3674
+		// line internal/php5/php5.y:3681
 		{
 			yyVAL.node = &ast.ExprStaticCall{
 				Position:            yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node),
@@ -6083,7 +6090,7 @@ yydefault:
 		}
 	case 328:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3687
+		// line internal/php5/php5.y:3694
 		{
 			yyVAL.node = &ast.ExprStaticCall{
 				Position:            yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node),
@@ -6098,7 +6105,7 @@ yydefault:
 		}
 	case 329:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3700
+		// line internal/php5/php5.y:3707
 		{
 			yyVAL.node = &ast.ExprStaticCall{
 				Position:            yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node),
@@ -6113,7 +6120,7 @@ yydefault:
 		}
 	case 330:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:3713
+		// line internal/php5/php5.y:3720
 		{
 			yyVAL.node = &ast.ExprFunctionCall{
 				Position:            yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[2].node),
@@ -6126,7 +6133,7 @@ yydefault:
 		}
 	case 331:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3727
+		// line internal/php5/php5.y:3734
 		{
 			yyVAL.node = &ast.Identifier{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6136,7 +6143,7 @@ yydefault:
 		}
 	case 332:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3735
+		// line internal/php5/php5.y:3742
 		{
 			yyVAL.node = &ast.NameName{
 				Position:      yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items),
@@ -6146,7 +6153,7 @@ yydefault:
 		}
 	case 333:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:3743
+		// line internal/php5/php5.y:3750
 		{
 			yyVAL.node = &ast.NameRelative{
 				Position:       yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ast.ParserSeparatedList).Items),
@@ -6158,7 +6165,7 @@ yydefault:
 		}
 	case 334:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:3753
+		// line internal/php5/php5.y:3760
 		{
 			yyVAL.node = &ast.NameFullyQualified{
 				Position:       yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items),
@@ -6169,7 +6176,7 @@ yydefault:
 		}
 	case 335:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3765
+		// line internal/php5/php5.y:3772
 		{
 			yyVAL.node = &ast.NameName{
 				Position:      yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items),
@@ -6179,7 +6186,7 @@ yydefault:
 		}
 	case 336:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:3773
+		// line internal/php5/php5.y:3780
 		{
 			yyVAL.node = &ast.NameRelative{
 				Position:       yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ast.ParserSeparatedList).Items),
@@ -6191,7 +6198,7 @@ yydefault:
 		}
 	case 337:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:3783
+		// line internal/php5/php5.y:3790
 		{
 			yyVAL.node = &ast.NameFullyQualified{
 				Position:       yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items),
@@ -6202,19 +6209,19 @@ yydefault:
 		}
 	case 338:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3795
+		// line internal/php5/php5.y:3802
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 339:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3799
+		// line internal/php5/php5.y:3806
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 340:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:3806
+		// line internal/php5/php5.y:3813
 		{
 			yyVAL.node = yyDollar[1].node
 
@@ -6250,25 +6257,25 @@ yydefault:
 		}
 	case 341:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3840
+		// line internal/php5/php5.y:3847
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 342:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:3848
+		// line internal/php5/php5.y:3855
 		{
 			yyVAL.list = append(yyDollar[1].list, yyDollar[2].list...)
 		}
 	case 343:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php5/php5.y:3852
+		// line internal/php5/php5.y:3859
 		{
 			yyVAL.list = []ast.Vertex{}
 		}
 	case 344:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:3860
+		// line internal/php5/php5.y:3867
 		{
 			yyDollar[2].list[0].(*ast.ExprPropertyFetch).ObjectOperatorTkn = yyDollar[1].token
 
@@ -6276,13 +6283,13 @@ yydefault:
 		}
 	case 345:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php5/php5.y:3869
+		// line internal/php5/php5.y:3876
 		{
 			yyVAL.node = nil
 		}
 	case 346:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:3873
+		// line internal/php5/php5.y:3880
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token),
@@ -6292,19 +6299,19 @@ yydefault:
 		}
 	case 347:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3881
+		// line internal/php5/php5.y:3888
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 348:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php5/php5.y:3888
+		// line internal/php5/php5.y:3895
 		{
 			yyVAL.list = []ast.Vertex{}
 		}
 	case 349:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3892
+		// line internal/php5/php5.y:3899
 		{
 			yyVAL.list = []ast.Vertex{
 				&ast.ScalarEncapsedStringPart{
@@ -6316,25 +6323,25 @@ yydefault:
 		}
 	case 350:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3902
+		// line internal/php5/php5.y:3909
 		{
 			yyVAL.list = yyDollar[1].list
 		}
 	case 351:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php5/php5.y:3909
+		// line internal/php5/php5.y:3916
 		{
 			yyVAL.node = &ast.ArgumentList{}
 		}
 	case 352:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3913
+		// line internal/php5/php5.y:3920
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 353:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3920
+		// line internal/php5/php5.y:3927
 		{
 			yyVAL.node = &ast.ScalarLnumber{
 				Position:  yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6344,7 +6351,7 @@ yydefault:
 		}
 	case 354:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3928
+		// line internal/php5/php5.y:3935
 		{
 			yyVAL.node = &ast.ScalarDnumber{
 				Position:  yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6354,7 +6361,7 @@ yydefault:
 		}
 	case 355:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3936
+		// line internal/php5/php5.y:3943
 		{
 			yyVAL.node = &ast.ScalarString{
 				Position:  yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6364,7 +6371,7 @@ yydefault:
 		}
 	case 356:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3944
+		// line internal/php5/php5.y:3951
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6374,7 +6381,7 @@ yydefault:
 		}
 	case 357:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3952
+		// line internal/php5/php5.y:3959
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6384,7 +6391,7 @@ yydefault:
 		}
 	case 358:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3960
+		// line internal/php5/php5.y:3967
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6394,7 +6401,7 @@ yydefault:
 		}
 	case 359:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3968
+		// line internal/php5/php5.y:3975
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6404,7 +6411,7 @@ yydefault:
 		}
 	case 360:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3976
+		// line internal/php5/php5.y:3983
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6414,7 +6421,7 @@ yydefault:
 		}
 	case 361:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3984
+		// line internal/php5/php5.y:3991
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6424,7 +6431,7 @@ yydefault:
 		}
 	case 362:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:3992
+		// line internal/php5/php5.y:3999
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6434,7 +6441,7 @@ yydefault:
 		}
 	case 363:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4000
+		// line internal/php5/php5.y:4007
 		{
 			yyVAL.node = &ast.ScalarHeredoc{
 				Position:       yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6451,7 +6458,7 @@ yydefault:
 		}
 	case 364:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:4015
+		// line internal/php5/php5.y:4022
 		{
 			yyVAL.node = &ast.ScalarHeredoc{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token),
@@ -6461,7 +6468,7 @@ yydefault:
 		}
 	case 365:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4026
+		// line internal/php5/php5.y:4033
 		{
 			yyVAL.node = &ast.ExprClassConstFetch{
 				Position:       yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
@@ -6476,25 +6483,25 @@ yydefault:
 		}
 	case 366:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4042
+		// line internal/php5/php5.y:4049
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 367:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4049
+		// line internal/php5/php5.y:4056
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 368:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4053
+		// line internal/php5/php5.y:4060
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 369:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4057
+		// line internal/php5/php5.y:4064
 		{
 			yyVAL.node = &ast.ExprConstFetch{
 				Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items),
@@ -6507,7 +6514,7 @@ yydefault:
 		}
 	case 370:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4068
+		// line internal/php5/php5.y:4075
 		{
 			yyVAL.node = &ast.ExprConstFetch{
 				Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ast.ParserSeparatedList).Items),
@@ -6522,7 +6529,7 @@ yydefault:
 		}
 	case 371:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:4081
+		// line internal/php5/php5.y:4088
 		{
 			yyVAL.node = &ast.ExprConstFetch{
 				Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items),
@@ -6536,7 +6543,7 @@ yydefault:
 		}
 	case 372:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:4093
+		// line internal/php5/php5.y:4100
 		{
 			yyVAL.node = &ast.ExprArray{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -6549,7 +6556,7 @@ yydefault:
 		}
 	case 373:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4104
+		// line internal/php5/php5.y:4111
 		{
 			yyVAL.node = &ast.ExprArray{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6561,13 +6568,13 @@ yydefault:
 		}
 	case 374:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4114
+		// line internal/php5/php5.y:4121
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 375:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4118
+		// line internal/php5/php5.y:4125
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6577,13 +6584,13 @@ yydefault:
 		}
 	case 376:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4126
+		// line internal/php5/php5.y:4133
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 377:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:4133
+		// line internal/php5/php5.y:4140
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token),
@@ -6595,7 +6602,7 @@ yydefault:
 		}
 	case 378:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4143
+		// line internal/php5/php5.y:4150
 		{
 			yyVAL.node = &ast.ExprBinaryPlus{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6606,7 +6613,7 @@ yydefault:
 		}
 	case 379:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4152
+		// line internal/php5/php5.y:4159
 		{
 			yyVAL.node = &ast.ExprBinaryMinus{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6617,7 +6624,7 @@ yydefault:
 		}
 	case 380:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4161
+		// line internal/php5/php5.y:4168
 		{
 			yyVAL.node = &ast.ExprBinaryMul{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6628,7 +6635,7 @@ yydefault:
 		}
 	case 381:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4170
+		// line internal/php5/php5.y:4177
 		{
 			yyVAL.node = &ast.ExprBinaryPow{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6639,7 +6646,7 @@ yydefault:
 		}
 	case 382:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4179
+		// line internal/php5/php5.y:4186
 		{
 			yyVAL.node = &ast.ExprBinaryDiv{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6650,7 +6657,7 @@ yydefault:
 		}
 	case 383:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4188
+		// line internal/php5/php5.y:4195
 		{
 			yyVAL.node = &ast.ExprBinaryMod{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6661,7 +6668,7 @@ yydefault:
 		}
 	case 384:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:4197
+		// line internal/php5/php5.y:4204
 		{
 			yyVAL.node = &ast.ExprBooleanNot{
 				Position:       yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -6671,7 +6678,7 @@ yydefault:
 		}
 	case 385:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:4205
+		// line internal/php5/php5.y:4212
 		{
 			yyVAL.node = &ast.ExprBitwiseNot{
 				Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -6681,7 +6688,7 @@ yydefault:
 		}
 	case 386:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4213
+		// line internal/php5/php5.y:4220
 		{
 			yyVAL.node = &ast.ExprBinaryBitwiseOr{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6692,7 +6699,7 @@ yydefault:
 		}
 	case 387:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4222
+		// line internal/php5/php5.y:4229
 		{
 			yyVAL.node = &ast.ExprBinaryBitwiseAnd{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6703,7 +6710,7 @@ yydefault:
 		}
 	case 388:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4231
+		// line internal/php5/php5.y:4238
 		{
 			yyVAL.node = &ast.ExprBinaryBitwiseXor{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6714,7 +6721,7 @@ yydefault:
 		}
 	case 389:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4240
+		// line internal/php5/php5.y:4247
 		{
 			yyVAL.node = &ast.ExprBinaryShiftLeft{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6725,7 +6732,7 @@ yydefault:
 		}
 	case 390:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4249
+		// line internal/php5/php5.y:4256
 		{
 			yyVAL.node = &ast.ExprBinaryShiftRight{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6736,7 +6743,7 @@ yydefault:
 		}
 	case 391:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4258
+		// line internal/php5/php5.y:4265
 		{
 			yyVAL.node = &ast.ExprBinaryConcat{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6747,7 +6754,7 @@ yydefault:
 		}
 	case 392:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4267
+		// line internal/php5/php5.y:4274
 		{
 			yyVAL.node = &ast.ExprBinaryLogicalXor{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6758,7 +6765,7 @@ yydefault:
 		}
 	case 393:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4276
+		// line internal/php5/php5.y:4283
 		{
 			yyVAL.node = &ast.ExprBinaryLogicalAnd{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6769,7 +6776,7 @@ yydefault:
 		}
 	case 394:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4285
+		// line internal/php5/php5.y:4292
 		{
 			yyVAL.node = &ast.ExprBinaryLogicalOr{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6780,7 +6787,7 @@ yydefault:
 		}
 	case 395:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4294
+		// line internal/php5/php5.y:4301
 		{
 			yyVAL.node = &ast.ExprBinaryBooleanAnd{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6791,7 +6798,7 @@ yydefault:
 		}
 	case 396:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4303
+		// line internal/php5/php5.y:4310
 		{
 			yyVAL.node = &ast.ExprBinaryBooleanOr{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6802,7 +6809,7 @@ yydefault:
 		}
 	case 397:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4312
+		// line internal/php5/php5.y:4319
 		{
 			yyVAL.node = &ast.ExprBinaryIdentical{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6813,7 +6820,7 @@ yydefault:
 		}
 	case 398:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4321
+		// line internal/php5/php5.y:4328
 		{
 			yyVAL.node = &ast.ExprBinaryNotIdentical{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6824,7 +6831,7 @@ yydefault:
 		}
 	case 399:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4330
+		// line internal/php5/php5.y:4337
 		{
 			yyVAL.node = &ast.ExprBinaryEqual{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6835,7 +6842,7 @@ yydefault:
 		}
 	case 400:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4339
+		// line internal/php5/php5.y:4346
 		{
 			yyVAL.node = &ast.ExprBinaryNotEqual{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6846,7 +6853,7 @@ yydefault:
 		}
 	case 401:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4348
+		// line internal/php5/php5.y:4355
 		{
 			yyVAL.node = &ast.ExprBinarySmaller{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6857,7 +6864,7 @@ yydefault:
 		}
 	case 402:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4357
+		// line internal/php5/php5.y:4364
 		{
 			yyVAL.node = &ast.ExprBinaryGreater{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6868,7 +6875,7 @@ yydefault:
 		}
 	case 403:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4366
+		// line internal/php5/php5.y:4373
 		{
 			yyVAL.node = &ast.ExprBinarySmallerOrEqual{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6879,7 +6886,7 @@ yydefault:
 		}
 	case 404:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4375
+		// line internal/php5/php5.y:4382
 		{
 			yyVAL.node = &ast.ExprBinaryGreaterOrEqual{
 				Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6890,7 +6897,7 @@ yydefault:
 		}
 	case 405:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:4384
+		// line internal/php5/php5.y:4391
 		{
 			yyVAL.node = &ast.ExprTernary{
 				Position:    yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node),
@@ -6902,7 +6909,7 @@ yydefault:
 		}
 	case 406:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		// line internal/php5/php5.y:4394
+		// line internal/php5/php5.y:4401
 		{
 			yyVAL.node = &ast.ExprTernary{
 				Position:    yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[5].node),
@@ -6915,7 +6922,7 @@ yydefault:
 		}
 	case 407:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:4405
+		// line internal/php5/php5.y:4412
 		{
 			yyVAL.node = &ast.ExprUnaryPlus{
 				Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -6925,7 +6932,7 @@ yydefault:
 		}
 	case 408:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:4413
+		// line internal/php5/php5.y:4420
 		{
 			yyVAL.node = &ast.ExprUnaryMinus{
 				Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -6935,7 +6942,7 @@ yydefault:
 		}
 	case 409:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4421
+		// line internal/php5/php5.y:4428
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6946,13 +6953,13 @@ yydefault:
 		}
 	case 410:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4433
+		// line internal/php5/php5.y:4440
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 411:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4437
+		// line internal/php5/php5.y:4444
 		{
 			yyVAL.node = &ast.ExprConstFetch{
 				Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items),
@@ -6965,7 +6972,7 @@ yydefault:
 		}
 	case 412:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4448
+		// line internal/php5/php5.y:4455
 		{
 			yyVAL.node = &ast.ExprConstFetch{
 				Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ast.ParserSeparatedList).Items),
@@ -6980,7 +6987,7 @@ yydefault:
 		}
 	case 413:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:4461
+		// line internal/php5/php5.y:4468
 		{
 			yyVAL.node = &ast.ExprConstFetch{
 				Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items),
@@ -6994,7 +7001,7 @@ yydefault:
 		}
 	case 414:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4476
+		// line internal/php5/php5.y:4483
 		{
 			yyVAL.node = &ast.ExprVariable{
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -7007,25 +7014,25 @@ yydefault:
 		}
 	case 415:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4487
+		// line internal/php5/php5.y:4494
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 416:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4491
+		// line internal/php5/php5.y:4498
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 417:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4495
+		// line internal/php5/php5.y:4502
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 418:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4499
+		// line internal/php5/php5.y:4506
 		{
 			yyVAL.node = &ast.ScalarEncapsed{
 				Position:      yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -7036,7 +7043,7 @@ yydefault:
 		}
 	case 419:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4508
+		// line internal/php5/php5.y:4515
 		{
 			yyVAL.node = &ast.ScalarHeredoc{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -7047,7 +7054,7 @@ yydefault:
 		}
 	case 420:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4517
+		// line internal/php5/php5.y:4524
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -7057,13 +7064,13 @@ yydefault:
 		}
 	case 421:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php5/php5.y:4528
+		// line internal/php5/php5.y:4535
 		{
 			yyVAL.node = &ast.ParserSeparatedList{}
 		}
 	case 422:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:4532
+		// line internal/php5/php5.y:4539
 		{
 			if yyDollar[2].token != nil {
 				yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token)
@@ -7074,19 +7081,19 @@ yydefault:
 		}
 	case 423:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php5/php5.y:4544
+		// line internal/php5/php5.y:4551
 		{
 			yyVAL.token = nil
 		}
 	case 424:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4548
+		// line internal/php5/php5.y:4555
 		{
 			yyVAL.token = yyDollar[1].token
 		}
 	case 425:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		// line internal/php5/php5.y:4555
+		// line internal/php5/php5.y:4562
 		{
 			arrayItem := &ast.ExprArrayItem{
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[3].node, yyDollar[5].node),
@@ -7102,7 +7109,7 @@ yydefault:
 		}
 	case 426:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4569
+		// line internal/php5/php5.y:4576
 		{
 			arrayItem := &ast.ExprArrayItem{
 				Position: yylex.(*Parser).builder.NewNodePosition(yyDollar[3].node),
@@ -7116,7 +7123,7 @@ yydefault:
 		}
 	case 427:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4581
+		// line internal/php5/php5.y:4588
 		{
 			yyVAL.node = &ast.ParserSeparatedList{
 				Items: []ast.Vertex{
@@ -7131,7 +7138,7 @@ yydefault:
 		}
 	case 428:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4594
+		// line internal/php5/php5.y:4601
 		{
 			yyVAL.node = &ast.ParserSeparatedList{
 				Items: []ast.Vertex{
@@ -7144,19 +7151,19 @@ yydefault:
 		}
 	case 429:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4608
+		// line internal/php5/php5.y:4615
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 430:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4612
+		// line internal/php5/php5.y:4619
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 431:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4619
+		// line internal/php5/php5.y:4626
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -7167,7 +7174,7 @@ yydefault:
 		}
 	case 432:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4628
+		// line internal/php5/php5.y:4635
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -7178,25 +7185,25 @@ yydefault:
 		}
 	case 433:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4641
+		// line internal/php5/php5.y:4648
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 434:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4649
+		// line internal/php5/php5.y:4656
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 435:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4656
+		// line internal/php5/php5.y:4663
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 436:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		// line internal/php5/php5.y:4663
+		// line internal/php5/php5.y:4670
 		{
 			yyVAL.node = yyDollar[1].node
 
@@ -7273,25 +7280,25 @@ yydefault:
 		}
 	case 437:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4738
+		// line internal/php5/php5.y:4745
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 438:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:4745
+		// line internal/php5/php5.y:4752
 		{
 			yyVAL.list = append(yyDollar[1].list, yyDollar[2].list...)
 		}
 	case 439:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php5/php5.y:4749
+		// line internal/php5/php5.y:4756
 		{
 			yyVAL.list = []ast.Vertex{}
 		}
 	case 440:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4757
+		// line internal/php5/php5.y:4764
 		{
 			yyDollar[2].list[0].(*ast.ExprPropertyFetch).ObjectOperatorTkn = yyDollar[1].token
 
@@ -7320,7 +7327,7 @@ yydefault:
 		}
 	case 441:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:4787
+		// line internal/php5/php5.y:4794
 		{
 			fetch := &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[2].token, yyDollar[4].token),
@@ -7334,7 +7341,7 @@ yydefault:
 		}
 	case 442:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:4799
+		// line internal/php5/php5.y:4806
 		{
 			fetch := &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[2].token, yyDollar[4].token),
@@ -7348,7 +7355,7 @@ yydefault:
 		}
 	case 443:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4814
+		// line internal/php5/php5.y:4821
 		{
 			yyVAL.node = &ast.ExprMethodCall{
 				Position:            yylex.(*Parser).builder.NewNodePosition(yyDollar[1].node),
@@ -7360,31 +7367,31 @@ yydefault:
 		}
 	case 444:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4827
+		// line internal/php5/php5.y:4834
 		{
 			yyVAL.list = []ast.Vertex{yyDollar[1].node}
 		}
 	case 445:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4831
+		// line internal/php5/php5.y:4838
 		{
 			yyVAL.list = yyDollar[1].list
 		}
 	case 446:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php5/php5.y:4835
+		// line internal/php5/php5.y:4842
 		{
 			yyVAL.list = nil
 		}
 	case 447:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4842
+		// line internal/php5/php5.y:4849
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 448:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:4846
+		// line internal/php5/php5.y:4853
 		{
 			for i := len(yyDollar[1].list) - 1; i >= 0; i-- {
 				yyDollar[1].list[i].(*ast.ExprVariable).VarName = yyDollar[2].node
@@ -7396,7 +7403,7 @@ yydefault:
 		}
 	case 449:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4859
+		// line internal/php5/php5.y:4866
 		{
 			yyVAL.node = &ast.ExprStaticPropertyFetch{
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -7407,7 +7414,7 @@ yydefault:
 		}
 	case 450:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:4868
+		// line internal/php5/php5.y:4875
 		{
 			yyVAL.node = &ast.ExprStaticPropertyFetch{
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -7418,13 +7425,13 @@ yydefault:
 		}
 	case 451:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4880
+		// line internal/php5/php5.y:4887
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 452:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:4887
+		// line internal/php5/php5.y:4894
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token),
@@ -7436,7 +7443,7 @@ yydefault:
 		}
 	case 453:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:4897
+		// line internal/php5/php5.y:4904
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token),
@@ -7448,31 +7455,31 @@ yydefault:
 		}
 	case 454:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4910
+		// line internal/php5/php5.y:4917
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 455:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4914
+		// line internal/php5/php5.y:4921
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 456:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4918
+		// line internal/php5/php5.y:4925
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 457:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4926
+		// line internal/php5/php5.y:4933
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 458:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:4930
+		// line internal/php5/php5.y:4937
 		{
 			for i := len(yyDollar[1].list) - 1; i >= 0; i-- {
 				yyDollar[1].list[i].(*ast.ExprVariable).VarName = yyDollar[2].node
@@ -7484,13 +7491,13 @@ yydefault:
 		}
 	case 459:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4940
+		// line internal/php5/php5.y:4947
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 460:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:4947
+		// line internal/php5/php5.y:4954
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token),
@@ -7502,7 +7509,7 @@ yydefault:
 		}
 	case 461:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:4957
+		// line internal/php5/php5.y:4964
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token),
@@ -7514,13 +7521,13 @@ yydefault:
 		}
 	case 462:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4967
+		// line internal/php5/php5.y:4974
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 463:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:4975
+		// line internal/php5/php5.y:4982
 		{
 			yyVAL.node = &ast.ExprVariable{
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -7533,7 +7540,7 @@ yydefault:
 		}
 	case 464:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:4986
+		// line internal/php5/php5.y:4993
 		{
 			yyVAL.node = &ast.ExprVariable{
 				Position:  yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -7548,25 +7555,25 @@ yydefault:
 		}
 	case 465:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php5/php5.y:5002
+		// line internal/php5/php5.y:5009
 		{
 			yyVAL.node = nil
 		}
 	case 466:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5006
+		// line internal/php5/php5.y:5013
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 467:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5014
+		// line internal/php5/php5.y:5021
 		{
 			yyVAL.list = yyDollar[1].list
 		}
 	case 468:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5018
+		// line internal/php5/php5.y:5025
 		{
 			yyVAL.list = []ast.Vertex{
 				&ast.ExprPropertyFetch{
@@ -7577,7 +7584,7 @@ yydefault:
 		}
 	case 469:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:5030
+		// line internal/php5/php5.y:5037
 		{
 			fetch := &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[2].token, yyDollar[4].token),
@@ -7591,7 +7598,7 @@ yydefault:
 		}
 	case 470:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:5042
+		// line internal/php5/php5.y:5049
 		{
 			fetch := &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[2].token, yyDollar[4].token),
@@ -7605,7 +7612,7 @@ yydefault:
 		}
 	case 471:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5054
+		// line internal/php5/php5.y:5061
 		{
 			yyVAL.list = []ast.Vertex{
 				&ast.ExprPropertyFetch{
@@ -7616,7 +7623,7 @@ yydefault:
 		}
 	case 472:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5066
+		// line internal/php5/php5.y:5073
 		{
 			yyVAL.node = &ast.Identifier{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -7626,7 +7633,7 @@ yydefault:
 		}
 	case 473:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:5074
+		// line internal/php5/php5.y:5081
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -7637,7 +7644,7 @@ yydefault:
 		}
 	case 474:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5086
+		// line internal/php5/php5.y:5093
 		{
 			yyVAL.list = []ast.Vertex{
 				&ast.ExprVariable{
@@ -7648,7 +7655,7 @@ yydefault:
 		}
 	case 475:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:5095
+		// line internal/php5/php5.y:5102
 		{
 			yyVAL.list = append(yyDollar[1].list, &ast.ExprVariable{
 				Position:  yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
@@ -7657,7 +7664,7 @@ yydefault:
 		}
 	case 476:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:5105
+		// line internal/php5/php5.y:5112
 		{
 			yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token)
 			yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node)
@@ -7666,7 +7673,7 @@ yydefault:
 		}
 	case 477:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5112
+		// line internal/php5/php5.y:5119
 		{
 			yyVAL.node = &ast.ParserSeparatedList{
 				Items: []ast.Vertex{yyDollar[1].node},
@@ -7674,7 +7681,7 @@ yydefault:
 		}
 	case 478:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5122
+		// line internal/php5/php5.y:5129
 		{
 			yyVAL.node = &ast.ExprArrayItem{
 				Position: yylex.(*Parser).builder.NewNodePosition(yyDollar[1].node),
@@ -7683,7 +7690,7 @@ yydefault:
 		}
 	case 479:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:5129
+		// line internal/php5/php5.y:5136
 		{
 			pairList := yyDollar[3].node.(*ast.ParserSeparatedList)
 			fistPair := pairList.Items[0].(*ast.ExprArrayItem)
@@ -7706,19 +7713,19 @@ yydefault:
 		}
 	case 480:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php5/php5.y:5150
+		// line internal/php5/php5.y:5157
 		{
 			yyVAL.node = &ast.ExprArrayItem{}
 		}
 	case 481:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php5/php5.y:5158
+		// line internal/php5/php5.y:5165
 		{
 			yyVAL.node = &ast.ParserSeparatedList{}
 		}
 	case 482:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:5162
+		// line internal/php5/php5.y:5169
 		{
 			if yyDollar[2].token != nil {
 				yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token)
@@ -7729,7 +7736,7 @@ yydefault:
 		}
 	case 483:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		// line internal/php5/php5.y:5174
+		// line internal/php5/php5.y:5181
 		{
 			arrayItem := &ast.ExprArrayItem{
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[3].node, yyDollar[5].node),
@@ -7745,7 +7752,7 @@ yydefault:
 		}
 	case 484:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:5188
+		// line internal/php5/php5.y:5195
 		{
 			arrayItem := &ast.ExprArrayItem{
 				Position: yylex.(*Parser).builder.NewNodePosition(yyDollar[3].node),
@@ -7759,7 +7766,7 @@ yydefault:
 		}
 	case 485:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:5200
+		// line internal/php5/php5.y:5207
 		{
 			yyVAL.node = &ast.ParserSeparatedList{
 				Items: []ast.Vertex{
@@ -7774,7 +7781,7 @@ yydefault:
 		}
 	case 486:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5213
+		// line internal/php5/php5.y:5220
 		{
 			yyVAL.node = &ast.ParserSeparatedList{
 				Items: []ast.Vertex{
@@ -7787,7 +7794,7 @@ yydefault:
 		}
 	case 487:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		// line internal/php5/php5.y:5224
+		// line internal/php5/php5.y:5231
 		{
 			arrayItem := &ast.ExprArrayItem{
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[3].node, yyDollar[6].node),
@@ -7807,7 +7814,7 @@ yydefault:
 		}
 	case 488:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:5242
+		// line internal/php5/php5.y:5249
 		{
 			arrayItem := &ast.ExprArrayItem{
 				Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[3].token, yyDollar[4].node),
@@ -7825,7 +7832,7 @@ yydefault:
 		}
 	case 489:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:5258
+		// line internal/php5/php5.y:5265
 		{
 			yyVAL.node = &ast.ParserSeparatedList{
 				Items: []ast.Vertex{
@@ -7844,7 +7851,7 @@ yydefault:
 		}
 	case 490:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:5275
+		// line internal/php5/php5.y:5282
 		{
 			yyVAL.node = &ast.ParserSeparatedList{
 				Items: []ast.Vertex{
@@ -7861,13 +7868,13 @@ yydefault:
 		}
 	case 491:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:5293
+		// line internal/php5/php5.y:5300
 		{
 			yyVAL.list = append(yyDollar[1].list, yyDollar[2].node)
 		}
 	case 492:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:5297
+		// line internal/php5/php5.y:5304
 		{
 			yyVAL.list = append(
 				yyDollar[1].list,
@@ -7880,13 +7887,13 @@ yydefault:
 		}
 	case 493:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5308
+		// line internal/php5/php5.y:5315
 		{
 			yyVAL.list = []ast.Vertex{yyDollar[1].node}
 		}
 	case 494:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:5312
+		// line internal/php5/php5.y:5319
 		{
 			yyVAL.list = []ast.Vertex{
 				&ast.ScalarEncapsedStringPart{
@@ -7899,7 +7906,7 @@ yydefault:
 		}
 	case 495:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5326
+		// line internal/php5/php5.y:5333
 		{
 			yyVAL.node = &ast.ExprVariable{
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -7912,7 +7919,7 @@ yydefault:
 		}
 	case 496:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:5337
+		// line internal/php5/php5.y:5344
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -7931,7 +7938,7 @@ yydefault:
 		}
 	case 497:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:5354
+		// line internal/php5/php5.y:5361
 		{
 			yyVAL.node = &ast.ExprPropertyFetch{
 				Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -7953,7 +7960,7 @@ yydefault:
 		}
 	case 498:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:5374
+		// line internal/php5/php5.y:5381
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:       yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -7967,7 +7974,7 @@ yydefault:
 		}
 	case 499:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:5386
+		// line internal/php5/php5.y:5393
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:       yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -7985,7 +7992,7 @@ yydefault:
 		}
 	case 500:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		// line internal/php5/php5.y:5402
+		// line internal/php5/php5.y:5409
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:       yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[6].token),
@@ -8009,7 +8016,7 @@ yydefault:
 		}
 	case 501:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:5424
+		// line internal/php5/php5.y:5431
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -8020,7 +8027,7 @@ yydefault:
 		}
 	case 502:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5436
+		// line internal/php5/php5.y:5443
 		{
 			yyVAL.node = &ast.ScalarString{
 				Position:  yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -8030,7 +8037,7 @@ yydefault:
 		}
 	case 503:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5444
+		// line internal/php5/php5.y:5451
 		{
 			// TODO: add option to handle 64 bit integer
 			if _, err := strconv.Atoi(string(yyDollar[1].token.Value)); err == nil {
@@ -8049,7 +8056,7 @@ yydefault:
 		}
 	case 504:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5461
+		// line internal/php5/php5.y:5468
 		{
 			yyVAL.node = &ast.ExprVariable{
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -8062,7 +8069,7 @@ yydefault:
 		}
 	case 505:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:5475
+		// line internal/php5/php5.y:5482
 		{
 			yyVAL.node = &ast.ExprIsset{
 				Position:            yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -8075,7 +8082,7 @@ yydefault:
 		}
 	case 506:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:5486
+		// line internal/php5/php5.y:5493
 		{
 			yyVAL.node = &ast.ExprEmpty{
 				Position:            yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -8087,7 +8094,7 @@ yydefault:
 		}
 	case 507:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:5496
+		// line internal/php5/php5.y:5503
 		{
 			yyVAL.node = &ast.ExprEmpty{
 				Position:            yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -8099,7 +8106,7 @@ yydefault:
 		}
 	case 508:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:5506
+		// line internal/php5/php5.y:5513
 		{
 			yyVAL.node = &ast.ExprInclude{
 				Position:   yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -8109,7 +8116,7 @@ yydefault:
 		}
 	case 509:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:5514
+		// line internal/php5/php5.y:5521
 		{
 			yyVAL.node = &ast.ExprIncludeOnce{
 				Position:   yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -8119,7 +8126,7 @@ yydefault:
 		}
 	case 510:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php5/php5.y:5522
+		// line internal/php5/php5.y:5529
 		{
 			yyVAL.node = &ast.ExprEval{
 				Position:            yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -8131,7 +8138,7 @@ yydefault:
 		}
 	case 511:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:5532
+		// line internal/php5/php5.y:5539
 		{
 			yyVAL.node = &ast.ExprRequire{
 				Position:   yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -8141,7 +8148,7 @@ yydefault:
 		}
 	case 512:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php5/php5.y:5540
+		// line internal/php5/php5.y:5547
 		{
 			yyVAL.node = &ast.ExprRequireOnce{
 				Position:       yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -8151,7 +8158,7 @@ yydefault:
 		}
 	case 513:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5551
+		// line internal/php5/php5.y:5558
 		{
 			yyVAL.node = &ast.ParserSeparatedList{
 				Items: []ast.Vertex{yyDollar[1].node},
@@ -8159,7 +8166,7 @@ yydefault:
 		}
 	case 514:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:5557
+		// line internal/php5/php5.y:5564
 		{
 			yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token)
 			yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node)
@@ -8168,19 +8175,19 @@ yydefault:
 		}
 	case 515:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5567
+		// line internal/php5/php5.y:5574
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 516:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php5/php5.y:5571
+		// line internal/php5/php5.y:5578
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 517:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:5578
+		// line internal/php5/php5.y:5585
 		{
 			yyVAL.node = &ast.ExprClassConstFetch{
 				Position:       yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
@@ -8195,7 +8202,7 @@ yydefault:
 		}
 	case 518:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:5591
+		// line internal/php5/php5.y:5598
 		{
 			yyVAL.node = &ast.ExprClassConstFetch{
 				Position:       yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
@@ -8210,7 +8217,7 @@ yydefault:
 		}
 	case 519:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:5607
+		// line internal/php5/php5.y:5614
 		{
 			yyVAL.node = &ast.ExprClassConstFetch{
 				Position:       yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
@@ -8225,7 +8232,7 @@ yydefault:
 		}
 	case 520:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php5/php5.y:5623
+		// line internal/php5/php5.y:5630
 		{
 			yyVAL.node = &ast.ExprClassConstFetch{
 				Position:       yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
diff --git a/internal/php5/php5.y b/internal/php5/php5.y
index 7867d5c..50edcc3 100644
--- a/internal/php5/php5.y
+++ b/internal/php5/php5.y
@@ -3367,36 +3367,38 @@ expr_without_variable:
             }
     |   function is_reference '(' parameter_list ')' lexical_vars '{' inner_statement_list '}'
             {
-                $$ = &ast.ExprClosure{
-                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $9),
-                    FunctionTkn:          $1,
-                    AmpersandTkn:         $2,
-                    OpenParenthesisTkn:   $3,
-                    Params:               $4.(*ast.ParserSeparatedList).Items,
-                    SeparatorTkns:        $4.(*ast.ParserSeparatedList).SeparatorTkns,
-                    CloseParenthesisTkn:  $5,
-                    ClosureUse:           $6,
-                    OpenCurlyBracketTkn:  $7,
-                    Stmts:                $8,
-                    CloseCurlyBracketTkn: $9,
-                }
+                closure := $6.(*ast.ExprClosure)
+
+                closure.Position             = yylex.(*Parser).builder.NewTokensPosition($1, $9)
+                closure.FunctionTkn          = $1
+                closure.AmpersandTkn         = $2
+                closure.OpenParenthesisTkn   = $3
+                closure.Params               = $4.(*ast.ParserSeparatedList).Items
+                closure.SeparatorTkns        = $4.(*ast.ParserSeparatedList).SeparatorTkns
+                closure.CloseParenthesisTkn  = $5
+                closure.OpenCurlyBracketTkn  = $7
+                closure.Stmts                = $8
+                closure.CloseCurlyBracketTkn = $9
+
+                $$ = closure
             }
     |   T_STATIC function is_reference '(' parameter_list ')' lexical_vars '{' inner_statement_list '}'
             {
-                $$ = &ast.ExprClosure{
-                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $10),
-                    StaticTkn:            $1,
-                    FunctionTkn:          $2,
-                    AmpersandTkn:         $3,
-                    OpenParenthesisTkn:   $4,
-                    Params:               $5.(*ast.ParserSeparatedList).Items,
-                    SeparatorTkns:        $5.(*ast.ParserSeparatedList).SeparatorTkns,
-                    CloseParenthesisTkn:  $6,
-                    ClosureUse:           $7,
-                    OpenCurlyBracketTkn:  $8,
-                    Stmts:                $9,
-                    CloseCurlyBracketTkn: $10,
-                }
+                closure := $7.(*ast.ExprClosure)
+                
+                closure.Position             = yylex.(*Parser).builder.NewTokensPosition($1, $10)
+                closure.StaticTkn            = $1
+                closure.FunctionTkn          = $2
+                closure.AmpersandTkn         = $3
+                closure.OpenParenthesisTkn   = $4
+                closure.Params               = $5.(*ast.ParserSeparatedList).Items
+                closure.SeparatorTkns        = $5.(*ast.ParserSeparatedList).SeparatorTkns
+                closure.CloseParenthesisTkn  = $6
+                closure.OpenCurlyBracketTkn  = $8
+                closure.Stmts                = $9
+                closure.CloseCurlyBracketTkn = $10
+
+                $$ = closure
             }
 ;
 
@@ -3520,17 +3522,16 @@ function:
 lexical_vars:
         /* empty */
             {
-                $$ = nil
+                $$ = &ast.ExprClosure{}
             }
     |   T_USE '(' lexical_var_list ')'
             {
-                $$ = &ast.ExprClosureUse{
-                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
-                    UseTkn:              $1,
-                    OpenParenthesisTkn:  $2,
-                    Uses:                $3.(*ast.ParserSeparatedList).Items,
-                    SeparatorTkns:       $3.(*ast.ParserSeparatedList).SeparatorTkns,
-                    CloseParenthesisTkn: $4,
+                $$ = &ast.ExprClosure{
+                    UseTkn:                 $1,
+                    UseOpenParenthesisTkn:  $2,
+                    Use:                    $3.(*ast.ParserSeparatedList).Items,
+                    UseSeparatorTkns:       $3.(*ast.ParserSeparatedList).SeparatorTkns,
+                    UseCloseParenthesisTkn: $4,
                 }
             }
 ;
@@ -3538,12 +3539,15 @@ lexical_vars:
 lexical_var_list:
         lexical_var_list ',' T_VARIABLE
             {
-                variable := &ast.ExprVariable{
+                variable := &ast.ExprClosureUse{
                     Position: yylex.(*Parser).builder.NewTokenPosition($3),
-                    VarName: &ast.Identifier{
+                    Var: &ast.ExprVariable{
                         Position: yylex.(*Parser).builder.NewTokenPosition($3),
-                        IdentifierTkn: $3,
-                        Value:         $3.Value,
+                        VarName: &ast.Identifier{
+                            Position: yylex.(*Parser).builder.NewTokenPosition($3),
+                            IdentifierTkn: $3,
+                            Value:         $3.Value,
+                        },
                     },
                 }
 
@@ -3554,7 +3558,7 @@ lexical_var_list:
             }
     |   lexical_var_list ',' '&' T_VARIABLE
             {
-                reference := &ast.ExprReference{
+                variable := &ast.ExprClosureUse{
                     Position: yylex.(*Parser).builder.NewTokensPosition($3, $4),
                     AmpersandTkn: $3,
                     Var: &ast.ExprVariable{
@@ -3568,43 +3572,46 @@ lexical_var_list:
                 }
 
                 $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2)
-                $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, reference)
+                $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, variable)
 
                 $$ = $1
             }
     |   T_VARIABLE
             {
-                $$ = &ast.ParserSeparatedList{
-                    Items: []ast.Vertex{
-                        &ast.ExprVariable{
+                variable := &ast.ExprClosureUse{
+                    Position: yylex.(*Parser).builder.NewTokenPosition($1),
+                    Var: &ast.ExprVariable{
+                        Position: yylex.(*Parser).builder.NewTokenPosition($1),
+                        VarName: &ast.Identifier{
                             Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                            VarName: &ast.Identifier{
-                                Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                                IdentifierTkn: $1,
-                                Value:         $1.Value,
-                            },
+                            IdentifierTkn: $1,
+                            Value:         $1.Value,
                         },
                     },
                 }
+
+                $$ = &ast.ParserSeparatedList{
+                    Items: []ast.Vertex{ variable },
+                }
             }
     |   '&' T_VARIABLE
             {
-                $$ = &ast.ParserSeparatedList{
-                    Items: []ast.Vertex{
-                        &ast.ExprReference{
-                            Position: yylex.(*Parser).builder.NewTokensPosition($1, $2),
-                            AmpersandTkn: $1,
-                            Var: &ast.ExprVariable{
-                                Position: yylex.(*Parser).builder.NewTokenPosition($2),
-                                VarName: &ast.Identifier{
-                                    Position: yylex.(*Parser).builder.NewTokenPosition($2),
-                                    IdentifierTkn: $2,
-                                    Value:         $2.Value,
-                                },
-                            },
+                variable := &ast.ExprClosureUse{
+                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $2),
+                    AmpersandTkn: $1,
+                    Var: &ast.ExprVariable{
+                        Position: yylex.(*Parser).builder.NewTokenPosition($2),
+                        VarName: &ast.Identifier{
+                            Position: yylex.(*Parser).builder.NewTokenPosition($2),
+                            IdentifierTkn: $2,
+                            Value:         $2.Value,
                         },
                     },
                 }
+
+                $$ = &ast.ParserSeparatedList{
+                    Items: []ast.Vertex{ variable },
+                }
             }
 ;
 
diff --git a/internal/php7/parser_test.go b/internal/php7/parser_test.go
index 76706ed..c33bafd 100644
--- a/internal/php7/parser_test.go
+++ b/internal/php7/parser_test.go
@@ -36268,7 +36268,7 @@ func TestExprClosure_Use(t *testing.T) {
 						EndPos:    36,
 					},
 					FunctionTkn: &token.Token{
-						ID:    token.T_FUNCTION,
+						ID: token.T_FUNCTION,
 						Value: []byte("function"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -36278,7 +36278,7 @@ func TestExprClosure_Use(t *testing.T) {
 						},
 						FreeFloating: []*token.Token{
 							{
-								ID:    token.T_OPEN_TAG,
+								ID: token.T_OPEN_TAG,
 								Value: []byte("<?"),
 								Position: &position.Position{
 									StartLine: 1,
@@ -36288,7 +36288,7 @@ func TestExprClosure_Use(t *testing.T) {
 								},
 							},
 							{
-								ID:    token.T_WHITESPACE,
+								ID: token.T_WHITESPACE,
 								Value: []byte(" "),
 								Position: &position.Position{
 									StartLine: 1,
@@ -36300,7 +36300,7 @@ func TestExprClosure_Use(t *testing.T) {
 						},
 					},
 					OpenParenthesisTkn: &token.Token{
-						ID:    token.ID(40),
+						ID: token.ID(40),
 						Value: []byte("("),
 						Position: &position.Position{
 							StartLine: 1,
@@ -36332,7 +36332,7 @@ func TestExprClosure_Use(t *testing.T) {
 										EndPos:    14,
 									},
 									IdentifierTkn: &token.Token{
-										ID:    token.T_VARIABLE,
+										ID: token.T_VARIABLE,
 										Value: []byte("$a"),
 										Position: &position.Position{
 											StartLine: 1,
@@ -36367,7 +36367,7 @@ func TestExprClosure_Use(t *testing.T) {
 										EndPos:    18,
 									},
 									IdentifierTkn: &token.Token{
-										ID:    token.T_VARIABLE,
+										ID: token.T_VARIABLE,
 										Value: []byte("$b"),
 										Position: &position.Position{
 											StartLine: 1,
@@ -36377,7 +36377,7 @@ func TestExprClosure_Use(t *testing.T) {
 										},
 										FreeFloating: []*token.Token{
 											{
-												ID:    token.T_WHITESPACE,
+												ID: token.T_WHITESPACE,
 												Value: []byte(" "),
 												Position: &position.Position{
 													StartLine: 1,
@@ -36395,7 +36395,7 @@ func TestExprClosure_Use(t *testing.T) {
 					},
 					SeparatorTkns: []*token.Token{
 						{
-							ID:    token.ID(44),
+							ID: token.ID(44),
 							Value: []byte(","),
 							Position: &position.Position{
 								StartLine: 1,
@@ -36406,7 +36406,7 @@ func TestExprClosure_Use(t *testing.T) {
 						},
 					},
 					CloseParenthesisTkn: &token.Token{
-						ID:    token.ID(41),
+						ID: token.ID(41),
 						Value: []byte(")"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -36415,59 +36415,59 @@ func TestExprClosure_Use(t *testing.T) {
 							EndPos:    19,
 						},
 					},
-					ClosureUse: &ast.ExprClosureUse{
+					UseTkn: &token.Token{
+						ID: token.T_USE,
+						Value: []byte("use"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  20,
-							EndPos:    33,
+							EndPos:    23,
 						},
-						UseTkn: &token.Token{
-							ID:    token.T_USE,
-							Value: []byte("use"),
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  20,
-								EndPos:    23,
-							},
-							FreeFloating: []*token.Token{
-								{
-									ID:    token.T_WHITESPACE,
-									Value: []byte(" "),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  19,
-										EndPos:    20,
-									},
+						FreeFloating: []*token.Token{
+							{
+								ID: token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  19,
+									EndPos:    20,
 								},
 							},
 						},
-						OpenParenthesisTkn: &token.Token{
-							ID:    token.ID(40),
-							Value: []byte("("),
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  24,
-								EndPos:    25,
-							},
-							FreeFloating: []*token.Token{
-								{
-									ID:    token.T_WHITESPACE,
-									Value: []byte(" "),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  23,
-										EndPos:    24,
-									},
+					},
+					UseOpenParenthesisTkn: &token.Token{
+						ID: token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  24,
+							EndPos:    25,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID: token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
+									EndPos:    24,
 								},
 							},
 						},
-						Uses: []ast.Vertex{
-							&ast.ExprVariable{
+					},
+					Use: []ast.Vertex{
+						&ast.ExprClosureUse{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  25,
+								EndPos:    27,
+							},
+							Var: &ast.ExprVariable{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -36482,7 +36482,7 @@ func TestExprClosure_Use(t *testing.T) {
 										EndPos:    27,
 									},
 									IdentifierTkn: &token.Token{
-										ID:    token.T_VARIABLE,
+										ID: token.T_VARIABLE,
 										Value: []byte("$c"),
 										Position: &position.Position{
 											StartLine: 1,
@@ -36494,89 +36494,89 @@ func TestExprClosure_Use(t *testing.T) {
 									Value: []byte("$c"),
 								},
 							},
-							&ast.ExprReference{
+						},
+						&ast.ExprClosureUse{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  29,
+								EndPos:    32,
+							},
+							AmpersandTkn: &token.Token{
+								ID: token.ID(38),
+								Value: []byte("&"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  29,
-									EndPos:    32,
+									EndPos:    30,
 								},
-								AmpersandTkn: &token.Token{
-									ID:    token.ID(38),
-									Value: []byte("&"),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  29,
-										EndPos:    30,
-									},
-									FreeFloating: []*token.Token{
-										{
-											ID:    token.T_WHITESPACE,
-											Value: []byte(" "),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  28,
-												EndPos:    29,
-											},
+								FreeFloating: []*token.Token{
+									{
+										ID: token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  28,
+											EndPos:    29,
 										},
 									},
 								},
-								Var: &ast.ExprVariable{
+							},
+							Var: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  30,
+									EndPos:    32,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  30,
 										EndPos:    32,
 									},
-									VarName: &ast.Identifier{
+									IdentifierTkn: &token.Token{
+										ID: token.T_VARIABLE,
+										Value: []byte("$d"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
 											EndPos:    32,
 										},
-										IdentifierTkn: &token.Token{
-											ID:    token.T_VARIABLE,
-											Value: []byte("$d"),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  30,
-												EndPos:    32,
-											},
-										},
-										Value: []byte("$d"),
 									},
+									Value: []byte("$d"),
 								},
 							},
 						},
-						SeparatorTkns: []*token.Token{
-							{
-								ID:    token.ID(44),
-								Value: []byte(","),
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  27,
-									EndPos:    28,
-								},
-							},
-						},
-						CloseParenthesisTkn: &token.Token{
-							ID:    token.ID(41),
-							Value: []byte(")"),
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  32,
-								EndPos:    33,
-							},
-						},
+					},
+					UseSeparatorTkns: []*token.Token{
+						{
+							ID: token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  27,
+								EndPos:    28,
+							},
+						},
+					},
+					UseCloseParenthesisTkn: &token.Token{
+						ID: token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  32,
+							EndPos:    33,
+						},
 					},
 					OpenCurlyBracketTkn: &token.Token{
-						ID:    token.ID(123),
+						ID: token.ID(123),
 						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -36586,7 +36586,7 @@ func TestExprClosure_Use(t *testing.T) {
 						},
 						FreeFloating: []*token.Token{
 							{
-								ID:    token.T_WHITESPACE,
+								ID: token.T_WHITESPACE,
 								Value: []byte(" "),
 								Position: &position.Position{
 									StartLine: 1,
@@ -36599,7 +36599,7 @@ func TestExprClosure_Use(t *testing.T) {
 					},
 					Stmts: []ast.Vertex{},
 					CloseCurlyBracketTkn: &token.Token{
-						ID:    token.ID(125),
+						ID: token.ID(125),
 						Value: []byte("}"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -36610,7 +36610,7 @@ func TestExprClosure_Use(t *testing.T) {
 					},
 				},
 				SemiColonTkn: &token.Token{
-					ID:    token.ID(59),
+					ID: token.ID(59),
 					Value: []byte(";"),
 					Position: &position.Position{
 						StartLine: 1,
@@ -36621,7 +36621,8 @@ func TestExprClosure_Use(t *testing.T) {
 				},
 			},
 		},
-		EndTkn: &token.Token{},
+		EndTkn: &token.Token{
+		},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
@@ -36657,7 +36658,7 @@ func TestExprClosure_Use2(t *testing.T) {
 						EndPos:    36,
 					},
 					FunctionTkn: &token.Token{
-						ID:    token.T_FUNCTION,
+						ID: token.T_FUNCTION,
 						Value: []byte("function"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -36667,7 +36668,7 @@ func TestExprClosure_Use2(t *testing.T) {
 						},
 						FreeFloating: []*token.Token{
 							{
-								ID:    token.T_OPEN_TAG,
+								ID: token.T_OPEN_TAG,
 								Value: []byte("<?"),
 								Position: &position.Position{
 									StartLine: 1,
@@ -36677,7 +36678,7 @@ func TestExprClosure_Use2(t *testing.T) {
 								},
 							},
 							{
-								ID:    token.T_WHITESPACE,
+								ID: token.T_WHITESPACE,
 								Value: []byte(" "),
 								Position: &position.Position{
 									StartLine: 1,
@@ -36689,7 +36690,7 @@ func TestExprClosure_Use2(t *testing.T) {
 						},
 					},
 					OpenParenthesisTkn: &token.Token{
-						ID:    token.ID(40),
+						ID: token.ID(40),
 						Value: []byte("("),
 						Position: &position.Position{
 							StartLine: 1,
@@ -36721,7 +36722,7 @@ func TestExprClosure_Use2(t *testing.T) {
 										EndPos:    14,
 									},
 									IdentifierTkn: &token.Token{
-										ID:    token.T_VARIABLE,
+										ID: token.T_VARIABLE,
 										Value: []byte("$a"),
 										Position: &position.Position{
 											StartLine: 1,
@@ -36756,7 +36757,7 @@ func TestExprClosure_Use2(t *testing.T) {
 										EndPos:    18,
 									},
 									IdentifierTkn: &token.Token{
-										ID:    token.T_VARIABLE,
+										ID: token.T_VARIABLE,
 										Value: []byte("$b"),
 										Position: &position.Position{
 											StartLine: 1,
@@ -36766,7 +36767,7 @@ func TestExprClosure_Use2(t *testing.T) {
 										},
 										FreeFloating: []*token.Token{
 											{
-												ID:    token.T_WHITESPACE,
+												ID: token.T_WHITESPACE,
 												Value: []byte(" "),
 												Position: &position.Position{
 													StartLine: 1,
@@ -36784,7 +36785,7 @@ func TestExprClosure_Use2(t *testing.T) {
 					},
 					SeparatorTkns: []*token.Token{
 						{
-							ID:    token.ID(44),
+							ID: token.ID(44),
 							Value: []byte(","),
 							Position: &position.Position{
 								StartLine: 1,
@@ -36795,7 +36796,7 @@ func TestExprClosure_Use2(t *testing.T) {
 						},
 					},
 					CloseParenthesisTkn: &token.Token{
-						ID:    token.ID(41),
+						ID: token.ID(41),
 						Value: []byte(")"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -36804,104 +36805,104 @@ func TestExprClosure_Use2(t *testing.T) {
 							EndPos:    19,
 						},
 					},
-					ClosureUse: &ast.ExprClosureUse{
+					UseTkn: &token.Token{
+						ID: token.T_USE,
+						Value: []byte("use"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  20,
-							EndPos:    33,
+							EndPos:    23,
 						},
-						UseTkn: &token.Token{
-							ID:    token.T_USE,
-							Value: []byte("use"),
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  20,
-								EndPos:    23,
-							},
-							FreeFloating: []*token.Token{
-								{
-									ID:    token.T_WHITESPACE,
-									Value: []byte(" "),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  19,
-										EndPos:    20,
-									},
+						FreeFloating: []*token.Token{
+							{
+								ID: token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  19,
+									EndPos:    20,
 								},
 							},
 						},
-						OpenParenthesisTkn: &token.Token{
-							ID:    token.ID(40),
-							Value: []byte("("),
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  24,
-								EndPos:    25,
-							},
-							FreeFloating: []*token.Token{
-								{
-									ID:    token.T_WHITESPACE,
-									Value: []byte(" "),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  23,
-										EndPos:    24,
-									},
+					},
+					UseOpenParenthesisTkn: &token.Token{
+						ID: token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  24,
+							EndPos:    25,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID: token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
+									EndPos:    24,
 								},
 							},
 						},
-						Uses: []ast.Vertex{
-							&ast.ExprReference{
+					},
+					Use: []ast.Vertex{
+						&ast.ExprClosureUse{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  25,
+								EndPos:    28,
+							},
+							AmpersandTkn: &token.Token{
+								ID: token.ID(38),
+								Value: []byte("&"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  25,
+									EndPos:    26,
+								},
+							},
+							Var: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  26,
 									EndPos:    28,
 								},
-								AmpersandTkn: &token.Token{
-									ID:    token.ID(38),
-									Value: []byte("&"),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  25,
-										EndPos:    26,
-									},
-								},
-								Var: &ast.ExprVariable{
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  26,
 										EndPos:    28,
 									},
-									VarName: &ast.Identifier{
+									IdentifierTkn: &token.Token{
+										ID: token.T_VARIABLE,
+										Value: []byte("$c"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  26,
 											EndPos:    28,
 										},
-										IdentifierTkn: &token.Token{
-											ID:    token.T_VARIABLE,
-											Value: []byte("$c"),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  26,
-												EndPos:    28,
-											},
-										},
-										Value: []byte("$c"),
 									},
+									Value: []byte("$c"),
 								},
 							},
-							&ast.ExprVariable{
+						},
+						&ast.ExprClosureUse{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  30,
+								EndPos:    32,
+							},
+							Var: &ast.ExprVariable{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -36916,7 +36917,7 @@ func TestExprClosure_Use2(t *testing.T) {
 										EndPos:    32,
 									},
 									IdentifierTkn: &token.Token{
-										ID:    token.T_VARIABLE,
+										ID: token.T_VARIABLE,
 										Value: []byte("$d"),
 										Position: &position.Position{
 											StartLine: 1,
@@ -36926,7 +36927,7 @@ func TestExprClosure_Use2(t *testing.T) {
 										},
 										FreeFloating: []*token.Token{
 											{
-												ID:    token.T_WHITESPACE,
+												ID: token.T_WHITESPACE,
 												Value: []byte(" "),
 												Position: &position.Position{
 													StartLine: 1,
@@ -36941,31 +36942,31 @@ func TestExprClosure_Use2(t *testing.T) {
 								},
 							},
 						},
-						SeparatorTkns: []*token.Token{
-							{
-								ID:    token.ID(44),
-								Value: []byte(","),
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  28,
-									EndPos:    29,
-								},
-							},
-						},
-						CloseParenthesisTkn: &token.Token{
-							ID:    token.ID(41),
-							Value: []byte(")"),
+					},
+					UseSeparatorTkns: []*token.Token{
+						{
+							ID: token.ID(44),
+							Value: []byte(","),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
-								StartPos:  32,
-								EndPos:    33,
+								StartPos:  28,
+								EndPos:    29,
 							},
 						},
 					},
+					UseCloseParenthesisTkn: &token.Token{
+						ID: token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  32,
+							EndPos:    33,
+						},
+					},
 					OpenCurlyBracketTkn: &token.Token{
-						ID:    token.ID(123),
+						ID: token.ID(123),
 						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -36975,7 +36976,7 @@ func TestExprClosure_Use2(t *testing.T) {
 						},
 						FreeFloating: []*token.Token{
 							{
-								ID:    token.T_WHITESPACE,
+								ID: token.T_WHITESPACE,
 								Value: []byte(" "),
 								Position: &position.Position{
 									StartLine: 1,
@@ -36988,7 +36989,7 @@ func TestExprClosure_Use2(t *testing.T) {
 					},
 					Stmts: []ast.Vertex{},
 					CloseCurlyBracketTkn: &token.Token{
-						ID:    token.ID(125),
+						ID: token.ID(125),
 						Value: []byte("}"),
 						Position: &position.Position{
 							StartLine: 1,
@@ -36999,7 +37000,7 @@ func TestExprClosure_Use2(t *testing.T) {
 					},
 				},
 				SemiColonTkn: &token.Token{
-					ID:    token.ID(59),
+					ID: token.ID(59),
 					Value: []byte(";"),
 					Position: &position.Position{
 						StartLine: 1,
@@ -37010,7 +37011,8 @@ func TestExprClosure_Use2(t *testing.T) {
 				},
 			},
 		},
-		EndTkn: &token.Token{},
+		EndTkn: &token.Token{
+		},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
diff --git a/internal/php7/php7.go b/internal/php7/php7.go
index 3c139f2..c93a65c 100644
--- a/internal/php7/php7.go
+++ b/internal/php7/php7.go
@@ -339,7 +339,7 @@ const yyEofCode = 1
 const yyErrCode = 2
 const yyInitialStackSize = 16
 
-// line internal/php7/php7.y:4342
+// line internal/php7/php7.y:4345
 
 // line yacctab:1
 var yyExca = [...]int{
@@ -5767,25 +5767,26 @@ yydefault:
 		yyDollar = yyS[yypt-11 : yypt+1]
 		// line internal/php7/php7.y:3180
 		{
-			yyVAL.node = &ast.ExprClosure{
-				Position:             yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[11].token),
-				FunctionTkn:          yyDollar[1].token,
-				AmpersandTkn:         yyDollar[2].token,
-				OpenParenthesisTkn:   yyDollar[4].token,
-				Params:               yyDollar[5].node.(*ast.ParserSeparatedList).Items,
-				SeparatorTkns:        yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns,
-				CloseParenthesisTkn:  yyDollar[6].token,
-				ClosureUse:           yyDollar[7].node,
-				ColonTkn:             yyDollar[8].node.(*ast.ReturnType).ColonTkn,
-				ReturnType:           yyDollar[8].node.(*ast.ReturnType).Type,
-				OpenCurlyBracketTkn:  yyDollar[9].token,
-				Stmts:                yyDollar[10].list,
-				CloseCurlyBracketTkn: yyDollar[11].token,
-			}
+			closure := yyDollar[7].node.(*ast.ExprClosure)
+
+			closure.Position = yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[11].token)
+			closure.FunctionTkn = yyDollar[1].token
+			closure.AmpersandTkn = yyDollar[2].token
+			closure.OpenParenthesisTkn = yyDollar[4].token
+			closure.Params = yyDollar[5].node.(*ast.ParserSeparatedList).Items
+			closure.SeparatorTkns = yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns
+			closure.CloseParenthesisTkn = yyDollar[6].token
+			closure.ColonTkn = yyDollar[8].node.(*ast.ReturnType).ColonTkn
+			closure.ReturnType = yyDollar[8].node.(*ast.ReturnType).Type
+			closure.OpenCurlyBracketTkn = yyDollar[9].token
+			closure.Stmts = yyDollar[10].list
+			closure.CloseCurlyBracketTkn = yyDollar[11].token
+
+			yyVAL.node = closure
 		}
 	case 374:
 		yyDollar = yyS[yypt-9 : yypt+1]
-		// line internal/php7/php7.y:3198
+		// line internal/php7/php7.y:3199
 		{
 			yyVAL.node = &ast.ExprArrowFunction{
 				Position:            yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node),
@@ -5803,33 +5804,32 @@ yydefault:
 		}
 	case 376:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php7/php7.y:3221
+		// line internal/php7/php7.y:3222
 		{
 			yyVAL.token = nil
 		}
 	case 377:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3225
+		// line internal/php7/php7.y:3226
 		{
 			yyVAL.token = yyDollar[1].token
 		}
 	case 378:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php7/php7.y:3232
+		// line internal/php7/php7.y:3233
 		{
-			yyVAL.node = nil
+			yyVAL.node = &ast.ExprClosure{}
 		}
 	case 379:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:3236
+		// line internal/php7/php7.y:3237
 		{
-			yyVAL.node = &ast.ExprClosureUse{
-				Position:            yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
-				UseTkn:              yyDollar[1].token,
-				OpenParenthesisTkn:  yyDollar[2].token,
-				Uses:                yyDollar[3].node.(*ast.ParserSeparatedList).Items,
-				SeparatorTkns:       yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns,
-				CloseParenthesisTkn: yyDollar[4].token,
+			yyVAL.node = &ast.ExprClosure{
+				UseTkn:                 yyDollar[1].token,
+				UseOpenParenthesisTkn:  yyDollar[2].token,
+				Use:                    yyDollar[3].node.(*ast.ParserSeparatedList).Items,
+				UseSeparatorTkns:       yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns,
+				UseCloseParenthesisTkn: yyDollar[4].token,
 			}
 		}
 	case 380:
@@ -5853,20 +5853,23 @@ yydefault:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		// line internal/php7/php7.y:3266
 		{
-			yyVAL.node = &ast.ExprVariable{
+			yyVAL.node = &ast.ExprClosureUse{
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-				VarName: &ast.Identifier{
-					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-					IdentifierTkn: yyDollar[1].token,
-					Value:         yyDollar[1].token.Value,
+				Var: &ast.ExprVariable{
+					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
+					VarName: &ast.Identifier{
+						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
+						IdentifierTkn: yyDollar[1].token,
+						Value:         yyDollar[1].token.Value,
+					},
 				},
 			}
 		}
 	case 383:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:3277
+		// line internal/php7/php7.y:3280
 		{
-			yyVAL.node = &ast.ExprReference{
+			yyVAL.node = &ast.ExprClosureUse{
 				Position:     yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token),
 				AmpersandTkn: yyDollar[1].token,
 				Var: &ast.ExprVariable{
@@ -5881,7 +5884,7 @@ yydefault:
 		}
 	case 384:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:3295
+		// line internal/php7/php7.y:3298
 		{
 			yyVAL.node = &ast.ExprFunctionCall{
 				Position:            yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[2].node),
@@ -5894,7 +5897,7 @@ yydefault:
 		}
 	case 385:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:3306
+		// line internal/php7/php7.y:3309
 		{
 			yyVAL.node = &ast.ExprStaticCall{
 				Position:            yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node),
@@ -5909,7 +5912,7 @@ yydefault:
 		}
 	case 386:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:3319
+		// line internal/php7/php7.y:3322
 		{
 			yyVAL.node = &ast.ExprStaticCall{
 				Position:            yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node),
@@ -5924,7 +5927,7 @@ yydefault:
 		}
 	case 387:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:3332
+		// line internal/php7/php7.y:3335
 		{
 			yyVAL.node = &ast.ExprFunctionCall{
 				Position:            yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[2].node),
@@ -5937,7 +5940,7 @@ yydefault:
 		}
 	case 388:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3346
+		// line internal/php7/php7.y:3349
 		{
 			yyVAL.node = &ast.Identifier{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -5947,31 +5950,31 @@ yydefault:
 		}
 	case 389:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3354
+		// line internal/php7/php7.y:3357
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 390:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3361
+		// line internal/php7/php7.y:3364
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 391:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3365
+		// line internal/php7/php7.y:3368
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 392:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php7/php7.y:3372
+		// line internal/php7/php7.y:3375
 		{
 			yyVAL.node = nil
 		}
 	case 393:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3376
+		// line internal/php7/php7.y:3379
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -5982,13 +5985,13 @@ yydefault:
 		}
 	case 394:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php7/php7.y:3388
+		// line internal/php7/php7.y:3391
 		{
 			yyVAL.list = []ast.Vertex{}
 		}
 	case 395:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3392
+		// line internal/php7/php7.y:3395
 		{
 			yyVAL.list = []ast.Vertex{
 				&ast.ScalarEncapsedStringPart{
@@ -6000,25 +6003,25 @@ yydefault:
 		}
 	case 396:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3402
+		// line internal/php7/php7.y:3405
 		{
 			yyVAL.list = yyDollar[1].list
 		}
 	case 397:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php7/php7.y:3409
+		// line internal/php7/php7.y:3412
 		{
 			yyVAL.node = &ast.ArgumentList{}
 		}
 	case 398:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3413
+		// line internal/php7/php7.y:3416
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 399:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:3420
+		// line internal/php7/php7.y:3423
 		{
 			yyVAL.node = &ast.ExprArray{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -6031,7 +6034,7 @@ yydefault:
 		}
 	case 400:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3431
+		// line internal/php7/php7.y:3434
 		{
 			yyVAL.node = &ast.ExprArray{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6043,7 +6046,7 @@ yydefault:
 		}
 	case 401:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3441
+		// line internal/php7/php7.y:3444
 		{
 			yyVAL.node = &ast.ScalarString{
 				Position:  yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6053,7 +6056,7 @@ yydefault:
 		}
 	case 402:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3452
+		// line internal/php7/php7.y:3455
 		{
 			yyVAL.node = &ast.ScalarLnumber{
 				Position:  yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6063,7 +6066,7 @@ yydefault:
 		}
 	case 403:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3460
+		// line internal/php7/php7.y:3463
 		{
 			yyVAL.node = &ast.ScalarDnumber{
 				Position:  yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6073,7 +6076,7 @@ yydefault:
 		}
 	case 404:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3468
+		// line internal/php7/php7.y:3471
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6083,7 +6086,7 @@ yydefault:
 		}
 	case 405:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3476
+		// line internal/php7/php7.y:3479
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6093,7 +6096,7 @@ yydefault:
 		}
 	case 406:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3484
+		// line internal/php7/php7.y:3487
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6103,7 +6106,7 @@ yydefault:
 		}
 	case 407:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3492
+		// line internal/php7/php7.y:3495
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6113,7 +6116,7 @@ yydefault:
 		}
 	case 408:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3500
+		// line internal/php7/php7.y:3503
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6123,7 +6126,7 @@ yydefault:
 		}
 	case 409:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3508
+		// line internal/php7/php7.y:3511
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6133,7 +6136,7 @@ yydefault:
 		}
 	case 410:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3516
+		// line internal/php7/php7.y:3519
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6143,7 +6146,7 @@ yydefault:
 		}
 	case 411:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3524
+		// line internal/php7/php7.y:3527
 		{
 			yyVAL.node = &ast.ScalarMagicConstant{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6153,7 +6156,7 @@ yydefault:
 		}
 	case 412:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3532
+		// line internal/php7/php7.y:3535
 		{
 			yyVAL.node = &ast.ScalarHeredoc{
 				Position:       yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6170,7 +6173,7 @@ yydefault:
 		}
 	case 413:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:3547
+		// line internal/php7/php7.y:3550
 		{
 			yyVAL.node = &ast.ScalarHeredoc{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token),
@@ -6180,7 +6183,7 @@ yydefault:
 		}
 	case 414:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3555
+		// line internal/php7/php7.y:3558
 		{
 			yyVAL.node = &ast.ScalarEncapsed{
 				Position:      yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6191,7 +6194,7 @@ yydefault:
 		}
 	case 415:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3564
+		// line internal/php7/php7.y:3567
 		{
 			yyVAL.node = &ast.ScalarHeredoc{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6202,19 +6205,19 @@ yydefault:
 		}
 	case 416:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3573
+		// line internal/php7/php7.y:3576
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 417:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3577
+		// line internal/php7/php7.y:3580
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 418:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3584
+		// line internal/php7/php7.y:3587
 		{
 			yyVAL.node = &ast.ExprConstFetch{
 				Position: yylex.(*Parser).builder.NewNodePosition(yyDollar[1].node),
@@ -6223,7 +6226,7 @@ yydefault:
 		}
 	case 419:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3591
+		// line internal/php7/php7.y:3594
 		{
 			yyVAL.node = &ast.ExprClassConstFetch{
 				Position:       yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
@@ -6238,7 +6241,7 @@ yydefault:
 		}
 	case 420:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3604
+		// line internal/php7/php7.y:3607
 		{
 			yyVAL.node = &ast.ExprClassConstFetch{
 				Position:       yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
@@ -6253,43 +6256,43 @@ yydefault:
 		}
 	case 421:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3620
+		// line internal/php7/php7.y:3623
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 422:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3624
+		// line internal/php7/php7.y:3627
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 423:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php7/php7.y:3631
+		// line internal/php7/php7.y:3634
 		{
 			yyVAL.node = nil
 		}
 	case 424:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3635
+		// line internal/php7/php7.y:3638
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 425:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3642
+		// line internal/php7/php7.y:3645
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 426:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3649
+		// line internal/php7/php7.y:3652
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 427:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3653
+		// line internal/php7/php7.y:3656
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6300,19 +6303,19 @@ yydefault:
 		}
 	case 428:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3662
+		// line internal/php7/php7.y:3665
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 429:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3669
+		// line internal/php7/php7.y:3672
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 430:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3673
+		// line internal/php7/php7.y:3676
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6323,19 +6326,19 @@ yydefault:
 		}
 	case 431:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3682
+		// line internal/php7/php7.y:3685
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 432:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3689
+		// line internal/php7/php7.y:3692
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 433:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:3693
+		// line internal/php7/php7.y:3696
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token),
@@ -6347,7 +6350,7 @@ yydefault:
 		}
 	case 434:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:3703
+		// line internal/php7/php7.y:3706
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token),
@@ -6359,7 +6362,7 @@ yydefault:
 		}
 	case 435:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:3713
+		// line internal/php7/php7.y:3716
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token),
@@ -6371,7 +6374,7 @@ yydefault:
 		}
 	case 436:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:3723
+		// line internal/php7/php7.y:3726
 		{
 			yyVAL.node = &ast.ExprMethodCall{
 				Position:            yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node),
@@ -6386,25 +6389,25 @@ yydefault:
 		}
 	case 437:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3736
+		// line internal/php7/php7.y:3739
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 438:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3743
+		// line internal/php7/php7.y:3746
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 439:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3747
+		// line internal/php7/php7.y:3750
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 440:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3751
+		// line internal/php7/php7.y:3754
 		{
 			yyVAL.node = &ast.ExprPropertyFetch{
 				Position:          yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6415,7 +6418,7 @@ yydefault:
 		}
 	case 441:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3763
+		// line internal/php7/php7.y:3766
 		{
 			yyVAL.node = &ast.ExprVariable{
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6428,7 +6431,7 @@ yydefault:
 		}
 	case 442:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:3774
+		// line internal/php7/php7.y:3777
 		{
 			yyVAL.node = &ast.ExprVariable{
 				Position:  yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -6443,7 +6446,7 @@ yydefault:
 		}
 	case 443:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:3787
+		// line internal/php7/php7.y:3790
 		{
 			yyVAL.node = &ast.ExprVariable{
 				Position:  yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -6453,7 +6456,7 @@ yydefault:
 		}
 	case 444:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3798
+		// line internal/php7/php7.y:3801
 		{
 			yyVAL.node = &ast.ExprStaticPropertyFetch{
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6464,7 +6467,7 @@ yydefault:
 		}
 	case 445:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3807
+		// line internal/php7/php7.y:3810
 		{
 			yyVAL.node = &ast.ExprStaticPropertyFetch{
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6475,13 +6478,13 @@ yydefault:
 		}
 	case 446:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3819
+		// line internal/php7/php7.y:3822
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 447:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:3823
+		// line internal/php7/php7.y:3826
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token),
@@ -6493,7 +6496,7 @@ yydefault:
 		}
 	case 448:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:3833
+		// line internal/php7/php7.y:3836
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position:        yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token),
@@ -6505,7 +6508,7 @@ yydefault:
 		}
 	case 449:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3843
+		// line internal/php7/php7.y:3846
 		{
 			yyVAL.node = &ast.ExprPropertyFetch{
 				Position:          yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6516,7 +6519,7 @@ yydefault:
 		}
 	case 450:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3852
+		// line internal/php7/php7.y:3855
 		{
 			yyVAL.node = &ast.ExprStaticPropertyFetch{
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6527,7 +6530,7 @@ yydefault:
 		}
 	case 451:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3861
+		// line internal/php7/php7.y:3864
 		{
 			yyVAL.node = &ast.ExprStaticPropertyFetch{
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6538,7 +6541,7 @@ yydefault:
 		}
 	case 452:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3873
+		// line internal/php7/php7.y:3876
 		{
 			yyVAL.node = &ast.Identifier{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6548,7 +6551,7 @@ yydefault:
 		}
 	case 453:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3881
+		// line internal/php7/php7.y:3884
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6559,13 +6562,13 @@ yydefault:
 		}
 	case 454:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3890
+		// line internal/php7/php7.y:3893
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 455:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3897
+		// line internal/php7/php7.y:3900
 		{
 			yyVAL.node = &ast.Identifier{
 				Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6575,7 +6578,7 @@ yydefault:
 		}
 	case 456:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3905
+		// line internal/php7/php7.y:3908
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6586,13 +6589,13 @@ yydefault:
 		}
 	case 457:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3914
+		// line internal/php7/php7.y:3917
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 458:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3921
+		// line internal/php7/php7.y:3924
 		{
 			pairList := yyDollar[1].node.(*ast.ParserSeparatedList)
 			fistPair := pairList.Items[0].(*ast.ExprArrayItem)
@@ -6605,19 +6608,19 @@ yydefault:
 		}
 	case 459:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		// line internal/php7/php7.y:3935
+		// line internal/php7/php7.y:3938
 		{
 			yyVAL.node = &ast.ExprArrayItem{}
 		}
 	case 460:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3939
+		// line internal/php7/php7.y:3942
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 461:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3946
+		// line internal/php7/php7.y:3949
 		{
 			yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token)
 			yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node)
@@ -6626,7 +6629,7 @@ yydefault:
 		}
 	case 462:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3953
+		// line internal/php7/php7.y:3956
 		{
 			yyVAL.node = &ast.ParserSeparatedList{
 				Items: []ast.Vertex{yyDollar[1].node},
@@ -6634,7 +6637,7 @@ yydefault:
 		}
 	case 463:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:3962
+		// line internal/php7/php7.y:3965
 		{
 			yyVAL.node = &ast.ExprArrayItem{
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
@@ -6645,7 +6648,7 @@ yydefault:
 		}
 	case 464:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:3971
+		// line internal/php7/php7.y:3974
 		{
 			yyVAL.node = &ast.ExprArrayItem{
 				Position: yylex.(*Parser).builder.NewNodePosition(yyDollar[1].node),
@@ -6654,7 +6657,7 @@ yydefault:
 		}
 	case 465:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:3978
+		// line internal/php7/php7.y:3981
 		{
 			yyVAL.node = &ast.ExprArrayItem{
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node),
@@ -6669,7 +6672,7 @@ yydefault:
 		}
 	case 466:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:3991
+		// line internal/php7/php7.y:3994
 		{
 			yyVAL.node = &ast.ExprArrayItem{
 				Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -6682,7 +6685,7 @@ yydefault:
 		}
 	case 467:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:4002
+		// line internal/php7/php7.y:4005
 		{
 			yyVAL.node = &ast.ExprArrayItem{
 				Position:    yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -6692,7 +6695,7 @@ yydefault:
 		}
 	case 468:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		// line internal/php7/php7.y:4010
+		// line internal/php7/php7.y:4013
 		{
 			yyVAL.node = &ast.ExprArrayItem{
 				Position:       yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[6].token),
@@ -6710,7 +6713,7 @@ yydefault:
 		}
 	case 469:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:4026
+		// line internal/php7/php7.y:4029
 		{
 			yyVAL.node = &ast.ExprArrayItem{
 				Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -6726,13 +6729,13 @@ yydefault:
 		}
 	case 470:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:4043
+		// line internal/php7/php7.y:4046
 		{
 			yyVAL.list = append(yyDollar[1].list, yyDollar[2].node)
 		}
 	case 471:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:4047
+		// line internal/php7/php7.y:4050
 		{
 			yyVAL.list = append(
 				yyDollar[1].list,
@@ -6745,13 +6748,13 @@ yydefault:
 		}
 	case 472:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:4058
+		// line internal/php7/php7.y:4061
 		{
 			yyVAL.list = []ast.Vertex{yyDollar[1].node}
 		}
 	case 473:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:4062
+		// line internal/php7/php7.y:4065
 		{
 			yyVAL.list = []ast.Vertex{
 				&ast.ScalarEncapsedStringPart{
@@ -6764,7 +6767,7 @@ yydefault:
 		}
 	case 474:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:4076
+		// line internal/php7/php7.y:4079
 		{
 			yyVAL.node = &ast.ExprVariable{
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6777,7 +6780,7 @@ yydefault:
 		}
 	case 475:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:4087
+		// line internal/php7/php7.y:4090
 		{
 			yyVAL.node = &ast.ExprArrayDimFetch{
 				Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -6796,7 +6799,7 @@ yydefault:
 		}
 	case 476:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:4104
+		// line internal/php7/php7.y:4107
 		{
 			yyVAL.node = &ast.ExprPropertyFetch{
 				Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6818,7 +6821,7 @@ yydefault:
 		}
 	case 477:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:4124
+		// line internal/php7/php7.y:4127
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:       yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6832,7 +6835,7 @@ yydefault:
 		}
 	case 478:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:4136
+		// line internal/php7/php7.y:4139
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:       yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6850,7 +6853,7 @@ yydefault:
 		}
 	case 479:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		// line internal/php7/php7.y:4152
+		// line internal/php7/php7.y:4155
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:       yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[6].token),
@@ -6874,7 +6877,7 @@ yydefault:
 		}
 	case 480:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:4174
+		// line internal/php7/php7.y:4177
 		{
 			yyVAL.node = &ast.ParserBrackets{
 				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
@@ -6885,7 +6888,7 @@ yydefault:
 		}
 	case 481:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:4186
+		// line internal/php7/php7.y:4189
 		{
 			yyVAL.node = &ast.ScalarString{
 				Position:  yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6895,7 +6898,7 @@ yydefault:
 		}
 	case 482:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:4194
+		// line internal/php7/php7.y:4197
 		{
 			// TODO: add option to handle 64 bit integer
 			if _, err := strconv.Atoi(string(yyDollar[1].token.Value)); err == nil {
@@ -6914,7 +6917,7 @@ yydefault:
 		}
 	case 483:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:4211
+		// line internal/php7/php7.y:4214
 		{
 			_, err := strconv.Atoi(string(yyDollar[2].token.Value))
 			isInt := err == nil
@@ -6940,7 +6943,7 @@ yydefault:
 		}
 	case 484:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:4235
+		// line internal/php7/php7.y:4238
 		{
 			yyVAL.node = &ast.ExprVariable{
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
@@ -6953,7 +6956,7 @@ yydefault:
 		}
 	case 485:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		// line internal/php7/php7.y:4249
+		// line internal/php7/php7.y:4252
 		{
 			if yyDollar[4].token != nil {
 				yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[4].token)
@@ -6970,7 +6973,7 @@ yydefault:
 		}
 	case 486:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:4264
+		// line internal/php7/php7.y:4267
 		{
 			yyVAL.node = &ast.ExprEmpty{
 				Position:            yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -6982,7 +6985,7 @@ yydefault:
 		}
 	case 487:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:4274
+		// line internal/php7/php7.y:4277
 		{
 			yyVAL.node = &ast.ExprInclude{
 				Position:   yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -6992,7 +6995,7 @@ yydefault:
 		}
 	case 488:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:4282
+		// line internal/php7/php7.y:4285
 		{
 			yyVAL.node = &ast.ExprIncludeOnce{
 				Position:   yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -7002,7 +7005,7 @@ yydefault:
 		}
 	case 489:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		// line internal/php7/php7.y:4290
+		// line internal/php7/php7.y:4293
 		{
 			yyVAL.node = &ast.ExprEval{
 				Position:            yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
@@ -7014,7 +7017,7 @@ yydefault:
 		}
 	case 490:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:4300
+		// line internal/php7/php7.y:4303
 		{
 			yyVAL.node = &ast.ExprRequire{
 				Position:   yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -7024,7 +7027,7 @@ yydefault:
 		}
 	case 491:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		// line internal/php7/php7.y:4308
+		// line internal/php7/php7.y:4311
 		{
 			yyVAL.node = &ast.ExprRequireOnce{
 				Position:       yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
@@ -7034,7 +7037,7 @@ yydefault:
 		}
 	case 492:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:4319
+		// line internal/php7/php7.y:4322
 		{
 			yyVAL.node = &ast.ParserSeparatedList{
 				Items: []ast.Vertex{yyDollar[1].node},
@@ -7042,7 +7045,7 @@ yydefault:
 		}
 	case 493:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		// line internal/php7/php7.y:4325
+		// line internal/php7/php7.y:4328
 		{
 			yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token)
 			yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node)
@@ -7051,7 +7054,7 @@ yydefault:
 		}
 	case 494:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		// line internal/php7/php7.y:4335
+		// line internal/php7/php7.y:4338
 		{
 			yyVAL.node = yyDollar[1].node
 		}
diff --git a/internal/php7/php7.y b/internal/php7/php7.y
index 00582e4..580e9d4 100644
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -3178,21 +3178,22 @@ expr_without_variable:
 inline_function:
         T_FUNCTION returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type '{' inner_statement_list '}'
             {
-                $$ = &ast.ExprClosure{
-                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $11),
-                    FunctionTkn:          $1,
-                    AmpersandTkn:         $2,
-                    OpenParenthesisTkn:   $4,
-                    Params:               $5.(*ast.ParserSeparatedList).Items,
-                    SeparatorTkns:        $5.(*ast.ParserSeparatedList).SeparatorTkns,
-                    CloseParenthesisTkn:  $6,
-                    ClosureUse:           $7,
-                    ColonTkn:             $8.(*ast.ReturnType).ColonTkn,
-                    ReturnType:           $8.(*ast.ReturnType).Type,
-                    OpenCurlyBracketTkn:  $9,
-                    Stmts:                $10,
-                    CloseCurlyBracketTkn: $11,
-                }
+                closure := $7.(*ast.ExprClosure)
+
+                closure.Position             = yylex.(*Parser).builder.NewTokensPosition($1, $11)
+                closure.FunctionTkn          = $1
+                closure.AmpersandTkn         = $2
+                closure.OpenParenthesisTkn   = $4
+                closure.Params               = $5.(*ast.ParserSeparatedList).Items
+                closure.SeparatorTkns        = $5.(*ast.ParserSeparatedList).SeparatorTkns
+                closure.CloseParenthesisTkn  = $6
+                closure.ColonTkn             = $8.(*ast.ReturnType).ColonTkn
+                closure.ReturnType           = $8.(*ast.ReturnType).Type
+                closure.OpenCurlyBracketTkn  = $9
+                closure.Stmts                = $10
+                closure.CloseCurlyBracketTkn = $11
+
+                $$ = closure
             }
     |   T_FN returns_ref '(' parameter_list ')' return_type backup_doc_comment T_DOUBLE_ARROW expr
             {
@@ -3230,17 +3231,16 @@ returns_ref:
 lexical_vars:
         /* empty */
             {
-                $$ = nil
+                $$ = &ast.ExprClosure{}
             }
     |   T_USE '(' lexical_var_list ')'
             {
-                $$ = &ast.ExprClosureUse{
-                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
-                    UseTkn:              $1,
-                    OpenParenthesisTkn:  $2,
-                    Uses:                $3.(*ast.ParserSeparatedList).Items,
-                    SeparatorTkns:       $3.(*ast.ParserSeparatedList).SeparatorTkns,
-                    CloseParenthesisTkn: $4,
+                $$ = &ast.ExprClosure{
+                    UseTkn:                 $1,
+                    UseOpenParenthesisTkn:  $2,
+                    Use:                    $3.(*ast.ParserSeparatedList).Items,
+                    UseSeparatorTkns:       $3.(*ast.ParserSeparatedList).SeparatorTkns,
+                    UseCloseParenthesisTkn: $4,
                 }
             }
 ;
@@ -3264,18 +3264,21 @@ lexical_var_list:
 lexical_var:
     T_VARIABLE
             {
-                $$ = &ast.ExprVariable{
+                $$ = &ast.ExprClosureUse{
                     Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                    VarName: &ast.Identifier{
+                    Var: &ast.ExprVariable{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                        IdentifierTkn: $1,
-                        Value:         $1.Value,
+                        VarName: &ast.Identifier{
+                            Position: yylex.(*Parser).builder.NewTokenPosition($1),
+                            IdentifierTkn: $1,
+                            Value:         $1.Value,
+                        },
                     },
                 }
             }
     |   '&' T_VARIABLE
             {
-                $$ = &ast.ExprReference{
+                $$ = &ast.ExprClosureUse{
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $2),
                     AmpersandTkn: $1,
                     Var: &ast.ExprVariable{
diff --git a/pkg/ast/node.go b/pkg/ast/node.go
index 3e3e428..bb90d78 100644
--- a/pkg/ast/node.go
+++ b/pkg/ast/node.go
@@ -1274,20 +1274,24 @@ func (n *ExprClone) GetPosition() *position.Position {
 
 // ExprClosure node
 type ExprClosure struct {
-	Position             *position.Position
-	StaticTkn            *token.Token
-	FunctionTkn          *token.Token
-	AmpersandTkn         *token.Token
-	OpenParenthesisTkn   *token.Token
-	Params               []Vertex
-	SeparatorTkns        []*token.Token
-	CloseParenthesisTkn  *token.Token
-	ClosureUse           Vertex
-	ColonTkn             *token.Token
-	ReturnType           Vertex
-	OpenCurlyBracketTkn  *token.Token
-	Stmts                []Vertex
-	CloseCurlyBracketTkn *token.Token
+	Position               *position.Position
+	StaticTkn              *token.Token
+	FunctionTkn            *token.Token
+	AmpersandTkn           *token.Token
+	OpenParenthesisTkn     *token.Token
+	Params                 []Vertex
+	SeparatorTkns          []*token.Token
+	CloseParenthesisTkn    *token.Token
+	UseTkn                 *token.Token
+	UseOpenParenthesisTkn  *token.Token
+	Use                    []Vertex
+	UseSeparatorTkns       []*token.Token
+	UseCloseParenthesisTkn *token.Token
+	ColonTkn               *token.Token
+	ReturnType             Vertex
+	OpenCurlyBracketTkn    *token.Token
+	Stmts                  []Vertex
+	CloseCurlyBracketTkn   *token.Token
 }
 
 func (n *ExprClosure) Accept(v NodeVisitor) {
@@ -1300,12 +1304,9 @@ func (n *ExprClosure) GetPosition() *position.Position {
 
 // ExprClosureUse node
 type ExprClosureUse struct {
-	Position            *position.Position
-	UseTkn              *token.Token
-	OpenParenthesisTkn  *token.Token
-	Uses                []Vertex
-	SeparatorTkns       []*token.Token
-	CloseParenthesisTkn *token.Token
+	Position     *position.Position
+	AmpersandTkn *token.Token
+	Var          Vertex
 }
 
 func (n *ExprClosureUse) Accept(v NodeVisitor) {
diff --git a/pkg/ast/traverser/dfs.go b/pkg/ast/traverser/dfs.go
index f980c7f..5c8f792 100644
--- a/pkg/ast/traverser/dfs.go
+++ b/pkg/ast/traverser/dfs.go
@@ -1152,10 +1152,12 @@ func (t *DFS) Traverse(n ast.Vertex) {
 			}
 			t.visitor.Leave("Params", false)
 		}
-		if nn.ClosureUse != nil {
-			t.visitor.Enter("ClosureUse", true)
-			t.Traverse(nn.ClosureUse)
-			t.visitor.Leave("ClosureUse", true)
+		if nn.Use != nil {
+			t.visitor.Enter("Use", false)
+			for _, c := range nn.Use {
+				t.Traverse(c)
+			}
+			t.visitor.Leave("Use", false)
 		}
 		if nn.ReturnType != nil {
 			t.visitor.Enter("ReturnType", true)
@@ -1176,12 +1178,10 @@ func (t *DFS) Traverse(n ast.Vertex) {
 		if !t.visitor.EnterNode(nn) {
 			return
 		}
-		if nn.Uses != nil {
-			t.visitor.Enter("Uses", false)
-			for _, c := range nn.Uses {
-				t.Traverse(c)
-			}
-			t.visitor.Leave("Uses", false)
+		if nn.Var != nil {
+			t.visitor.Enter("Var", true)
+			t.Traverse(nn.Var)
+			t.visitor.Leave("Var", true)
 		}
 	case *ast.ExprConstFetch:
 		if nn == nil {
diff --git a/pkg/ast/visitor/dumper.go b/pkg/ast/visitor/dumper.go
index c086d47..6bc24c3 100644
--- a/pkg/ast/visitor/dumper.go
+++ b/pkg/ast/visitor/dumper.go
@@ -1143,7 +1143,11 @@ func (v *Dumper) ExprClosure(n *ast.ExprClosure) {
 	v.dumpVertexList("Params", n.Params)
 	v.dumpTokenList("SeparatorTkns", n.SeparatorTkns)
 	v.dumpToken("CloseParenthesisTkn", n.CloseParenthesisTkn)
-	v.dumpVertex("ClosureUse", n.ClosureUse)
+	v.dumpToken("UseTkn", n.UseTkn)
+	v.dumpToken("UseOpenParenthesisTkn", n.UseOpenParenthesisTkn)
+	v.dumpVertexList("Use", n.Use)
+	v.dumpTokenList("UseSeparatorTkns", n.UseSeparatorTkns)
+	v.dumpToken("UseCloseParenthesisTkn", n.UseCloseParenthesisTkn)
 	v.dumpToken("ColonTkn", n.ColonTkn)
 	v.dumpVertex("ReturnType", n.ReturnType)
 	v.dumpToken("OpenCurlyBracketTkn", n.OpenCurlyBracketTkn)
@@ -1159,11 +1163,8 @@ func (v *Dumper) ExprClosureUse(n *ast.ExprClosureUse) {
 	v.indent++
 
 	v.dumpPosition(n.Position)
-	v.dumpToken("UseTkn", n.UseTkn)
-	v.dumpToken("OpenParenthesisTkn", n.OpenParenthesisTkn)
-	v.dumpVertexList("Uses", n.Uses)
-	v.dumpTokenList("SeparatorTkns", n.SeparatorTkns)
-	v.dumpToken("CloseParenthesisTkn", n.CloseParenthesisTkn)
+	v.dumpToken("AmpersandTkn", n.AmpersandTkn)
+	v.dumpVertex("Var", n.Var)
 
 	v.indent--
 	v.print(v.indent, "},\n")
diff --git a/pkg/ast/visitor/formatter.go b/pkg/ast/visitor/formatter.go
index 5d2d202..9484b66 100644
--- a/pkg/ast/visitor/formatter.go
+++ b/pkg/ast/visitor/formatter.go
@@ -1162,9 +1162,16 @@ func (f *formatter) ExprClosure(n *ast.ExprClosure) {
 	}
 	n.CloseParenthesisTkn = f.newToken(')', []byte(")"))
 
-	if n.ClosureUse != nil {
+	n.UseTkn = nil
+	n.UseOpenParenthesisTkn = nil
+	n.UseCloseParenthesisTkn = nil
+	n.UseSeparatorTkns = nil
+	if len(n.Use) > 0 {
 		f.addFreeFloating(token.T_WHITESPACE, []byte(" "))
-		n.ClosureUse.Accept(f)
+		n.UseTkn = f.newToken(token.T_USE, []byte("use"))
+		n.OpenParenthesisTkn = f.newToken('(', []byte("("))
+		n.SeparatorTkns = f.formatList(n.Use, ',')
+		n.CloseParenthesisTkn = f.newToken(')', []byte(")"))
 	}
 
 	n.ColonTkn = nil
@@ -1189,10 +1196,11 @@ func (f *formatter) ExprClosure(n *ast.ExprClosure) {
 }
 
 func (f *formatter) ExprClosureUse(n *ast.ExprClosureUse) {
-	n.UseTkn = f.newToken(token.T_USE, []byte("use"))
-	n.OpenParenthesisTkn = f.newToken('(', []byte("("))
-	n.SeparatorTkns = f.formatList(n.Uses, ',')
-	n.CloseParenthesisTkn = f.newToken(')', []byte(")"))
+	if n.AmpersandTkn != nil {
+		n.AmpersandTkn = f.newToken('&', []byte("&"))
+	}
+
+	n.Var.Accept(f)
 }
 
 func (f *formatter) ExprConstFetch(n *ast.ExprConstFetch) {
diff --git a/pkg/ast/visitor/formatter_test.go b/pkg/ast/visitor/formatter_test.go
index ee8637b..b917aea 100644
--- a/pkg/ast/visitor/formatter_test.go
+++ b/pkg/ast/visitor/formatter_test.go
@@ -3714,9 +3714,9 @@ func TestFormatter_ExprClosure_Use(t *testing.T) {
 	o := bytes.NewBufferString("")
 
 	n := &ast.ExprClosure{
-		ClosureUse: &ast.ExprClosureUse{
-			Uses: []ast.Vertex{
-				&ast.ExprVariable{
+		Use: []ast.Vertex{
+			&ast.ExprClosureUse{
+				Var: &ast.ExprVariable{
 					VarName: &ast.Identifier{
 						Value: []byte("$foo"),
 					},
@@ -3748,16 +3748,9 @@ func TestFormatter_ExprClosureUse(t *testing.T) {
 	o := bytes.NewBufferString("")
 
 	n := &ast.ExprClosureUse{
-		Uses: []ast.Vertex{
-			&ast.ExprVariable{
-				VarName: &ast.Identifier{
-					Value: []byte("$a"),
-				},
-			},
-			&ast.ExprVariable{
-				VarName: &ast.Identifier{
-					Value: []byte("$b"),
-				},
+		Var: &ast.ExprVariable{
+			VarName: &ast.Identifier{
+				Value: []byte("$a"),
 			},
 		},
 	}
@@ -3768,7 +3761,33 @@ func TestFormatter_ExprClosureUse(t *testing.T) {
 	p := visitor.NewPrinter(o).WithState(visitor.PrinterStatePHP)
 	n.Accept(p)
 
-	expected := `use($a, $b)`
+	expected := `$a`
+	actual := o.String()
+
+	if expected != actual {
+		t.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
+	}
+}
+
+func TestFormatter_ExprClosureUse_Reference(t *testing.T) {
+	o := bytes.NewBufferString("")
+
+	n := &ast.ExprClosureUse{
+		AmpersandTkn: &token.Token{},
+		Var: &ast.ExprVariable{
+			VarName: &ast.Identifier{
+				Value: []byte("$a"),
+			},
+		},
+	}
+
+	f := visitor.NewFormatter().WithState(visitor.FormatterStatePHP).WithIndent(1)
+	n.Accept(f)
+
+	p := visitor.NewPrinter(o).WithState(visitor.PrinterStatePHP)
+	n.Accept(p)
+
+	expected := `&$a`
 	actual := o.String()
 
 	if expected != actual {
diff --git a/pkg/ast/visitor/namespace_resolver_test.go b/pkg/ast/visitor/namespace_resolver_test.go
index f42f11e..8a8bb14 100644
--- a/pkg/ast/visitor/namespace_resolver_test.go
+++ b/pkg/ast/visitor/namespace_resolver_test.go
@@ -562,7 +562,6 @@ func TestResolveClosureName(t *testing.T) {
 				Var:  &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("foo")}},
 			},
 		},
-		ClosureUse: nil,
 		ReturnType: &ast.Nullable{Expr: nameBC},
 		Stmts:      []ast.Vertex{},
 	}
diff --git a/pkg/ast/visitor/printer.go b/pkg/ast/visitor/printer.go
index 255ffe9..8802a43 100644
--- a/pkg/ast/visitor/printer.go
+++ b/pkg/ast/visitor/printer.go
@@ -684,7 +684,10 @@ func (p *printer) ExprClosure(n *ast.ExprClosure) {
 	p.printToken(n.OpenParenthesisTkn, []byte("("))
 	p.printSeparatedList(n.Params, n.SeparatorTkns, []byte(","))
 	p.printToken(n.CloseParenthesisTkn, []byte(")"))
-	p.printNode(n.ClosureUse)
+	p.printToken(n.UseTkn, p.ifNodeList(n.Use, []byte("use")))
+	p.printToken(n.UseOpenParenthesisTkn, p.ifNodeList(n.Use, []byte("(")))
+	p.printSeparatedList(n.Use, n.UseSeparatorTkns, []byte(","))
+	p.printToken(n.UseCloseParenthesisTkn, p.ifNodeList(n.Use, []byte(")")))
 	p.printToken(n.ColonTkn, p.ifNode(n.ReturnType, []byte(":")))
 	p.printNode(n.ReturnType)
 	p.printToken(n.OpenCurlyBracketTkn, []byte("{"))
@@ -693,10 +696,8 @@ func (p *printer) ExprClosure(n *ast.ExprClosure) {
 }
 
 func (p *printer) ExprClosureUse(n *ast.ExprClosureUse) {
-	p.printToken(n.UseTkn, []byte("use"))
-	p.printToken(n.OpenParenthesisTkn, []byte("("))
-	p.printSeparatedList(n.Uses, n.SeparatorTkns, []byte(","))
-	p.printToken(n.CloseParenthesisTkn, []byte(")"))
+	p.printToken(n.AmpersandTkn, nil)
+	p.printNode(n.Var)
 }
 
 func (p *printer) ExprConstFetch(n *ast.ExprConstFetch) {
diff --git a/pkg/ast/visitor/printer_test.go b/pkg/ast/visitor/printer_test.go
index d918f0a..571f51e 100644
--- a/pkg/ast/visitor/printer_test.go
+++ b/pkg/ast/visitor/printer_test.go
@@ -1717,18 +1717,35 @@ func TestPrinterPrintExprClosureUse(t *testing.T) {
 
 	p := visitor.NewPrinter(o).WithState(visitor.PrinterStatePHP)
 	n := &ast.ExprClosureUse{
-		Uses: []ast.Vertex{
-			&ast.ExprReference{Var: &ast.ExprVariable{
-				VarName: &ast.Identifier{Value: []byte("$foo")},
-			}},
-			&ast.ExprVariable{
-				VarName: &ast.Identifier{Value: []byte("$bar")},
-			},
+		Var: &ast.ExprVariable{
+			VarName: &ast.Identifier{Value: []byte("$foo")},
 		},
 	}
 	n.Accept(p)
 
-	expected := `use(&$foo,$bar)`
+	expected := `$foo`
+	actual := o.String()
+
+	if expected != actual {
+		t.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
+	}
+}
+
+func TestPrinterPrintExprClosureUse_Reference(t *testing.T) {
+	o := bytes.NewBufferString("")
+
+	p := visitor.NewPrinter(o).WithState(visitor.PrinterStatePHP)
+	n := &ast.ExprClosureUse{
+		AmpersandTkn: &token.Token{
+			Value: []byte("&"),
+		},
+		Var: &ast.ExprVariable{
+			VarName: &ast.Identifier{Value: []byte("$foo")},
+		},
+	}
+	n.Accept(p)
+
+	expected := `&$foo`
 	actual := o.String()
 
 	if expected != actual {
@@ -1754,12 +1771,17 @@ func TestPrinterPrintExprClosure(t *testing.T) {
 				},
 			},
 		},
-		ClosureUse: &ast.ExprClosureUse{
-			Uses: []ast.Vertex{
-				&ast.ExprReference{Var: &ast.ExprVariable{
+		Use: []ast.Vertex{
+			&ast.ExprClosureUse{
+				AmpersandTkn: &token.Token{
+					Value: []byte("&"),
+				},
+				Var: &ast.ExprVariable{
 					VarName: &ast.Identifier{Value: []byte("$a")},
-				}},
-				&ast.ExprVariable{
+				},
+			},
+			&ast.ExprClosureUse{
+				Var: &ast.ExprVariable{
 					VarName: &ast.Identifier{Value: []byte("$b")},
 				},
 			},