From ce18c23597f361b92408b2c61a7626168587bf6d Mon Sep 17 00:00:00 2001
From: Vadym Slizov <vadym.slizov@miacar.ch>
Date: Sun, 5 Jul 2020 22:47:46 +0300
Subject: [PATCH] [refactoring] parameters: new node structure

---
 internal/php5/parser_test.go               |  414 +-
 internal/php5/php5.go                      |  Bin 334300 -> 333216 bytes
 internal/php5/php5.y                       |   94 +-
 internal/php5/php5_test.go                 | 8743 ++++++++++----------
 internal/php5/test.php                     |  381 +
 internal/php7/parser_test.go               |  430 +-
 internal/php7/php7.go                      |  Bin 274859 -> 273775 bytes
 internal/php7/php7.y                       |   96 +-
 internal/php7/php7_test.go                 | 7725 +++++++++--------
 internal/php7/test.php                     |  350 +
 pkg/ast/ast.go                             |    2 +
 pkg/ast/node.go                            |   22 +-
 pkg/ast/traverser/dfs.go                   |   24 +
 pkg/ast/visitor/dump.go                    |   30 +-
 pkg/ast/visitor/dump_test.go               |    4 +-
 pkg/ast/visitor/namespace_resolver_test.go |   18 +-
 pkg/ast/visitor/null.go                    |    8 +
 pkg/printer/pretty_printer.go              |   26 +-
 pkg/printer/pretty_printer_test.go         |   36 +-
 pkg/printer/printer.go                     |   36 +-
 pkg/printer/printer_parsed_php7_test.go    |   12 +
 pkg/printer/printer_test.go                |   68 +-
 22 files changed, 9359 insertions(+), 9160 deletions(-)
 create mode 100644 internal/php5/test.php
 create mode 100644 internal/php7/test.php

diff --git a/internal/php5/parser_test.go b/internal/php5/parser_test.go
index 2102e1c..7930f17 100644
--- a/internal/php5/parser_test.go
+++ b/internal/php5/parser_test.go
@@ -849,7 +849,7 @@ func TestPhp5ArgumentNode(t *testing.T) {
 }
 
 func TestPhp5ParameterNode(t *testing.T) {
-	src := `<? 
+	src := `<?
 		function foo(bar $bar=null, baz &...$baz) {}
 		class foo {public function foo(bar $bar=null, baz &...$baz) {}}
 		function(bar $bar=null, baz &...$baz) {};
@@ -861,8 +861,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 			Position: &position.Position{
 				StartLine: 2,
 				EndLine:   5,
-				StartPos:  6,
-				EndPos:    211,
+				StartPos:  5,
+				EndPos:    210,
 			},
 		},
 		Stmts: []ast.Vertex{
@@ -871,18 +871,17 @@ func TestPhp5ParameterNode(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 2,
 						EndLine:   2,
-						StartPos:  6,
-						EndPos:    50,
+						StartPos:  5,
+						EndPos:    49,
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
-							StartPos:  15,
-							EndPos:    18,
+							StartPos:  14,
+							EndPos:    17,
 						},
 					},
 					Value: []byte("foo"),
@@ -893,19 +892,17 @@ func TestPhp5ParameterNode(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
-								StartPos:  19,
-								EndPos:    32,
+								StartPos:  18,
+								EndPos:    31,
 							},
 						},
-						ByRef:    false,
-						Variadic: false,
 						Type: &ast.NameName{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  19,
-									EndPos:    22,
+									StartPos:  18,
+									EndPos:    21,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -914,8 +911,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 2,
 											EndLine:   2,
-											StartPos:  19,
-											EndPos:    22,
+											StartPos:  18,
+											EndPos:    21,
 										},
 									},
 									Value: []byte("bar"),
@@ -927,8 +924,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  23,
-									EndPos:    27,
+									StartPos:  22,
+									EndPos:    26,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -936,8 +933,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  23,
-										EndPos:    27,
+										StartPos:  22,
+										EndPos:    26,
 									},
 								},
 								Value: []byte("$bar"),
@@ -948,8 +945,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  28,
-									EndPos:    32,
+									StartPos:  27,
+									EndPos:    31,
 								},
 							},
 							Const: &ast.NameName{
@@ -957,8 +954,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  28,
-										EndPos:    32,
+										StartPos:  27,
+										EndPos:    31,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -967,8 +964,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
-												StartPos:  28,
-												EndPos:    32,
+												StartPos:  27,
+												EndPos:    31,
 											},
 										},
 										Value: []byte("null"),
@@ -982,19 +979,17 @@ func TestPhp5ParameterNode(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
-								StartPos:  34,
-								EndPos:    46,
+								StartPos:  33,
+								EndPos:    45,
 							},
 						},
-						ByRef:    true,
-						Variadic: true,
 						Type: &ast.NameName{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  34,
-									EndPos:    37,
+									StartPos:  33,
+									EndPos:    36,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -1003,46 +998,67 @@ func TestPhp5ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 2,
 											EndLine:   2,
-											StartPos:  34,
-											EndPos:    37,
+											StartPos:  33,
+											EndPos:    36,
 										},
 									},
 									Value: []byte("baz"),
 								},
 							},
 						},
-						Var: &ast.ExprVariable{
+						Var: &ast.Reference{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  42,
-									EndPos:    46,
+									StartPos:  37,
+									EndPos:    45,
 								},
 							},
-							VarName: &ast.Identifier{
+							Var: &ast.Variadic{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  42,
-										EndPos:    46,
+										StartPos:  38,
+										EndPos:    45,
+									},
+								},
+								Var: &ast.ExprVariable{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  41,
+											EndPos:    45,
+										},
+									},
+									VarName: &ast.Identifier{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 2,
+												EndLine:   2,
+												StartPos:  41,
+												EndPos:    45,
+											},
+										},
+										Value: []byte("$baz"),
 									},
 								},
-								Value: []byte("$baz"),
 							},
 						},
 					},
 				},
-				Stmts: []ast.Vertex{},
+				Stmts: []ast.Vertex{
+				},
 			},
 			&ast.StmtClass{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 3,
 						EndLine:   3,
-						StartPos:  53,
-						EndPos:    116,
+						StartPos:  52,
+						EndPos:    115,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -1050,8 +1066,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 3,
 							EndLine:   3,
-							StartPos:  59,
-							EndPos:    62,
+							StartPos:  58,
+							EndPos:    61,
 						},
 					},
 					Value: []byte("foo"),
@@ -1062,18 +1078,17 @@ func TestPhp5ParameterNode(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 3,
 								EndLine:   3,
-								StartPos:  64,
-								EndPos:    115,
+								StartPos:  63,
+								EndPos:    114,
 							},
 						},
-						ReturnsRef: false,
 						MethodName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  80,
-									EndPos:    83,
+									StartPos:  79,
+									EndPos:    82,
 								},
 							},
 							Value: []byte("foo"),
@@ -1084,8 +1099,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  64,
-										EndPos:    70,
+										StartPos:  63,
+										EndPos:    69,
 									},
 								},
 								Value: []byte("public"),
@@ -1097,19 +1112,17 @@ func TestPhp5ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  84,
-										EndPos:    97,
+										StartPos:  83,
+										EndPos:    96,
 									},
 								},
-								ByRef:    false,
-								Variadic: false,
 								Type: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  84,
-											EndPos:    87,
+											StartPos:  83,
+											EndPos:    86,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -1118,8 +1131,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 3,
 													EndLine:   3,
-													StartPos:  84,
-													EndPos:    87,
+													StartPos:  83,
+													EndPos:    86,
 												},
 											},
 											Value: []byte("bar"),
@@ -1131,8 +1144,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  88,
-											EndPos:    92,
+											StartPos:  87,
+											EndPos:    91,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -1140,8 +1153,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
-												StartPos:  88,
-												EndPos:    92,
+												StartPos:  87,
+												EndPos:    91,
 											},
 										},
 										Value: []byte("$bar"),
@@ -1152,8 +1165,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  93,
-											EndPos:    97,
+											StartPos:  92,
+											EndPos:    96,
 										},
 									},
 									Const: &ast.NameName{
@@ -1161,8 +1174,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
-												StartPos:  93,
-												EndPos:    97,
+												StartPos:  92,
+												EndPos:    96,
 											},
 										},
 										Parts: []ast.Vertex{
@@ -1171,8 +1184,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 3,
 														EndLine:   3,
-														StartPos:  93,
-														EndPos:    97,
+														StartPos:  92,
+														EndPos:    96,
 													},
 												},
 												Value: []byte("null"),
@@ -1186,19 +1199,17 @@ func TestPhp5ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  99,
-										EndPos:    111,
+										StartPos:  98,
+										EndPos:    110,
 									},
 								},
-								ByRef:    true,
-								Variadic: true,
 								Type: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  99,
-											EndPos:    102,
+											StartPos:  98,
+											EndPos:    101,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -1207,33 +1218,53 @@ func TestPhp5ParameterNode(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 3,
 													EndLine:   3,
-													StartPos:  99,
-													EndPos:    102,
+													StartPos:  98,
+													EndPos:    101,
 												},
 											},
 											Value: []byte("baz"),
 										},
 									},
 								},
-								Var: &ast.ExprVariable{
+								Var: &ast.Reference{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  107,
-											EndPos:    111,
+											StartPos:  102,
+											EndPos:    110,
 										},
 									},
-									VarName: &ast.Identifier{
+									Var: &ast.Variadic{
 										Node: ast.Node{
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
-												StartPos:  107,
-												EndPos:    111,
+												StartPos:  103,
+												EndPos:    110,
+											},
+										},
+										Var: &ast.ExprVariable{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 3,
+													EndLine:   3,
+													StartPos:  106,
+													EndPos:    110,
+												},
+											},
+											VarName: &ast.Identifier{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 3,
+														EndLine:   3,
+														StartPos:  106,
+														EndPos:    110,
+													},
+												},
+												Value: []byte("$baz"),
 											},
 										},
-										Value: []byte("$baz"),
 									},
 								},
 							},
@@ -1243,11 +1274,12 @@ func TestPhp5ParameterNode(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  113,
-									EndPos:    115,
+									StartPos:  112,
+									EndPos:    114,
 								},
 							},
-							Stmts: []ast.Vertex{},
+							Stmts: []ast.Vertex{
+							},
 						},
 					},
 				},
@@ -1257,8 +1289,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 4,
 						EndLine:   4,
-						StartPos:  119,
-						EndPos:    160,
+						StartPos:  118,
+						EndPos:    159,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -1266,31 +1298,27 @@ func TestPhp5ParameterNode(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 4,
 							EndLine:   4,
-							StartPos:  119,
-							EndPos:    159,
+							StartPos:  118,
+							EndPos:    158,
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
 					Params: []ast.Vertex{
 						&ast.Parameter{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
-									StartPos:  128,
-									EndPos:    141,
+									StartPos:  127,
+									EndPos:    140,
 								},
 							},
-							Variadic: false,
-							ByRef:    false,
 							Type: &ast.NameName{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  128,
-										EndPos:    131,
+										StartPos:  127,
+										EndPos:    130,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1299,8 +1327,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 4,
 												EndLine:   4,
-												StartPos:  128,
-												EndPos:    131,
+												StartPos:  127,
+												EndPos:    130,
 											},
 										},
 										Value: []byte("bar"),
@@ -1312,8 +1340,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  132,
-										EndPos:    136,
+										StartPos:  131,
+										EndPos:    135,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -1321,8 +1349,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  132,
-											EndPos:    136,
+											StartPos:  131,
+											EndPos:    135,
 										},
 									},
 									Value: []byte("$bar"),
@@ -1333,8 +1361,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  137,
-										EndPos:    141,
+										StartPos:  136,
+										EndPos:    140,
 									},
 								},
 								Const: &ast.NameName{
@@ -1342,8 +1370,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  137,
-											EndPos:    141,
+											StartPos:  136,
+											EndPos:    140,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -1352,8 +1380,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 4,
 													EndLine:   4,
-													StartPos:  137,
-													EndPos:    141,
+													StartPos:  136,
+													EndPos:    140,
 												},
 											},
 											Value: []byte("null"),
@@ -1367,19 +1395,17 @@ func TestPhp5ParameterNode(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
-									StartPos:  143,
-									EndPos:    155,
+									StartPos:  142,
+									EndPos:    154,
 								},
 							},
-							ByRef:    true,
-							Variadic: true,
 							Type: &ast.NameName{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  143,
-										EndPos:    146,
+										StartPos:  142,
+										EndPos:    145,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1388,38 +1414,59 @@ func TestPhp5ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 4,
 												EndLine:   4,
-												StartPos:  143,
-												EndPos:    146,
+												StartPos:  142,
+												EndPos:    145,
 											},
 										},
 										Value: []byte("baz"),
 									},
 								},
 							},
-							Var: &ast.ExprVariable{
+							Var: &ast.Reference{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  151,
-										EndPos:    155,
+										StartPos:  146,
+										EndPos:    154,
 									},
 								},
-								VarName: &ast.Identifier{
+								Var: &ast.Variadic{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  151,
-											EndPos:    155,
+											StartPos:  147,
+											EndPos:    154,
+										},
+									},
+									Var: &ast.ExprVariable{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 4,
+												EndLine:   4,
+												StartPos:  150,
+												EndPos:    154,
+											},
+										},
+										VarName: &ast.Identifier{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 4,
+													EndLine:   4,
+													StartPos:  150,
+													EndPos:    154,
+												},
+											},
+											Value: []byte("$baz"),
 										},
 									},
-									Value: []byte("$baz"),
 								},
 							},
 						},
 					},
-					Stmts: []ast.Vertex{},
+					Stmts: []ast.Vertex{
+					},
 				},
 			},
 			&ast.StmtExpression{
@@ -1427,8 +1474,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 5,
 						EndLine:   5,
-						StartPos:  163,
-						EndPos:    211,
+						StartPos:  162,
+						EndPos:    210,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -1436,31 +1483,28 @@ func TestPhp5ParameterNode(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 5,
 							EndLine:   5,
-							StartPos:  163,
-							EndPos:    210,
+							StartPos:  162,
+							EndPos:    209,
 						},
 					},
-					ReturnsRef: false,
-					Static:     true,
+					Static: true,
 					Params: []ast.Vertex{
 						&ast.Parameter{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 5,
 									EndLine:   5,
-									StartPos:  179,
-									EndPos:    192,
+									StartPos:  178,
+									EndPos:    191,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Type: &ast.NameName{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  179,
-										EndPos:    182,
+										StartPos:  178,
+										EndPos:    181,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1469,8 +1513,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 5,
 												EndLine:   5,
-												StartPos:  179,
-												EndPos:    182,
+												StartPos:  178,
+												EndPos:    181,
 											},
 										},
 										Value: []byte("bar"),
@@ -1482,8 +1526,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  183,
-										EndPos:    187,
+										StartPos:  182,
+										EndPos:    186,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -1491,8 +1535,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  183,
-											EndPos:    187,
+											StartPos:  182,
+											EndPos:    186,
 										},
 									},
 									Value: []byte("$bar"),
@@ -1503,8 +1547,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  188,
-										EndPos:    192,
+										StartPos:  187,
+										EndPos:    191,
 									},
 								},
 								Const: &ast.NameName{
@@ -1512,8 +1556,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  188,
-											EndPos:    192,
+											StartPos:  187,
+											EndPos:    191,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -1522,8 +1566,8 @@ func TestPhp5ParameterNode(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 5,
 													EndLine:   5,
-													StartPos:  188,
-													EndPos:    192,
+													StartPos:  187,
+													EndPos:    191,
 												},
 											},
 											Value: []byte("null"),
@@ -1537,19 +1581,17 @@ func TestPhp5ParameterNode(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 5,
 									EndLine:   5,
-									StartPos:  194,
-									EndPos:    206,
+									StartPos:  193,
+									EndPos:    205,
 								},
 							},
-							ByRef:    true,
-							Variadic: true,
 							Type: &ast.NameName{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  194,
-										EndPos:    197,
+										StartPos:  193,
+										EndPos:    196,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1558,43 +1600,65 @@ func TestPhp5ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 5,
 												EndLine:   5,
-												StartPos:  194,
-												EndPos:    197,
+												StartPos:  193,
+												EndPos:    196,
 											},
 										},
 										Value: []byte("baz"),
 									},
 								},
 							},
-							Var: &ast.ExprVariable{
+							Var: &ast.Reference{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  202,
-										EndPos:    206,
+										StartPos:  197,
+										EndPos:    205,
 									},
 								},
-								VarName: &ast.Identifier{
+								Var: &ast.Variadic{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  202,
-											EndPos:    206,
+											StartPos:  198,
+											EndPos:    205,
+										},
+									},
+									Var: &ast.ExprVariable{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 5,
+												EndLine:   5,
+												StartPos:  201,
+												EndPos:    205,
+											},
+										},
+										VarName: &ast.Identifier{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 5,
+													EndLine:   5,
+													StartPos:  201,
+													EndPos:    205,
+												},
+											},
+											Value: []byte("$baz"),
 										},
 									},
-									Value: []byte("$baz"),
 								},
 							},
 						},
 					},
-					Stmts: []ast.Vertex{},
+					Stmts: []ast.Vertex{
+					},
 				},
 			},
 		},
 	}
 
+
 	lexer := scanner.NewLexer([]byte(src), "5.6", false, nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
@@ -6906,8 +6970,6 @@ func TestStmtFunction_ReturnVar(t *testing.T) {
 								EndPos:    24,
 							},
 						},
-						ByRef:    false,
-						Variadic: false,
 						Type: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
@@ -6950,8 +7012,6 @@ func TestStmtFunction_ReturnVar(t *testing.T) {
 								EndPos:    37,
 							},
 						},
-						ByRef:    false,
-						Variadic: false,
 						Type: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
@@ -13403,8 +13463,6 @@ func TestExprClosure_Use(t *testing.T) {
 									EndPos:    14,
 								},
 							},
-							Variadic: false,
-							ByRef:    false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
@@ -13436,8 +13494,6 @@ func TestExprClosure_Use(t *testing.T) {
 									EndPos:    18,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
@@ -13581,8 +13637,6 @@ func TestExprClosure_Use2(t *testing.T) {
 									EndPos:    14,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
@@ -13614,8 +13668,6 @@ func TestExprClosure_Use2(t *testing.T) {
 									EndPos:    18,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
diff --git a/internal/php5/php5.go b/internal/php5/php5.go
index 3e695433aeea4a4a5decbdbc43e303a1b66ac780..162c38257aff062d8a898e9dbc2cce8a38d5a841 100644
GIT binary patch
delta 7494
zcmd5>Ygm=lwtnVifru!IiUP_~k(2ke7O-H67fb;!nUIj?B_TBhHPLORnRm<56i8*5
zcPq<G1@pwL?PbGBbCVHtw03zkK~1-}#O=;fEB8C+w*c)t&pCh2kMlzx=KSVm%yD_g
zJH|S_zxlQgnistn;uqs=*l^a|oQZZS{X_;YJr=V3SO`<cLijijo&1gsrG$7U+t1FN
zX~(~;%x9)fv}gWlR`(|-&YU%IPD4LGKkqb6ua@m8C5<<sh*RuwdhuxyP6-#8i!wY+
z($~vm6Uuvv`_TMM9?+`ptlsuWbDTbVLe_Y4?iL}`;S_TejNnmZ%jE6o%U!}r8JXNh
zRT(@o@Q+)G{mNTXpWPzB?4!VV7DSb2F&Ef{H>^9tPAUC(bJ{&oHlWL;%%6((GaJoF
z<KblgmHSb78V^!$q;tvX@m$u2`i$X&n1fh3kEh&;IP(8O8R_~lfz<kI*_d96;w}FF
zt7ZOJZYQWERc(8k|CLe57U*WeL_UzaowWF4K86}T%afU#wrydds-lcP%BXM>KF4}!
z`xX}Bol4K*$s)?*q|8V*nS8Ucz~NM>*<5huB=)%oRXJ1nZN^=(YVvb@6X(%x`l_1E
zrk7@5ZH$Xj|AWU;%4l|kN@wzcxKM8*Y-&LFU*G|%Vis@9Xyh!O#9}Ek^pD@hGZsyb
zCL*kU3t@||nlhW`Fc^CAaM_aVf8rsk(Hx%3xHIN~E7!k>D_zvCnsuPRye`vd<UB|f
z6;0LuU@=tFj<r@b^LT~6!`VcH7rX@1W?aF62@(e;1af~yJr){0nR^_*!moCbAN>~1
zeQA+XBvIuR*@aT>Nm7+N<&%tBFVUKe(_XlodcDHk%D$Ap!9|P*@5h|NTwlSQ1?9Y#
z79)s;m2;0-Nm$u}0^73yHD(28oJYAVXMSi|Uz)~*pX$DfFXwm(9@vtqX0R?)d5%3w
zo;;)J>KAzjy8kyefG%T#KFZ~Rls8=Z>Jajy-6wei^;AB8jKe5_&r3U1y^BE0>CHY-
zYu0kcgxdp)XuIEEr|lkPX$?WuNxfIV*V<T=_MUL6+K-dQZ{pjTHn?T|E!z5V5168K
zD`bi_=2G@;{6j{iM|c=zybX}S0XFsXcK!nsvAA<a6>CAmN_Z0We8;*NGn46>9yq-h
z?B1aV=7J?O=Uoh3M%d0YZYNJFC=rs}@A2Pwlr^g`JAgq`#*F6uM(X45^XrVhO67Bb
zU_6=fpWwgK>^(e5#Kk?}B~-bew<y>LY+A5V`lvp8`A){;JlbjCD+|PMN-ffo#?siv
zwlVdOD&EHza_(}g#rt^;r-l0gY(v(HW_2t2sET4<#Arq_52l3ykl@V6#@(7eFT-iu
zeKD9;e_|9@YDZ{jZK;Lj?0H604)7%If(ZHCuI9hQ-exrWke0!v^*5OwIm`zJIO2fx
z^EBE|n?8YZmhkS{+q$W55AzI0Ifo%m=V}(9mAx9)gu}F?!V5f&2A1+<9_69@Qhu06
zn~?e(+A{$Uuo%E--VxX*BUFTGq`<h{XC{K75d$ZfId+UEa)-w<dCqaXf~J<?aSp0J
zV=Y?2YC!~N^k?+(7up2-L~p8jnLnmpE$2r7D6!iA4^ZI^3AB&kF1k|AZ;-tTvKDpZ
zACu!7K;5vt0yyyvJiPU3)|jeZ<-_T-6VQj-L|lAblr2$JC%Hf8aZwM4)imn@9ae;}
zYD3pgTDNqf$_=caa(u@F7<be<#mhX1MrE<*)K91Q2*F)3IyeUEDUYi7o`(w!g!R~W
z^&A2)w-j!+`#d!3j;V9<WJ<k&S4W+P13>i~S)65t%D=OVlzb8J>w=@@U*v~`%L9ME
z#LJ;U6YyA`PAmQnKX67-+t=i14FRpywB>RVqdixwn85s_v?mX*%6d(<QRA-iLJfDd
zh|!T&UgATEuETnGgVzDlY0!^2HpWf)Kk}l7#oc-X4~TW@FIkjY!;^jE9LCG&t7S5X
z`j@fhw3UDeU)J!+9Ld8&t4ic3>gy+LbnrGHf5$C;Q>PE0eK@5w5k3mjr;$TE)GiQi
zuUD$Wzwme%KT6%Z%cn{&a!|%h(NMj5pRe)4hr@<(KPHYd9__JG3#R;4v=CLWR_p@@
z_Oyw!49P$vfC7;J$cVo!Krgfa1N`*I=m$g^<S)(v&mI&hH2{k!b+E82Y`TiCaddMp
z3neWDO$!pfDyykDV|F19x~jw;!i_NV5#uSK1=2)jzuNoewh%vPVN5bKk60EgE;0>Q
zrSo}PwW787rVg%j)=`T>#X1J0M(l*Em^S!KnS-QVbqN=10o8Gck}jg7Ds#)tjFz<*
z18Z|*O@wHo4n)hXjPfHe?Ib`+M|D2}_dx<<getr6A<X!y_Z@OQqg{^(q)CsO(OrJZ
zNOi_GU_i3$NPT)>QP(b75t(;c80Dql>1Hw`Lhr2Xj<vBSo2raRxr5Oehe!sjgDrFs
z5$g4>awDUQE+e0Ly*@#uMTu(U?pR9g4cW%TU<5oeU~S|d9}9cJK1TE`j~>L-i>{`}
zYje9j3fn;hO=dBYE$l39YEfVP6;Wi2W$wc~^by(Lh@n%zTHRl)uXPVH8c#|TZ)z#<
zZhLXE{u*uB3n%!fJi8pm$ZxPwO`Q_e3xl;8-S9>I+Nz#%JEMrl#X$PcT(7p&jb3sC
zqpm3;$pnWMO5w;poWANKBkA`vX!za}@FQ49>s(>xsurYP{3avB1uc$|JSSPc&*<PN
zm<-&`xKG4raf!hUwOJ%VO&KdDaY}s_C}Z+fuMAkl0i7Vhw<QPCe}Mz3JZ}Q9^z8F8
zkiM7$$Os(Be8^EOOR3-`8LEEI6dxm<IaTQp*^bk9&*Jf3vEaj!&JK~0YSJXpiqp+2
z!h6%@EWEyEFJ8Z`sm-RI$QI|dA8XMmXO@uasi~OZahB-TRK{~U_?+H|Hv1;zAYybx
z>jzq^rp?qxSrM&~AwbQVWjPMq#C!PM+4`htw;DS~?B?9<jjvAg#3rV>?&2(wMUMFb
zxzq%+N$2Twe!fTq-g<fOngvjn3(UkQ_uc|g0M5_{!MAS_f)5I@gj$s+f>o3IESS-n
zrA9SIj$W^cHk6mfo2pLB#4V{Y#hior7i=O5HZVi%9?t0B@*s-CYer1L12NFg!JrwP
z9Vr`8$ud~w*BTT*H-6zmRmmG-aa|<;Ppf(|YEdAPsoz>4Sl>X|fYY+|BH0^B-kDn)
z1mNAFdTkV7ES`<RpW^d*GgY%y`g2O#24j}k0b|&2Q^gJBT}B7q!WP7?c}B3m+zS|Z
z2UAf|wD212Gh_!`GulB3?}EY<?GUTAJur9$_Aps^xf=Gq=*j7`ok;zrXft#;<U?Sl
zNog~7i!U^LHjKJHmwO2N0xYszT_}p+GTyA7GR@1W6%IKF5{-;EjHQzOC~R>!0>y54
zvGApFM@9F7!7PCiQox97#=@IXE;XdUV(}}Fj#G`5C^JIhk2dt?SE3u`bOSxt$Efr_
zi+k`P@4Isjibhy!(H#pwFm;U4gc6a&94hr7fPv0E$p(mMWKWG43JX4Cbm$0lh1{pr
zN8LUWt*I~t{AlD+F{>7GywzCezt*BnC@rc$z{O8Qr55<5Xw2x(Ww^$KRj9(Z{fsJ(
z!<7(Lx|}o16&^5}QC_)7)UFQ^{%}m1E~pTg=7c-Ou^-yJU84}TnIK7{9VaYjGJ&2(
zBTi!2Zju%EEi?~z7k@22l?HiVM1fTE9ZU{>3J&u!{dNkTbmTi!)n}{07)+V6=f5yF
z`xH(9weeFeP77I=1{`N#UvqnS@%O+(jWA(4^U8wnMJwtt6_{1g3RT<CDiJ5NAyA04
zx6ZwO9u62Aqhc?Jv5c0U*DAiihZkG~1V@9P+#HO0c*jL3*VL0)G~yBjL4=2q{U>C`
z*Kf;is_#|N9F*a*h6*V45@IO(vRJMKM0|#tm1@#IWgk$4Yd9)e<8_#-ye)<>Vn0GR
z`3+>4!hw%5D!KuiLq>B<Re(%lH0~y*w7K-j)>PwL8VukWIA3oZ%INSvwKvrrjiaXB
z#v(-D1N%aMu{_FsRwk1Pg`z=-hpG(eQsRy{>CL2}RQZdDQjzz>pEQ?Is9iR5io36s
z<*od#+y_25b&+8idEI7-%b+oB&p;+$)`NBv@z{)1)`&8Ov1S&`|H$Oq2uIZ3!$3)Q
z3z>_=0Xl}!197C0ov?Hi0mS@@ePzBD%^oNtG_>^NR^HG?R=|~?ym`axelG;bWaKzg
zlUQ1fYyw5P>ZPS`F`+}t<X8*AlA1|l+DP^9%_LZcH^&}mF3&xjV?S*v4dpP2N)sei
z)(SH^$C}(;5u(3a_Zu3dz7CUT82~+2RVRt*pci(jn<s_~*fn7wkfwejvW`Sye6@qr
z9f~?8RL7-o6UZQL>Y}Da>YKc^Yffj`Tr-+C88z*Uy>5#WfzX(YuW^Npv|w82n23%u
zEY6?9X$*m@WqCN!`2eFRbV)-8YhN3n?z9Kxp;2xL>^4s}<PxmaDg&)2gYIl$G_xlb
zA+^?Wp34kXjN#c;y=0By!*Jn_YD0>+#^`(kRwI%3OO#zS(OJjn`lCh*dQ0&L@d2Zs
z2VlYkmZ3i=ZW|<H#v<qnjOV77qhyFoRPPOvtvKwUlcWLz8O#kEHpvL2E``yCVX%W6
zb})0Gb*YSor@{?jj9_wngtDk2RqoTiU=gO_@(o<ReI6>zl95tU-ZMbZ|L)+x(jU^b
zdQ5ULUT$Nwtql*L(@)76ROMhD3hp2*?v9X!5V!g|YpHNxuok!KA21z?anpfX&S>u#
ziM(sl#}s;ItgMCTmb7Ri8dpJ2!`Tt{I_^qxWM4XJO=z^Xpr`vdi2}jPhKjBsZ{N8q
zx~cx-q=(UvXRsXwzAn5GD?p?><F(`uHe0q#z)Vb(u1q@<+PHSA$>46<+L!gS+PHfs
z$`urNjYZPa&q90iufZOt@R#m%O)Zo0YTP6_fr~g#l)~@_MjuSUn_y}45eWU0PATe(
za*6)M#_9NGb!R5iV>!mSi|>Ps{jUFx(Ju{G;H47;eLhPjsiYZlnV_|E<N!^e&=Cx_
z6q7htCW0Awdoe~=KhL$UHNC5yFXA|pZw+j;P+{}r0$&)Q*3?7DwiN5p4={P@1O|o}
zoAl9lnOsRjmP&txMtFN&w6=Loj;X7&3lXFag%Z1y=~Ed0nzT|z8<#hYu%K1Yk5%qZ
zrlWd*<X_+5%3clWOsr&6n_QVBoN;ItZI+`LmE`GH)Ux7(z@KjU@=9&T#AH4Kf$&ki
z*I=50*GQw0bXv0xpoiiOwRA^bu-<6X1P3UaFQ@4nFk>2V+0=fcfl!mup}LK_a`K+C
ze3MM1$s6S~@@&RmA)91?TDchz1|1+yvuV{<$mjH4L-)4hR1>h_nn>cF?04{3IGC|Q
z*bWS0Vju3i!t3MTgCjY!h5di+s&3ZkY|M@}SrQ%Jh1=1fs<+~T50LDh+XWinsAj$<
z!BdajxYp^=&5;lqeF^`id?-)TYkRQS^@pCxWW->hJ~Z~>UJB+<?8AJFv;G)`V>;+;
zWRg$reu+*NUJ7QU04GTttiq+{D)}WUmKZhY6ZtClamDB^3AKBLHCI;;pk(ujGTk{^
zoerJ<a0p$AV~1o{Mpb9L^qOvz%N|tJ8eAkN9=~_&{fj)q-O&o|l#85JmdJ**Vz>;T
znsxYDBDYMop^rY5t95vo&M$m7k@g&cQ|Y#|j%sB;D$%%fM%RUFTTUIyv@$$8WV`By
zOI@^r#xE_`50BL$dyt_jAo~f~TOF&APYQr+oWk&DPHj)f1)6|0qgItN)X;Hs>tzR;
zUMZ7wk1mKxo&yYyJqhrtYAQPEy2Y1Ls(5Fr{8DzOYhM82G+I*ky~0J?hRXhQ`&%uR
z)7(fELs0BIdqO_>$HNl_p#eGVlza+-=+XVQB{cZ7_PZFWCqH>-p(ImBG(RIVG}W=1
z)YrbpO6U_Sk^ABl03ThITj#8pSi;eUtZU7WOXJN545BS<`5O;YffwWy&Yj4M`gf+f
zWlCO>j|hzk-LJ@SXw%ykL^;!$9vdwis^iyCIdiwSr(aj5&_m}3QCJ>pM|mHLEp)ag
z8-Z3DB1)6Px@w(jYUFa-bW85k^xDt|;JS|{ps&E`-0H?pay}?meV4N};iry{`j@^&
z>eerE7o$bP0U4&%ap<m0(7z*?a}3>T^PB9ge;CkwKw<DRdeqF8WVJEuqd|&u1*-Y)
znQfK+p`ca-d{Fp+UWvmhaguGecwU>8%w2E!+6r_mn?}}1KidYB=dqSSvi)r)1J(CU
z3me&xrth*~DhaTq)A#_00Jtziv`SUeVB4FV934;)-wU)QsZot>Z*e*wWCKf$(S&vj
Tr?QqdM0K<tt>?6>waxV}2BpJZ

delta 7667
zcmds6X;{|Pwtx2UGARlQsE7<E=IlEI;(!w<&Ow8w2FFY>2dv1Pf;w83<t$4av2GEk
zqhgjjJE)XenVrN2t+WI+D~A-by2l~!Z}0#6g7w_zx#zhb?uYvc_Wtj^_L|pkt+({`
zh!Z;^D$1g{H|ekC(a)AgGgThV=cg2(mqX~e@jQ-3PGdnd{Q(|GPp#lF6qU-uXxn(+
zm{z{Q+femE-k+*R^HAD)h7G5*mAom{jOYE7{XV{f(TM^PLFaO0W17B822#dB7E9Gk
zIN5xvsgfP2Nv@2g{7$S{qY?R!<;|F$J2iWDJ|$F%Hnh8#2hoDnJd&D@22pde)Fzu#
zNilCu(=W+zeWXXwJ-LtM<vy4<fpRy<c$)rK5kt#Xa}UK2=7GhFSTnLeEka53W6deQ
zKM!p<|N3*n(ZqkdV@Pmt@O;V{$6Ha!YTl*(dXw82o7g3uSU(nN2nF|@mOt^4M{}n?
zNSad9`lXN5_+7FEy}y?=q2AAlWV(De3vS?|@$FR2{XZz++Z;ZW?ij-}STglp$Wv+Q
zMArO&G)Y^!d0a$N^;OyLPbN_?NeHLi)$ISw8g<FcxjIaArM-19;r|=6tl&vWl-nLY
z@W3!Whz{rSbl50&y=bj2?&JL!JvxC8VkuO&mHBsCP2?HEZ8z5@)1irc5O*Ze=0|y3
z>N%N*tJyEJSVm9e@fMV}2VPy8#|O}-lXyBY7o55KLvYCvkBG(;|DhN`_PJsm)!3Ow
z-*|(&U8>6zzMgZhlaAD~$0=<Z=zGCZ0lz`dOgApHJXW;Ubb_e$BRqn}PC*D?J}wd{
zEtQX;{EuV?RqVzC8$S~LC^{c<EnfrYt=PeA|Ms<QGkFI0*lGEDzPA+KTEMu&t03wg
z#$65tp87NHwp*OW%z~yos`i9D$|!X<7GCRi)htMCpDg~9D(3L#d6JiEZ}3=3`$k6U
z?O?j;=7B2bx(s3_OljE+8BBBc$zWAFk1u3A#ciUd_#huz{51Dc(Lvr#H7n!~LQM|Z
zeopq(pLRaY`v}bzBCLjUw+Xe~s%8-{;q=Q3(9w(n-jRmx;X~-=VrW$}QYasyEiXVr
zbtSM(&dW@y$QOAwXGygEl;}bgFG0)sz1S{w?=sF9PjYDIh@$-Ed>wO8?L`QQVD6|M
zUcpz{U`6dZRJx5fR(G!9o0&G9WyiI6B)*olpz0skSz5U6_BW~UpNQn0AAsV>2l=y<
zQ_lL)iJd%~Mr?q^Q|QPT8AIQe^C0z)4g5RClN}UZD5L0;0X&0lZGx#BDKxW&O{R)c
zNaplCn!g!Va8W`ni=t(V`E=^_63DshMTk_8FN0ZZ8=)e##OajxAN+TkR|cImUBg?d
zrLXXdc+}^TSIh83vd<-Zl=F0+VkemWel2&fI$O^7!)6Yu%jAY;Hbwm%96G^Bh;6Jn
zL^u>hx9$<m)V2^?C8Lpjc{tVdVFT#qR-PW<b|QbzrQ8RY)2Nr?*1!(q-hlBxo5<p5
z;C*Z^p(MGeW}}=<Rj+cV4x&3~Z!T*?%dYV(y0{%0?*AsD5PlzQ2q+LZ%V1h?HjXyG
z=?^9!msxL_joJmUpz#D)rGQa)1%(vt;>{>66G3IZ%%8_zX4GRB)a#)98kR>F@IT%7
z2M<xb-_hZLsDM2p>64SN(3ncd@Ag_2YP1{b^LQ+`IHVVFVuVtXcFmRGPKUS7J_8u_
zslwa#OcCQ-fA=odM}Fu2_2PYepm5l|s&)?_&&Y8A>C2(L#ZTba`?#R<jwaBb(Yz0h
z1EekFJ$D}DVFK>!xN733h!82k)aPlaa_d2UsrY$Vs3MWSO|1^Y4}ud}f~8_CcOggW
zu%pWfD8o4)^JzLJBPpyc3#E0R@k^@o2yY4}NKxBA<s${G2><XRN}H=8NBIE(9}LgK
z+W;f?sZC$==0YbtDB(J7`xc5ETLZfpYNcg}f*B{Z$2saXx`ZbuS;~CB247OV*40L*
zkeOX}ziP2UI<UOIW+qFd5vTb|?lgv(OheD$rZa_Vw#aBzafSyYWx$=VBCI;7n`ikK
z2w%I;G^hDUy8lP5{ZU}8v`l7EqjTVN`Cb0yZY*zSGJ__Z2M2ymBQ6+D)%XiY@51fy
z(5Ol|hN^z!HY&QpLsi}-UdMH`t`PBNTVeYIgQ{4lNTdV5@eUOK3lCFi6NF@|yNfuh
zZrHE!1gfq>k(u=?V$qYL_WsJJN}bW-)sX9a6|)jZYYJ;5LX_<$Kg77lq1`Nw;zLD%
z`t5gK%U~nqu6POy76EVF65k@jn?#+cq`(SnATWFvf^6a>gZUa*4Gk2hbYy8(Rb;UK
zj2xu>5RYEcXB{tq9XxjqO2y;4tl(3)N^Xk7+?k|{LOazfTztnU_g6qa!`h(c0ugJ{
zYMdG#DURZ{mySe>1eMW3tk6&DS17H8u&HY;#TU3d5f-`J5~5y?7Ay6M94%KxtO!*r
zost+0iWR8YAkzWN7TM)SMt8@HLE1~Th&f$ksQM^g%ivahyU6{FrnkdqkCx8&Ij56c
z!)R`MY=e&GAik{(SC`x4R`C?;xj+>guW7I9BnIiAH9Q0oHUm^}XB-sCKoMY~of_Fe
zu4DAKZiWdMCQ-HQE?^Uvwn?1kJwU}dpki7PZqW%)ce+FkqnZWQV*#qG2Wv>{$i#J5
z5*Edw{%<KM`kSdEs7^7^O`lXKT4!lC#rFVV%ce&5(uQ=_S8l1AWXh3@UP^<`ERTp)
zA$>)O_6Q?5$l27|XniPRfYAp8NKj7>5LC}jYC6o=z)r>>@#7!axhE400#)6{j~YKz
zxH(ucS~n_qd$>5mXn7@zv4rT@S0W8hyvs6<Ul0}7N3LfyBimvIo~G>m<rYRo_do{V
zJq<t95BG@g86DXNXF)L^th$dDlQ>ia7l@+LCqy=}u_B#2>>B$a6aIvBSG5wVtr{!d
z0nYG|S(_t<aP1oUbu8Me&J#pSPPx}m>J6E#6GeuOj49#{)#@Q_hh$5;_Iwef+DsOw
zVFv)nLJ_ADrf91;{lPg!NY#0&Wf0>C@p{KGU0;DM%oR^QbYewkyz23YzVCIagvZ3+
zxrJoo)WyfedaZ6F2zXixzd|?~!L#U<*+OScAD+E;jxbqMKd1K25yjdWv;|bbJh2MT
zT5?m!64dV0C&h!lw|h1;mg;<=_(f`wac$>9G0Uc_p|PUAMfbZ|c=7i<KwWy2cVP76
zVjYdQk^S?5mtHhsp<`2lz;&QRq)7emn~c6%4(%f2>kvdfv8jqxB8b!ARU(}wDI};4
zoZc>mA(Op3NnGZ@w7%Ww^*90ur^y!Ke@@3sMHuC;7h&pnfZU3}Erl-JDO7j?I%v8X
zY<j#jdb23k#R`90tGJiM!<>ediC!9k(&E>VW8z;CU9}_W8fzLoT_98F+btrUP=;D5
z&uijija-XQ$|cnJ86Kftd0kY%>?u}rh@xnUYKp?0O6^=Io>A0&9D@hW;<9+BXhnP4
zp^1)pS9ppuSsJB{1jM;K4tA}1gNM-P+r<s;b<>8oL>tP#CDL%Ei@JY@NaH*yMPYlE
z=Fr%9Nu~IJ(e+(oph&XAr{+K%ODo0uj5<^{C<v!Qb#X#+iBnkM^HWvOyeUp`hNBtV
z!9$u0ZUMF)(<$E%Wco4sX&-E8a#L%nIUppZPGr$4f4|7~hl9fQzqFT@Ze-ROHSV9{
zen!~`#XwzG@${eWHeqz?Bk*WtD@_0+ir+rQj_Z$9HtQ0y{jiuqd50}`36fK&bv4ZE
zHGbbo!(J~{Phx@UP_?L(6m(1gkOl$N{``f=pk2ohE`AU(gx)=BToS-~63sk@|1FTM
zs*j0KU_UQyKQ6p<;wv;av0sU2@VZtU9X>8vD(rrSDs>G>tm-Q?9VH*gFsdly0hH4Q
zz7T#wBnui-i}!L)iV~z~b^W9m$E3%O>}W9l{#ubPJXk@&QB)WTRFZc}2N7^kd-MRU
zPaEzK?lG$9w0J?+5ok4ru&}9a--%~^LED-(U6D=|c0oiiYViXU=hb<tH5Hyl!72Pf
zyr?rc+@xVAgHgeG98A{P#77YavEA+>wvG83w$mAX`jeGK5oZllu>aI$TtaHO{W)yg
zuVCAhy+52j`Lhm14_*5j&8-QLiou8yEfDSgRdiJ!Tos?2Y8YcNkIhoFYi@;}V*{rf
z*Ps&P@doT?(bnrA2rOv4BKHP(#Nvo{i{>|>U8loM2_x7jLXx)8;cOr^`$86dTcG8q
z0xg%`ExYLfSQ|>q0@z2x-JhD=GJ+)-2frnjYFw!pm)XcY0Qaj<2IffFms>R<PUo6m
zbP)L4r7Y?ZECCqyVLIox0~B*EM5c3>kKy%=^uj8ZDs6?%c#WD!qfZS{OtE~TiLAZ7
zSQds!RCZsbGAEvGCQ*%iUAjR9FGgTTmq>$3Rz_h(ec$n;h?164V<Lm6R7o@t5O;$I
zT^!~O5Th8q+(rUZo7<f=76R7V76(}jp2L#{5!K^4&1M4}0-QQ{2d)F&)%BE#DlJuP
zVDv?z)OkZEX(LrVNLh>6zZ0bOWMgMn@i#{2J4!RLFonioIDj<BXZ1rCU^v`XY+_{V
z2BI#jWSfI?x<N2n_8y`UY6w@mV+GiWb%Gt347x}pz{CIzAE5x#p(QF{8h|^m7qra8
z$ftH-o6U>{CgU#p5~D|e8?Za92lzujQ7?-II2Ra|^#lb2zI_ycasXep_XY(Nc|!q+
z#$V)phX8%f8(0mrNBA75&SdLr-wZGcGfFUU<l%v`rA7j#&S6JzdUY^d#e&5e-4QJA
zGb4Z<%-CWWo^~dw++p&x0pmWTuyq9Xk=*`Qfzgl3M}al;6ewnD>Maq>sI(0R&4{6y
zrn4;m7i&y=vg9`K7XCGlQc+wsZ8&tDrvRW|fd`}OY^Chq$VC{>-6zulqd}Eq9wm-O
zSfErOsPpLPXguejQ3Z(U=f;@eFkOd<sVigTY70Z@YSWNLj*gW@+Qoq<5_AF_$Y}Qi
zhHd}6C7u3~12uTfyrq*mnj_m|G~&`AA&SB-Vm{pVFSw9Q;TM1aZ>1oLH)2B%vFrzA
zDt&ZFHlrDDi(u7zf*i~-J5k*a$g{w!li(j1lIT+kMF9Y0a~{}ssig<y<BT477z@)0
z`BGTeRQNyezt1}FVW~dPmkR_f$(JTW>j4aaYe$tiO#+VJ_m~`@J@9g-1$wh6r~vBo
zqLMTupLYtty>Un1GgBYOhD+<Tv#NPqJ{edKnzQJ`C&9wfA{jz?1-v^AJ<W#`70L|E
zB!F59<rd*^c+~PD*@<%(Ml`0^E|>2yDp>$&;Y<F8yKjBFAEw4El-sp$8+_9FS?Pv@
zLhwa$k2Y??bF#wMRb#v|0L8D{^IE??AE<pEB023&)oHOr-FHyw9ON$`8k?$nL7qdN
zScX|B`omxXjtNj~DK<4H@SrJl?{a9)G<xwGNd|D*zY-!Q3<BUpo(<&WD#qH;2xq_3
z{~`ZOr4o|qG_pWGOqpw}EN#5*1{T8QaBEh^Fxs?M8`#I@sC6i0xy_`X?A{H~vejez
z9_m(#9is%FA!@L}lU#p}f#R1z7E=b@)%?3d)n2G4uYiF?Wiq^Y2p>jEU&X4&YqAlo
zMW3uYqAcoLhWAhvq3}GqT4tD6uvZvzSvgiN|L~+-VtC@Qh9|0`T<&AEW()M-P148j
zH3-i)(*hJ+T>-VF?tss%TLV~II7~+932QRt--Y=!=HZj-f2<+&THn*A`Mfv%{06+r
zV^3DScF0e3i=;x|l8bnN+hHb!3D2+ywN1%#j5gc^hl^17g=(<&qWac=U{FchDy9CJ
z3qiPSERz~@P5AT3Jg^diC)*VUG-uI0Q~{rDT7_R?%+=X@<r0Jp%vdM^{;G5UIh-1p
zby8=l<ZH+(_Wvf*k#@h|52d+13IX0lqk4pWPaWvLz`b2+*+E%}MB-J$56P8+zCI!g
zRnB2KS9id}4$0oMej3ta*Td4KMt>?_Lp&uBj`mV%U&u^NE~kJeThr|(UxI%OS^fZ)
z0;u{97O%eiQs$t6s%7mk#Nydh@inYbb3%qFeq3VA1Djrf()=m*6AURFcEwK0-g=4`
z{xNzQ|IjZ*eRxWC5CLwlF~Q6yc{e@Jk5WC(%43Ye@{q^<y-X(xyBBXP{Xr(61@Zj~
zra$gHFG~bR|BGTXigJ3hR#bBVs5|EpWW;zv_Yn0cwHc$lI_;EBwWChXhYn23G+Y&3
z1=i8snQ85x`c<ZBc!j%hs`qvI8>26;nT%)(08qD0^|>y4>K@2=hwiG>x|?zpLl0y%
z-)ht?xmNeSrsHYEY^iw7NB<#VLtE?{f0(;5HX9Cmt)YCw+_GDs%~T3A*nBj|rpv<2
zTqI=^Ux~r^ioi9P{TLQ1Ak?;*Q&nRdhPn<k@gcTNoXVQoG}hCrjhtR=W<wQF@gX++
Ksxdv%=KL=sMJieV

diff --git a/internal/php5/php5.y b/internal/php5/php5.y
index bd08ea1..50aa2a5 100644
--- a/internal/php5/php5.y
+++ b/internal/php5/php5.y
@@ -2283,12 +2283,27 @@ parameter:
         optional_class_type is_reference is_variadic T_VARIABLE
             {
                 identifier := &ast.Identifier{ast.Node{}, $4.Value}
-                variable := &ast.ExprVariable{ast.Node{}, identifier}
-                $$ = &ast.Parameter{ast.Node{}, $2 != nil, $3 != nil, $1, variable, nil}
-
-                // save position
                 identifier.GetNode().Position = position.NewTokenPosition($4)
+
+                var variable ast.Vertex
+                variable = &ast.ExprVariable{ast.Node{}, identifier}
                 variable.GetNode().Position = position.NewTokenPosition($4)
+                yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Tokens)
+
+                if $3 != nil {
+                    variable = &ast.Variadic{ast.Node{}, variable}
+                    variable.GetNode().Position = position.NewTokensPosition($3, $4)
+                    yylex.(*Parser).setFreeFloating(variable, token.Start, $3.Tokens)
+                }
+
+                if $2 != nil {
+                    variable = &ast.Reference{ast.Node{}, variable}
+                    variable.GetNode().Position = position.NewTokensPosition($2, $4)
+                    yylex.(*Parser).setFreeFloating(variable, token.Start, $2.Tokens)
+                }
+
+                $$ = &ast.Parameter{ast.Node{}, $1, variable, nil}
+
                 if $1 != nil {
                     $$.GetNode().Position = position.NewNodeTokenPosition($1, $4)
                 } else if $2 != nil {
@@ -2299,40 +2314,33 @@ parameter:
                     $$.GetNode().Position = position.NewTokenPosition($4)
                 }
 
-                // save comments
-                if $1 != nil {
-                    yylex.(*Parser).MoveFreeFloating($1, $$)
-                }
-                if $2 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Tokens)
-                }
-                if $3 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens)
-                }
-                yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Tokens)
-
-                // normalize
-                if $3 == nil {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.Ampersand, $$.GetNode().Tokens[token.Variadic]); delete($$.GetNode().Tokens, token.Variadic)
-                }
-                if $2 == nil {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.OptionalType, $$.GetNode().Tokens[token.Ampersand]); delete($$.GetNode().Tokens, token.Ampersand)
-                }
-                if $1 == nil {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $$.GetNode().Tokens[token.OptionalType]); delete($$.GetNode().Tokens, token.OptionalType)
-                }
-
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
     |   optional_class_type is_reference is_variadic T_VARIABLE '=' static_scalar
             {
                 identifier := &ast.Identifier{ast.Node{}, $4.Value}
-                variable := &ast.ExprVariable{ast.Node{}, identifier}
-                $$ = &ast.Parameter{ast.Node{}, $2 != nil, $3 != nil, $1, variable, $6}
-
-                // save position
                 identifier.GetNode().Position = position.NewTokenPosition($4)
+
+                var variable ast.Vertex
+                variable = &ast.ExprVariable{ast.Node{}, identifier}
                 variable.GetNode().Position = position.NewTokenPosition($4)
+                yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(variable, token.End, $5.Tokens)
+
+                if $3 != nil {
+                    variable = &ast.Variadic{ast.Node{}, variable}
+                    variable.GetNode().Position = position.NewTokensPosition($3, $4)
+                    yylex.(*Parser).setFreeFloating(variable, token.Start, $3.Tokens)
+                }
+
+                if $2 != nil {
+                    variable = &ast.Reference{ast.Node{}, variable}
+                    variable.GetNode().Position = position.NewTokensPosition($2, $4)
+                    yylex.(*Parser).setFreeFloating(variable, token.Start, $2.Tokens)
+                }
+
+                $$ = &ast.Parameter{ast.Node{}, $1, variable, $6}
+
                 if $1 != nil {
                     $$.GetNode().Position = position.NewNodesPosition($1, $6)
                 } else if $2 != nil {
@@ -2343,30 +2351,6 @@ parameter:
                     $$.GetNode().Position = position.NewTokenNodePosition($4, $6)
                 }
 
-                // save comments
-                if $1 != nil {
-                    yylex.(*Parser).MoveFreeFloating($1, $$)
-                }
-                if $2 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Tokens)
-                }
-                if $3 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens)
-                }
-                yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $5.Tokens)
-
-                // normalize
-                if $3 == nil {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.Ampersand, $$.GetNode().Tokens[token.Variadic]); delete($$.GetNode().Tokens, token.Variadic)
-                }
-                if $2 == nil {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.OptionalType, $$.GetNode().Tokens[token.Ampersand]); delete($$.GetNode().Tokens, token.Ampersand)
-                }
-                if $1 == nil {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $$.GetNode().Tokens[token.OptionalType]); delete($$.GetNode().Tokens, token.OptionalType)
-                }
-
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
 ;
diff --git a/internal/php5/php5_test.go b/internal/php5/php5_test.go
index e3b98ab..d36ab6d 100644
--- a/internal/php5/php5_test.go
+++ b/internal/php5/php5_test.go
@@ -1,6 +1,7 @@
 package php5_test
 
 import (
+	"io/ioutil"
 	"testing"
 
 	"gotest.tools/assert"
@@ -13,396 +14,16 @@ import (
 )
 
 func TestPhp5(t *testing.T) {
-	src := `<?
-		foo($a, ...$b);
-		$foo($a, ...$b);
-		$foo->bar($a, ...$b);
-		foo::bar($a, ...$b);
-		$foo::bar($a, ...$b);
-		new foo($a, ...$b);
-
-		function foo(bar $bar=null, baz &...$baz) {}
-		class foo {public function foo(bar $bar=null, baz &...$baz) {}}
-		function(bar $bar=null, baz &...$baz) {};
-		static function(bar $bar=null, baz &...$baz) {};
-
-		1234567890123456789;
-		12345678901234567890;
-		0.;
-		0b0111111111111111111111111111111111111111111111111111111111111111;
-		0b1111111111111111111111111111111111111111111111111111111111111111;
-		0x007111111111111111;
-		0x8111111111111111;
-		__CLASS__;
-		__DIR__;
-		__FILE__;
-		__FUNCTION__;
-		__LINE__;
-		__NAMESPACE__;
-		__METHOD__;
-		__TRAIT__;
-
-		"test $var";
-		"test $var[1]";
-		"test $var[1234567890123456789012345678901234567890]";
-		"test $var[bar]";
-		"test $var[$bar]";
-		"$foo $bar";
-		"test $foo->bar()";
-		"test ${foo}";
-		"test ${foo[0]}";
-		"test {$foo->bar()}";
-
-		if ($a) :
-		endif;
-		if ($a) :
-		elseif ($b):
-		endif;
-		if ($a) :
-		else:
-		endif;
-		if ($a) :
-		elseif ($b):
-		elseif ($c):
-		else:
-		endif;
-
-		while (1) { break; }
-		while (1) { break 2; }
-		while (1) : break(3); endwhile;
-		class foo{ const FOO = 1, BAR = 2; }
-		class foo{ function bar() {} }
-		class foo{ public static function &bar() {} }
-		class foo{ final private function bar() {} protected function baz() {} }
-		abstract class foo{ abstract public function bar(); }
-		final class foo extends bar { }
-		final class foo implements bar { }
-		final class foo implements bar, baz { }
-
-		const FOO = 1, BAR = 2;
-		while (1) { continue; }
-		while (1) { continue 2; }
-		while (1) { continue(3); }
-		declare(ticks=1);
-		declare(ticks=1, strict_types=1) {}
-		declare(ticks=1): enddeclare;
-		do {} while(1);
-		echo $a, 1;
-		echo($a);
-		for($i = 0; $i < 10; $i++, $i++) {}
-		for(; $i < 10; $i++) : endfor;
-		foreach ($a as $v) {}
-		foreach ([] as $v) {}
-		foreach ($a as $v) : endforeach;
-		foreach ($a as $k => $v) {}
-		foreach ([] as $k => $v) {}
-		foreach ($a as $k => &$v) {}
-		foreach ($a as $k => list($v)) {}
-		function foo() {}
-
-		function foo() {
-			function bar() {}
-			class Baz {}
-			return $a;
-		}
-		
-		function foo(array $a, callable $b) {return;}
-		function &foo() {return 1;}
-		function &foo() {}
-		global $a, $b, $$c, ${foo()};
-		a: 
-		goto a;
-		if ($a) {}
-		if ($a) {} elseif ($b) {}
-		if ($a) {} else {}
-		if ($a) {} elseif ($b) {} elseif ($c) {} else {}
-		if ($a) {} elseif ($b) {} else if ($c) {} else {}
-		?> <div></div> <?
-		interface Foo {}
-		interface Foo extends Bar {}
-		interface Foo extends Bar, Baz {}
-		namespace Foo;
-		namespace Foo\Bar {}
-		namespace {}
-		class foo {var $a;}
-		class foo {public static $a, $b = 1;}
-		class foo {public static $a = 1, $b;}
-		static $a, $b = 1;
-		static $a = 1, $b;
-
-		switch (1) :
-			case 1:
-			default:
-			case 2:
-		endswitch;
-
-		switch (1) :;
-			case 1;
-			case 2;
-		endswitch;
-		
-		switch (1) {
-			case 1: break;
-			case 2: break;
-		}
-		
-		switch (1) {;
-			case 1; break;
-			case 2; break;
-		}
-		throw $e;
-		trait Foo {}
-		class Foo { use Bar; }
-		class Foo { use Bar, Baz {} }
-		class Foo { use Bar, Baz { one as public; } }
-		class Foo { use Bar, Baz { one as public two; } }
-		class Foo { use Bar, Baz { Bar::one insteadof Baz, Quux; Baz::one as two; } }
-
-		try {}
-		try {} catch (Exception $e) {}
-		try {} catch (Exception $e) {} catch (RuntimeException $e) {}
-		try {} catch (Exception $e) {} catch (\RuntimeException $e) {} catch (namespace\AdditionException $e) {}
-		try {} catch (Exception $e) {} finally {}
-
-		unset($a, $b);
-
-		use Foo;
-		use \Foo;
-		use \Foo as Bar;
-		use Foo, Bar;
-		use Foo, Bar as Baz;
-		use function Foo, \Bar;
-		use function Foo as foo, \Bar as bar;
-		use const Foo, \Bar;
-		use const Foo as foo, \Bar as bar;
-
-		$a[1];
-		$a[1][2];
-		array();
-		array(1);
-		array(1=>1, &$b,);
-		array(3 =>&$b);
-		array(&$b, 1=>1, 1, 3 =>&$b);
-		~$a;
-		!$a;
-
-		Foo::Bar;
-		clone($a);
-		clone $a;
-		function(){};
-		function($a, $b) use ($c, &$d) {};
-		function($a, $b) use (&$c, $d) {};
-		function() {};
-		foo;
-		namespace\foo;
-		\foo;
-
-		empty($a);
-		empty(Foo);
-		@$a;
-		eval($a);
-		exit;
-		exit($a);
-		die();
-		die($a);
-		foo();
-		namespace\foo(&$a);
-		\foo([]);
-		$foo(yield $a);
-
-		$a--;
-		$a++;
-		--$a;
-		++$a;
-
-		include $a;
-		include_once $a;
-		require $a;
-		require_once $a;
-
-		$a instanceof Foo;
-		$a instanceof namespace\Foo;
-		$a instanceof \Foo;
-
-		isset($a, $b);
-		isset(Foo);
-		list() = $b;
-		list($a, $b) = $b;
-		list($a[]) = $b;
-		list(list($a)) = $b;
-
-		$a->foo();
-		new Foo;
-		new namespace\Foo();
-		new \Foo();
-		print($a);
-		$a->foo;
-		$a->foo[1];
-		$a->foo->bar->baz()->quux[0];
-		$a->foo()[1][1];
-		` + "`cmd $a`;" + `
-		` + "`cmd`;" + `
-		` + "``;" + `
-		[];
-		[1];
-		[1=>1, &$b,];
-
-		Foo::bar();
-		namespace\Foo::bar();
-		\Foo::bar();
-		Foo::$bar();
-		$foo::$bar();
-		Foo::$bar;
-		namespace\Foo::$bar;
-		\Foo::$bar;
-		$a ? $b : $c;
-		$a ? : $c;
-		$a ? $b ? $c : $d : $e;
-		$a ? $b : $c ? $d : $e;
-		-$a;
-		+$a;
-		$$a;
-		$$$a;
-		yield;
-		yield $a;
-		yield $a => $b;
-		yield Foo::class;
-		yield $a => Foo::class;
-		
-		(array)$a;
-		(boolean)$a;
-		(bool)$a;
-		(double)$a;
-		(float)$a;
-		(integer)$a;
-		(int)$a;
-		(object)$a;
-		(string)$a;
-		(unset)$a;
-
-		$a & $b;
-		$a | $b;
-		$a ^ $b;
-		$a && $b;
-		$a || $b;
-		$a . $b;
-		$a / $b;
-		$a == $b;
-		$a >= $b;
-		$a > $b;
-		$a === $b;
-		$a and $b;
-		$a or $b;
-		$a xor $b;
-		$a - $b;
-		$a % $b;
-		$a * $b;
-		$a != $b;
-		$a !== $b;
-		$a + $b;
-		$a ** $b;
-		$a << $b;
-		$a >> $b;
-		$a <= $b;
-		$a < $b;
-
-		$a =& $b;
-		$a =& new Foo;
-		$a =& new Foo($b);
-		$a = $b;
-		$a &= $b;
-		$a |= $b;
-		$a ^= $b;
-		$a .= $b;
-		$a /= $b;
-		$a -= $b;
-		$a %= $b;
-		$a *= $b;
-		$a += $b;
-		$a **= $b;
-		$a <<= $b;
-		$a >>= $b;
-
-
-		(new \Foo());
-		(new \Foo())->bar()->baz;
-		(new \Foo())[0][0];
-		(new \Foo())[0]->bar();
-
-		array([0])[0][0];
-		"foo"[0];
-		foo[0];
-		static::foo;
-
-		new $foo;
-		new $foo::$bar;
-		new $a->b[0];
-		new $a->b{$b ?: null}->$c->d[0];static $a = [1][0];
-
-		static $a = !1;
-		static $a = ~1;
-		static $a = +1;
-		static $a = -1;
-		static $a = (1);
-		static $a = 1 ?: 2;
-		static $a = 1 ? 2 : 3;
-		static $a = 1 & 2;
-		static $a = 1 | 2;
-		static $a = 1 ^ 2;
-		static $a = 1 && 2;
-		static $a = 1 || 2;
-		static $a = 1 . 2;
-		static $a = 1 / 2;
-		static $a = 1 == 2;
-		static $a = 1 >= 2;
-		static $a = 1 > 2;
-		static $a = 1 === 2;
-		static $a = 1 and 2;
-		static $a = 1 or 2;
-		static $a = 1 xor 2;
-		static $a = 1 - 2;
-		static $a = 1 % 2;
-		static $a = 1 * 2;
-		static $a = 1 != 2;
-		static $a = 1 !== 2;
-		static $a = 1 + 2;
-		static $a = 1 ** 2;
-		static $a = 1 << 2;
-		static $a = 1 >> 2;
-		static $a = 1 <= 2;
-		static $a = 1 < 2;
-		static $a = Foo::bar;
-		static $a = Foo::class;
-		static $a = __CLASS__;
-		static $a = Foo;
-		static $a = namespace\Foo;
-		static $a = \Foo;
-		static $a = array();
-		static $a = array(1 => 1, 2);
-		static $a = [1, 2 => 2][0];
-
-		if (yield 1) {}
-		Foo::$$bar;
-
-		$foo();
-		$foo()[0][0];
-		$a{$b};
-		${$a};
-		$foo::{$bar}();
-		$foo::bar;
-
-		__halt_compiler();
-
-		parsing process must be terminated
-	`
+	src, err := ioutil.ReadFile("test.php")
+	assert.NilError(t, err)
 
 	expected := &ast.Root{
 		Node: ast.Node{
 			Position: &position.Position{
 				StartLine: 2,
 				EndLine:   379,
-				StartPos:  5,
-				EndPos:    6944,
+				StartPos:  3,
+				EndPos:    6285,
 			},
 		},
 		Stmts: []ast.Vertex{
@@ -411,8 +32,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 2,
 						EndLine:   2,
-						StartPos:  5,
-						EndPos:    20,
+						StartPos:  3,
+						EndPos:    18,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -420,8 +41,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
-							StartPos:  5,
-							EndPos:    19,
+							StartPos:  3,
+							EndPos:    17,
 						},
 					},
 					Function: &ast.NameName{
@@ -429,8 +50,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
-								StartPos:  5,
-								EndPos:    8,
+								StartPos:  3,
+								EndPos:    6,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -439,8 +60,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  5,
-										EndPos:    8,
+										StartPos:  3,
+										EndPos:    6,
 									},
 								},
 								Value: []byte("foo"),
@@ -452,8 +73,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
-								StartPos:  8,
-								EndPos:    19,
+								StartPos:  6,
+								EndPos:    17,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -462,19 +83,17 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  9,
-										EndPos:    11,
+										StartPos:  7,
+										EndPos:    9,
 									},
 								},
-								IsReference: false,
-								Variadic:    false,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 2,
 											EndLine:   2,
-											StartPos:  9,
-											EndPos:    11,
+											StartPos:  7,
+											EndPos:    9,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -482,8 +101,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
-												StartPos:  9,
-												EndPos:    11,
+												StartPos:  7,
+												EndPos:    9,
 											},
 										},
 										Value: []byte("$a"),
@@ -495,19 +114,18 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  13,
-										EndPos:    18,
+										StartPos:  11,
+										EndPos:    16,
 									},
 								},
-								Variadic:    true,
-								IsReference: false,
+								Variadic: true,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 2,
 											EndLine:   2,
-											StartPos:  16,
-											EndPos:    18,
+											StartPos:  14,
+											EndPos:    16,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -515,8 +133,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
-												StartPos:  16,
-												EndPos:    18,
+												StartPos:  14,
+												EndPos:    16,
 											},
 										},
 										Value: []byte("$b"),
@@ -532,8 +150,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 3,
 						EndLine:   3,
-						StartPos:  23,
-						EndPos:    39,
+						StartPos:  19,
+						EndPos:    35,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -541,8 +159,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 3,
 							EndLine:   3,
-							StartPos:  23,
-							EndPos:    38,
+							StartPos:  19,
+							EndPos:    34,
 						},
 					},
 					Function: &ast.ExprVariable{
@@ -550,8 +168,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 3,
 								EndLine:   3,
-								StartPos:  23,
-								EndPos:    27,
+								StartPos:  19,
+								EndPos:    23,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -559,8 +177,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  23,
-									EndPos:    27,
+									StartPos:  19,
+									EndPos:    23,
 								},
 							},
 							Value: []byte("$foo"),
@@ -571,8 +189,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 3,
 								EndLine:   3,
-								StartPos:  27,
-								EndPos:    38,
+								StartPos:  23,
+								EndPos:    34,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -581,19 +199,17 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  28,
-										EndPos:    30,
+										StartPos:  24,
+										EndPos:    26,
 									},
 								},
-								Variadic:    false,
-								IsReference: false,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  28,
-											EndPos:    30,
+											StartPos:  24,
+											EndPos:    26,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -601,8 +217,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
-												StartPos:  28,
-												EndPos:    30,
+												StartPos:  24,
+												EndPos:    26,
 											},
 										},
 										Value: []byte("$a"),
@@ -614,19 +230,18 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  32,
-										EndPos:    37,
+										StartPos:  28,
+										EndPos:    33,
 									},
 								},
-								Variadic:    true,
-								IsReference: false,
+								Variadic: true,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  35,
-											EndPos:    37,
+											StartPos:  31,
+											EndPos:    33,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -634,8 +249,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
-												StartPos:  35,
-												EndPos:    37,
+												StartPos:  31,
+												EndPos:    33,
 											},
 										},
 										Value: []byte("$b"),
@@ -651,8 +266,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 4,
 						EndLine:   4,
-						StartPos:  42,
-						EndPos:    63,
+						StartPos:  36,
+						EndPos:    57,
 					},
 				},
 				Expr: &ast.ExprMethodCall{
@@ -660,8 +275,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 4,
 							EndLine:   4,
-							StartPos:  42,
-							EndPos:    62,
+							StartPos:  36,
+							EndPos:    56,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -669,8 +284,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 4,
 								EndLine:   4,
-								StartPos:  42,
-								EndPos:    46,
+								StartPos:  36,
+								EndPos:    40,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -678,8 +293,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
-									StartPos:  42,
-									EndPos:    46,
+									StartPos:  36,
+									EndPos:    40,
 								},
 							},
 							Value: []byte("$foo"),
@@ -690,8 +305,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 4,
 								EndLine:   4,
-								StartPos:  48,
-								EndPos:    51,
+								StartPos:  42,
+								EndPos:    45,
 							},
 						},
 						Value: []byte("bar"),
@@ -701,8 +316,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 4,
 								EndLine:   4,
-								StartPos:  51,
-								EndPos:    62,
+								StartPos:  45,
+								EndPos:    56,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -711,19 +326,17 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  52,
-										EndPos:    54,
+										StartPos:  46,
+										EndPos:    48,
 									},
 								},
-								Variadic:    false,
-								IsReference: false,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  52,
-											EndPos:    54,
+											StartPos:  46,
+											EndPos:    48,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -731,8 +344,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 4,
 												EndLine:   4,
-												StartPos:  52,
-												EndPos:    54,
+												StartPos:  46,
+												EndPos:    48,
 											},
 										},
 										Value: []byte("$a"),
@@ -744,19 +357,18 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  56,
-										EndPos:    61,
+										StartPos:  50,
+										EndPos:    55,
 									},
 								},
-								Variadic:    true,
-								IsReference: false,
+								Variadic: true,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  59,
-											EndPos:    61,
+											StartPos:  53,
+											EndPos:    55,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -764,8 +376,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 4,
 												EndLine:   4,
-												StartPos:  59,
-												EndPos:    61,
+												StartPos:  53,
+												EndPos:    55,
 											},
 										},
 										Value: []byte("$b"),
@@ -781,8 +393,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 5,
 						EndLine:   5,
-						StartPos:  66,
-						EndPos:    86,
+						StartPos:  58,
+						EndPos:    78,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -790,8 +402,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 5,
 							EndLine:   5,
-							StartPos:  66,
-							EndPos:    85,
+							StartPos:  58,
+							EndPos:    77,
 						},
 					},
 					Class: &ast.NameName{
@@ -799,8 +411,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 5,
 								EndLine:   5,
-								StartPos:  66,
-								EndPos:    69,
+								StartPos:  58,
+								EndPos:    61,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -809,8 +421,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  66,
-										EndPos:    69,
+										StartPos:  58,
+										EndPos:    61,
 									},
 								},
 								Value: []byte("foo"),
@@ -822,8 +434,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 5,
 								EndLine:   5,
-								StartPos:  71,
-								EndPos:    74,
+								StartPos:  63,
+								EndPos:    66,
 							},
 						},
 						Value: []byte("bar"),
@@ -833,8 +445,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 5,
 								EndLine:   5,
-								StartPos:  74,
-								EndPos:    85,
+								StartPos:  66,
+								EndPos:    77,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -843,19 +455,17 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  75,
-										EndPos:    77,
+										StartPos:  67,
+										EndPos:    69,
 									},
 								},
-								Variadic:    false,
-								IsReference: false,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  75,
-											EndPos:    77,
+											StartPos:  67,
+											EndPos:    69,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -863,8 +473,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 5,
 												EndLine:   5,
-												StartPos:  75,
-												EndPos:    77,
+												StartPos:  67,
+												EndPos:    69,
 											},
 										},
 										Value: []byte("$a"),
@@ -876,19 +486,18 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  79,
-										EndPos:    84,
+										StartPos:  71,
+										EndPos:    76,
 									},
 								},
-								Variadic:    true,
-								IsReference: false,
+								Variadic: true,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  82,
-											EndPos:    84,
+											StartPos:  74,
+											EndPos:    76,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -896,8 +505,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 5,
 												EndLine:   5,
-												StartPos:  82,
-												EndPos:    84,
+												StartPos:  74,
+												EndPos:    76,
 											},
 										},
 										Value: []byte("$b"),
@@ -913,8 +522,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 6,
 						EndLine:   6,
-						StartPos:  89,
-						EndPos:    110,
+						StartPos:  79,
+						EndPos:    100,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -922,8 +531,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 6,
 							EndLine:   6,
-							StartPos:  89,
-							EndPos:    109,
+							StartPos:  79,
+							EndPos:    99,
 						},
 					},
 					Class: &ast.ExprVariable{
@@ -931,8 +540,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 6,
 								EndLine:   6,
-								StartPos:  89,
-								EndPos:    93,
+								StartPos:  79,
+								EndPos:    83,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -940,8 +549,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 6,
 									EndLine:   6,
-									StartPos:  89,
-									EndPos:    93,
+									StartPos:  79,
+									EndPos:    83,
 								},
 							},
 							Value: []byte("$foo"),
@@ -952,8 +561,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 6,
 								EndLine:   6,
-								StartPos:  95,
-								EndPos:    98,
+								StartPos:  85,
+								EndPos:    88,
 							},
 						},
 						Value: []byte("bar"),
@@ -963,8 +572,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 6,
 								EndLine:   6,
-								StartPos:  98,
-								EndPos:    109,
+								StartPos:  88,
+								EndPos:    99,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -973,19 +582,17 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 6,
 										EndLine:   6,
-										StartPos:  99,
-										EndPos:    101,
+										StartPos:  89,
+										EndPos:    91,
 									},
 								},
-								Variadic:    false,
-								IsReference: false,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 6,
 											EndLine:   6,
-											StartPos:  99,
-											EndPos:    101,
+											StartPos:  89,
+											EndPos:    91,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -993,8 +600,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 6,
 												EndLine:   6,
-												StartPos:  99,
-												EndPos:    101,
+												StartPos:  89,
+												EndPos:    91,
 											},
 										},
 										Value: []byte("$a"),
@@ -1006,19 +613,18 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 6,
 										EndLine:   6,
-										StartPos:  103,
-										EndPos:    108,
+										StartPos:  93,
+										EndPos:    98,
 									},
 								},
-								Variadic:    true,
-								IsReference: false,
+								Variadic: true,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 6,
 											EndLine:   6,
-											StartPos:  106,
-											EndPos:    108,
+											StartPos:  96,
+											EndPos:    98,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -1026,8 +632,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 6,
 												EndLine:   6,
-												StartPos:  106,
-												EndPos:    108,
+												StartPos:  96,
+												EndPos:    98,
 											},
 										},
 										Value: []byte("$b"),
@@ -1043,8 +649,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 7,
 						EndLine:   7,
-						StartPos:  113,
-						EndPos:    132,
+						StartPos:  101,
+						EndPos:    120,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -1052,8 +658,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 7,
 							EndLine:   7,
-							StartPos:  113,
-							EndPos:    131,
+							StartPos:  101,
+							EndPos:    119,
 						},
 					},
 					Class: &ast.NameName{
@@ -1061,8 +667,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 7,
 								EndLine:   7,
-								StartPos:  117,
-								EndPos:    120,
+								StartPos:  105,
+								EndPos:    108,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -1071,8 +677,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 7,
 										EndLine:   7,
-										StartPos:  117,
-										EndPos:    120,
+										StartPos:  105,
+										EndPos:    108,
 									},
 								},
 								Value: []byte("foo"),
@@ -1084,8 +690,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 7,
 								EndLine:   7,
-								StartPos:  120,
-								EndPos:    131,
+								StartPos:  108,
+								EndPos:    119,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -1094,19 +700,17 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 7,
 										EndLine:   7,
-										StartPos:  121,
-										EndPos:    123,
+										StartPos:  109,
+										EndPos:    111,
 									},
 								},
-								IsReference: false,
-								Variadic:    false,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 7,
 											EndLine:   7,
-											StartPos:  121,
-											EndPos:    123,
+											StartPos:  109,
+											EndPos:    111,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -1114,8 +718,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 7,
 												EndLine:   7,
-												StartPos:  121,
-												EndPos:    123,
+												StartPos:  109,
+												EndPos:    111,
 											},
 										},
 										Value: []byte("$a"),
@@ -1127,19 +731,18 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 7,
 										EndLine:   7,
-										StartPos:  125,
-										EndPos:    130,
+										StartPos:  113,
+										EndPos:    118,
 									},
 								},
-								Variadic:    true,
-								IsReference: false,
+								Variadic: true,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 7,
 											EndLine:   7,
-											StartPos:  128,
-											EndPos:    130,
+											StartPos:  116,
+											EndPos:    118,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -1147,8 +750,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 7,
 												EndLine:   7,
-												StartPos:  128,
-												EndPos:    130,
+												StartPos:  116,
+												EndPos:    118,
 											},
 										},
 										Value: []byte("$b"),
@@ -1164,18 +767,17 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 9,
 						EndLine:   9,
-						StartPos:  136,
-						EndPos:    180,
+						StartPos:  122,
+						EndPos:    166,
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 9,
 							EndLine:   9,
-							StartPos:  145,
-							EndPos:    148,
+							StartPos:  131,
+							EndPos:    134,
 						},
 					},
 					Value: []byte("foo"),
@@ -1186,19 +788,17 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 9,
 								EndLine:   9,
-								StartPos:  149,
-								EndPos:    162,
+								StartPos:  135,
+								EndPos:    148,
 							},
 						},
-						ByRef:    false,
-						Variadic: false,
 						Type: &ast.NameName{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 9,
 									EndLine:   9,
-									StartPos:  149,
-									EndPos:    152,
+									StartPos:  135,
+									EndPos:    138,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -1207,8 +807,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 9,
 											EndLine:   9,
-											StartPos:  149,
-											EndPos:    152,
+											StartPos:  135,
+											EndPos:    138,
 										},
 									},
 									Value: []byte("bar"),
@@ -1220,8 +820,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 9,
 									EndLine:   9,
-									StartPos:  153,
-									EndPos:    157,
+									StartPos:  139,
+									EndPos:    143,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -1229,8 +829,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 9,
 										EndLine:   9,
-										StartPos:  153,
-										EndPos:    157,
+										StartPos:  139,
+										EndPos:    143,
 									},
 								},
 								Value: []byte("$bar"),
@@ -1241,8 +841,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 9,
 									EndLine:   9,
-									StartPos:  158,
-									EndPos:    162,
+									StartPos:  144,
+									EndPos:    148,
 								},
 							},
 							Const: &ast.NameName{
@@ -1250,8 +850,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 9,
 										EndLine:   9,
-										StartPos:  158,
-										EndPos:    162,
+										StartPos:  144,
+										EndPos:    148,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1260,8 +860,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 9,
 												EndLine:   9,
-												StartPos:  158,
-												EndPos:    162,
+												StartPos:  144,
+												EndPos:    148,
 											},
 										},
 										Value: []byte("null"),
@@ -1275,19 +875,17 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 9,
 								EndLine:   9,
-								StartPos:  164,
-								EndPos:    176,
+								StartPos:  150,
+								EndPos:    162,
 							},
 						},
-						ByRef:    true,
-						Variadic: true,
 						Type: &ast.NameName{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 9,
 									EndLine:   9,
-									StartPos:  164,
-									EndPos:    167,
+									StartPos:  150,
+									EndPos:    153,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -1296,33 +894,53 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 9,
 											EndLine:   9,
-											StartPos:  164,
-											EndPos:    167,
+											StartPos:  150,
+											EndPos:    153,
 										},
 									},
 									Value: []byte("baz"),
 								},
 							},
 						},
-						Var: &ast.ExprVariable{
+						Var: &ast.Reference{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 9,
 									EndLine:   9,
-									StartPos:  172,
-									EndPos:    176,
+									StartPos:  154,
+									EndPos:    162,
 								},
 							},
-							VarName: &ast.Identifier{
+							Var: &ast.Variadic{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 9,
 										EndLine:   9,
-										StartPos:  172,
-										EndPos:    176,
+										StartPos:  155,
+										EndPos:    162,
+									},
+								},
+								Var: &ast.ExprVariable{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 9,
+											EndLine:   9,
+											StartPos:  158,
+											EndPos:    162,
+										},
+									},
+									VarName: &ast.Identifier{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 9,
+												EndLine:   9,
+												StartPos:  158,
+												EndPos:    162,
+											},
+										},
+										Value: []byte("$baz"),
 									},
 								},
-								Value: []byte("$baz"),
 							},
 						},
 					},
@@ -1334,8 +952,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 10,
 						EndLine:   10,
-						StartPos:  183,
-						EndPos:    246,
+						StartPos:  167,
+						EndPos:    230,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -1343,8 +961,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 10,
 							EndLine:   10,
-							StartPos:  189,
-							EndPos:    192,
+							StartPos:  173,
+							EndPos:    176,
 						},
 					},
 					Value: []byte("foo"),
@@ -1355,18 +973,17 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 10,
 								EndLine:   10,
-								StartPos:  194,
-								EndPos:    245,
+								StartPos:  178,
+								EndPos:    229,
 							},
 						},
-						ReturnsRef: false,
 						MethodName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 10,
 									EndLine:   10,
-									StartPos:  210,
-									EndPos:    213,
+									StartPos:  194,
+									EndPos:    197,
 								},
 							},
 							Value: []byte("foo"),
@@ -1377,8 +994,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 10,
 										EndLine:   10,
-										StartPos:  194,
-										EndPos:    200,
+										StartPos:  178,
+										EndPos:    184,
 									},
 								},
 								Value: []byte("public"),
@@ -1390,19 +1007,17 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 10,
 										EndLine:   10,
-										StartPos:  214,
-										EndPos:    227,
+										StartPos:  198,
+										EndPos:    211,
 									},
 								},
-								ByRef:    false,
-								Variadic: false,
 								Type: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 10,
 											EndLine:   10,
-											StartPos:  214,
-											EndPos:    217,
+											StartPos:  198,
+											EndPos:    201,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -1411,8 +1026,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 10,
 													EndLine:   10,
-													StartPos:  214,
-													EndPos:    217,
+													StartPos:  198,
+													EndPos:    201,
 												},
 											},
 											Value: []byte("bar"),
@@ -1424,8 +1039,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 10,
 											EndLine:   10,
-											StartPos:  218,
-											EndPos:    222,
+											StartPos:  202,
+											EndPos:    206,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -1433,8 +1048,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 10,
 												EndLine:   10,
-												StartPos:  218,
-												EndPos:    222,
+												StartPos:  202,
+												EndPos:    206,
 											},
 										},
 										Value: []byte("$bar"),
@@ -1445,8 +1060,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 10,
 											EndLine:   10,
-											StartPos:  223,
-											EndPos:    227,
+											StartPos:  207,
+											EndPos:    211,
 										},
 									},
 									Const: &ast.NameName{
@@ -1454,8 +1069,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 10,
 												EndLine:   10,
-												StartPos:  223,
-												EndPos:    227,
+												StartPos:  207,
+												EndPos:    211,
 											},
 										},
 										Parts: []ast.Vertex{
@@ -1464,8 +1079,8 @@ func TestPhp5(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 10,
 														EndLine:   10,
-														StartPos:  223,
-														EndPos:    227,
+														StartPos:  207,
+														EndPos:    211,
 													},
 												},
 												Value: []byte("null"),
@@ -1479,19 +1094,17 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 10,
 										EndLine:   10,
-										StartPos:  229,
-										EndPos:    241,
+										StartPos:  213,
+										EndPos:    225,
 									},
 								},
-								ByRef:    true,
-								Variadic: true,
 								Type: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 10,
 											EndLine:   10,
-											StartPos:  229,
-											EndPos:    232,
+											StartPos:  213,
+											EndPos:    216,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -1500,33 +1113,53 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 10,
 													EndLine:   10,
-													StartPos:  229,
-													EndPos:    232,
+													StartPos:  213,
+													EndPos:    216,
 												},
 											},
 											Value: []byte("baz"),
 										},
 									},
 								},
-								Var: &ast.ExprVariable{
+								Var: &ast.Reference{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 10,
 											EndLine:   10,
-											StartPos:  237,
-											EndPos:    241,
+											StartPos:  217,
+											EndPos:    225,
 										},
 									},
-									VarName: &ast.Identifier{
+									Var: &ast.Variadic{
 										Node: ast.Node{
 											Position: &position.Position{
 												StartLine: 10,
 												EndLine:   10,
-												StartPos:  237,
-												EndPos:    241,
+												StartPos:  218,
+												EndPos:    225,
+											},
+										},
+										Var: &ast.ExprVariable{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 10,
+													EndLine:   10,
+													StartPos:  221,
+													EndPos:    225,
+												},
+											},
+											VarName: &ast.Identifier{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 10,
+														EndLine:   10,
+														StartPos:  221,
+														EndPos:    225,
+													},
+												},
+												Value: []byte("$baz"),
 											},
 										},
-										Value: []byte("$baz"),
 									},
 								},
 							},
@@ -1536,8 +1169,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 10,
 									EndLine:   10,
-									StartPos:  243,
-									EndPos:    245,
+									StartPos:  227,
+									EndPos:    229,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -1550,8 +1183,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 11,
 						EndLine:   11,
-						StartPos:  249,
-						EndPos:    290,
+						StartPos:  231,
+						EndPos:    272,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -1559,31 +1192,27 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 11,
 							EndLine:   11,
-							StartPos:  249,
-							EndPos:    289,
+							StartPos:  231,
+							EndPos:    271,
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
 					Params: []ast.Vertex{
 						&ast.Parameter{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 11,
 									EndLine:   11,
-									StartPos:  258,
-									EndPos:    271,
+									StartPos:  240,
+									EndPos:    253,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Type: &ast.NameName{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 11,
 										EndLine:   11,
-										StartPos:  258,
-										EndPos:    261,
+										StartPos:  240,
+										EndPos:    243,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1592,8 +1221,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 11,
 												EndLine:   11,
-												StartPos:  258,
-												EndPos:    261,
+												StartPos:  240,
+												EndPos:    243,
 											},
 										},
 										Value: []byte("bar"),
@@ -1605,8 +1234,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 11,
 										EndLine:   11,
-										StartPos:  262,
-										EndPos:    266,
+										StartPos:  244,
+										EndPos:    248,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -1614,8 +1243,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 11,
 											EndLine:   11,
-											StartPos:  262,
-											EndPos:    266,
+											StartPos:  244,
+											EndPos:    248,
 										},
 									},
 									Value: []byte("$bar"),
@@ -1626,8 +1255,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 11,
 										EndLine:   11,
-										StartPos:  267,
-										EndPos:    271,
+										StartPos:  249,
+										EndPos:    253,
 									},
 								},
 								Const: &ast.NameName{
@@ -1635,8 +1264,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 11,
 											EndLine:   11,
-											StartPos:  267,
-											EndPos:    271,
+											StartPos:  249,
+											EndPos:    253,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -1645,8 +1274,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 11,
 													EndLine:   11,
-													StartPos:  267,
-													EndPos:    271,
+													StartPos:  249,
+													EndPos:    253,
 												},
 											},
 											Value: []byte("null"),
@@ -1660,19 +1289,17 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 11,
 									EndLine:   11,
-									StartPos:  273,
-									EndPos:    285,
+									StartPos:  255,
+									EndPos:    267,
 								},
 							},
-							ByRef:    true,
-							Variadic: true,
 							Type: &ast.NameName{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 11,
 										EndLine:   11,
-										StartPos:  273,
-										EndPos:    276,
+										StartPos:  255,
+										EndPos:    258,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1681,33 +1308,53 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 11,
 												EndLine:   11,
-												StartPos:  273,
-												EndPos:    276,
+												StartPos:  255,
+												EndPos:    258,
 											},
 										},
 										Value: []byte("baz"),
 									},
 								},
 							},
-							Var: &ast.ExprVariable{
+							Var: &ast.Reference{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 11,
 										EndLine:   11,
-										StartPos:  281,
-										EndPos:    285,
+										StartPos:  259,
+										EndPos:    267,
 									},
 								},
-								VarName: &ast.Identifier{
+								Var: &ast.Variadic{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 11,
 											EndLine:   11,
-											StartPos:  281,
-											EndPos:    285,
+											StartPos:  260,
+											EndPos:    267,
+										},
+									},
+									Var: &ast.ExprVariable{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 11,
+												EndLine:   11,
+												StartPos:  263,
+												EndPos:    267,
+											},
+										},
+										VarName: &ast.Identifier{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 11,
+													EndLine:   11,
+													StartPos:  263,
+													EndPos:    267,
+												},
+											},
+											Value: []byte("$baz"),
 										},
 									},
-									Value: []byte("$baz"),
 								},
 							},
 						},
@@ -1720,8 +1367,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 12,
 						EndLine:   12,
-						StartPos:  293,
-						EndPos:    341,
+						StartPos:  273,
+						EndPos:    321,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -1729,31 +1376,28 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 12,
 							EndLine:   12,
-							StartPos:  293,
-							EndPos:    340,
+							StartPos:  273,
+							EndPos:    320,
 						},
 					},
-					ReturnsRef: false,
-					Static:     true,
+					Static: true,
 					Params: []ast.Vertex{
 						&ast.Parameter{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 12,
 									EndLine:   12,
-									StartPos:  309,
-									EndPos:    322,
+									StartPos:  289,
+									EndPos:    302,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Type: &ast.NameName{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 12,
 										EndLine:   12,
-										StartPos:  309,
-										EndPos:    312,
+										StartPos:  289,
+										EndPos:    292,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1762,8 +1406,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 12,
 												EndLine:   12,
-												StartPos:  309,
-												EndPos:    312,
+												StartPos:  289,
+												EndPos:    292,
 											},
 										},
 										Value: []byte("bar"),
@@ -1775,8 +1419,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 12,
 										EndLine:   12,
-										StartPos:  313,
-										EndPos:    317,
+										StartPos:  293,
+										EndPos:    297,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -1784,8 +1428,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 12,
 											EndLine:   12,
-											StartPos:  313,
-											EndPos:    317,
+											StartPos:  293,
+											EndPos:    297,
 										},
 									},
 									Value: []byte("$bar"),
@@ -1796,8 +1440,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 12,
 										EndLine:   12,
-										StartPos:  318,
-										EndPos:    322,
+										StartPos:  298,
+										EndPos:    302,
 									},
 								},
 								Const: &ast.NameName{
@@ -1805,8 +1449,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 12,
 											EndLine:   12,
-											StartPos:  318,
-											EndPos:    322,
+											StartPos:  298,
+											EndPos:    302,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -1815,8 +1459,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 12,
 													EndLine:   12,
-													StartPos:  318,
-													EndPos:    322,
+													StartPos:  298,
+													EndPos:    302,
 												},
 											},
 											Value: []byte("null"),
@@ -1830,19 +1474,17 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 12,
 									EndLine:   12,
-									StartPos:  324,
-									EndPos:    336,
+									StartPos:  304,
+									EndPos:    316,
 								},
 							},
-							ByRef:    true,
-							Variadic: true,
 							Type: &ast.NameName{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 12,
 										EndLine:   12,
-										StartPos:  324,
-										EndPos:    327,
+										StartPos:  304,
+										EndPos:    307,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1851,33 +1493,53 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 12,
 												EndLine:   12,
-												StartPos:  324,
-												EndPos:    327,
+												StartPos:  304,
+												EndPos:    307,
 											},
 										},
 										Value: []byte("baz"),
 									},
 								},
 							},
-							Var: &ast.ExprVariable{
+							Var: &ast.Reference{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 12,
 										EndLine:   12,
-										StartPos:  332,
-										EndPos:    336,
+										StartPos:  308,
+										EndPos:    316,
 									},
 								},
-								VarName: &ast.Identifier{
+								Var: &ast.Variadic{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 12,
 											EndLine:   12,
-											StartPos:  332,
-											EndPos:    336,
+											StartPos:  309,
+											EndPos:    316,
+										},
+									},
+									Var: &ast.ExprVariable{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 12,
+												EndLine:   12,
+												StartPos:  312,
+												EndPos:    316,
+											},
+										},
+										VarName: &ast.Identifier{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 12,
+													EndLine:   12,
+													StartPos:  312,
+													EndPos:    316,
+												},
+											},
+											Value: []byte("$baz"),
 										},
 									},
-									Value: []byte("$baz"),
 								},
 							},
 						},
@@ -1890,8 +1552,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 14,
 						EndLine:   14,
-						StartPos:  345,
-						EndPos:    365,
+						StartPos:  323,
+						EndPos:    343,
 					},
 				},
 				Expr: &ast.ScalarLnumber{
@@ -1899,8 +1561,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 14,
 							EndLine:   14,
-							StartPos:  345,
-							EndPos:    364,
+							StartPos:  323,
+							EndPos:    342,
 						},
 					},
 					Value: []byte("1234567890123456789"),
@@ -1911,8 +1573,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 15,
 						EndLine:   15,
-						StartPos:  368,
-						EndPos:    389,
+						StartPos:  344,
+						EndPos:    365,
 					},
 				},
 				Expr: &ast.ScalarDnumber{
@@ -1920,8 +1582,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 15,
 							EndLine:   15,
-							StartPos:  368,
-							EndPos:    388,
+							StartPos:  344,
+							EndPos:    364,
 						},
 					},
 					Value: []byte("12345678901234567890"),
@@ -1932,8 +1594,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 16,
 						EndLine:   16,
-						StartPos:  392,
-						EndPos:    395,
+						StartPos:  366,
+						EndPos:    369,
 					},
 				},
 				Expr: &ast.ScalarDnumber{
@@ -1941,8 +1603,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 16,
 							EndLine:   16,
-							StartPos:  392,
-							EndPos:    394,
+							StartPos:  366,
+							EndPos:    368,
 						},
 					},
 					Value: []byte("0."),
@@ -1953,8 +1615,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 17,
 						EndLine:   17,
-						StartPos:  398,
-						EndPos:    465,
+						StartPos:  370,
+						EndPos:    437,
 					},
 				},
 				Expr: &ast.ScalarLnumber{
@@ -1962,8 +1624,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 17,
 							EndLine:   17,
-							StartPos:  398,
-							EndPos:    464,
+							StartPos:  370,
+							EndPos:    436,
 						},
 					},
 					Value: []byte("0b0111111111111111111111111111111111111111111111111111111111111111"),
@@ -1974,8 +1636,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 18,
 						EndLine:   18,
-						StartPos:  468,
-						EndPos:    535,
+						StartPos:  438,
+						EndPos:    505,
 					},
 				},
 				Expr: &ast.ScalarDnumber{
@@ -1983,8 +1645,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 18,
 							EndLine:   18,
-							StartPos:  468,
-							EndPos:    534,
+							StartPos:  438,
+							EndPos:    504,
 						},
 					},
 					Value: []byte("0b1111111111111111111111111111111111111111111111111111111111111111"),
@@ -1995,8 +1657,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 19,
 						EndLine:   19,
-						StartPos:  538,
-						EndPos:    559,
+						StartPos:  506,
+						EndPos:    527,
 					},
 				},
 				Expr: &ast.ScalarLnumber{
@@ -2004,8 +1666,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 19,
 							EndLine:   19,
-							StartPos:  538,
-							EndPos:    558,
+							StartPos:  506,
+							EndPos:    526,
 						},
 					},
 					Value: []byte("0x007111111111111111"),
@@ -2016,8 +1678,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 20,
 						EndLine:   20,
-						StartPos:  562,
-						EndPos:    581,
+						StartPos:  528,
+						EndPos:    547,
 					},
 				},
 				Expr: &ast.ScalarDnumber{
@@ -2025,8 +1687,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 20,
 							EndLine:   20,
-							StartPos:  562,
-							EndPos:    580,
+							StartPos:  528,
+							EndPos:    546,
 						},
 					},
 					Value: []byte("0x8111111111111111"),
@@ -2037,8 +1699,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 21,
 						EndLine:   21,
-						StartPos:  584,
-						EndPos:    594,
+						StartPos:  548,
+						EndPos:    558,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2046,8 +1708,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 21,
 							EndLine:   21,
-							StartPos:  584,
-							EndPos:    593,
+							StartPos:  548,
+							EndPos:    557,
 						},
 					},
 					Value: []byte("__CLASS__"),
@@ -2058,8 +1720,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 22,
 						EndLine:   22,
-						StartPos:  597,
-						EndPos:    605,
+						StartPos:  559,
+						EndPos:    567,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2067,8 +1729,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 22,
 							EndLine:   22,
-							StartPos:  597,
-							EndPos:    604,
+							StartPos:  559,
+							EndPos:    566,
 						},
 					},
 					Value: []byte("__DIR__"),
@@ -2079,8 +1741,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 23,
 						EndLine:   23,
-						StartPos:  608,
-						EndPos:    617,
+						StartPos:  568,
+						EndPos:    577,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2088,8 +1750,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 23,
 							EndLine:   23,
-							StartPos:  608,
-							EndPos:    616,
+							StartPos:  568,
+							EndPos:    576,
 						},
 					},
 					Value: []byte("__FILE__"),
@@ -2100,8 +1762,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 24,
 						EndLine:   24,
-						StartPos:  620,
-						EndPos:    633,
+						StartPos:  578,
+						EndPos:    591,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2109,8 +1771,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 24,
 							EndLine:   24,
-							StartPos:  620,
-							EndPos:    632,
+							StartPos:  578,
+							EndPos:    590,
 						},
 					},
 					Value: []byte("__FUNCTION__"),
@@ -2121,8 +1783,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 25,
 						EndLine:   25,
-						StartPos:  636,
-						EndPos:    645,
+						StartPos:  592,
+						EndPos:    601,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2130,8 +1792,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 25,
 							EndLine:   25,
-							StartPos:  636,
-							EndPos:    644,
+							StartPos:  592,
+							EndPos:    600,
 						},
 					},
 					Value: []byte("__LINE__"),
@@ -2142,8 +1804,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 26,
 						EndLine:   26,
-						StartPos:  648,
-						EndPos:    662,
+						StartPos:  602,
+						EndPos:    616,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2151,8 +1813,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 26,
 							EndLine:   26,
-							StartPos:  648,
-							EndPos:    661,
+							StartPos:  602,
+							EndPos:    615,
 						},
 					},
 					Value: []byte("__NAMESPACE__"),
@@ -2163,8 +1825,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 27,
 						EndLine:   27,
-						StartPos:  665,
-						EndPos:    676,
+						StartPos:  617,
+						EndPos:    628,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2172,8 +1834,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 27,
 							EndLine:   27,
-							StartPos:  665,
-							EndPos:    675,
+							StartPos:  617,
+							EndPos:    627,
 						},
 					},
 					Value: []byte("__METHOD__"),
@@ -2184,8 +1846,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 28,
 						EndLine:   28,
-						StartPos:  679,
-						EndPos:    689,
+						StartPos:  629,
+						EndPos:    639,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2193,8 +1855,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 28,
 							EndLine:   28,
-							StartPos:  679,
-							EndPos:    688,
+							StartPos:  629,
+							EndPos:    638,
 						},
 					},
 					Value: []byte("__TRAIT__"),
@@ -2205,8 +1867,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 30,
 						EndLine:   30,
-						StartPos:  693,
-						EndPos:    705,
+						StartPos:  641,
+						EndPos:    653,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2214,8 +1876,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 30,
 							EndLine:   30,
-							StartPos:  693,
-							EndPos:    704,
+							StartPos:  641,
+							EndPos:    652,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2224,8 +1886,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 30,
 									EndLine:   30,
-									StartPos:  694,
-									EndPos:    699,
+									StartPos:  642,
+									EndPos:    647,
 								},
 							},
 							Value: []byte("test "),
@@ -2235,8 +1897,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 30,
 									EndLine:   30,
-									StartPos:  699,
-									EndPos:    703,
+									StartPos:  647,
+									EndPos:    651,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -2244,8 +1906,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 30,
 										EndLine:   30,
-										StartPos:  699,
-										EndPos:    703,
+										StartPos:  647,
+										EndPos:    651,
 									},
 								},
 								Value: []byte("$var"),
@@ -2259,8 +1921,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 31,
 						EndLine:   31,
-						StartPos:  708,
-						EndPos:    723,
+						StartPos:  654,
+						EndPos:    669,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2268,8 +1930,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 31,
 							EndLine:   31,
-							StartPos:  708,
-							EndPos:    722,
+							StartPos:  654,
+							EndPos:    668,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2278,8 +1940,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 31,
 									EndLine:   31,
-									StartPos:  709,
-									EndPos:    714,
+									StartPos:  655,
+									EndPos:    660,
 								},
 							},
 							Value: []byte("test "),
@@ -2289,8 +1951,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 31,
 									EndLine:   31,
-									StartPos:  714,
-									EndPos:    721,
+									StartPos:  660,
+									EndPos:    667,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -2298,8 +1960,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 31,
 										EndLine:   31,
-										StartPos:  714,
-										EndPos:    718,
+										StartPos:  660,
+										EndPos:    664,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -2307,8 +1969,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 31,
 											EndLine:   31,
-											StartPos:  714,
-											EndPos:    718,
+											StartPos:  660,
+											EndPos:    664,
 										},
 									},
 									Value: []byte("$var"),
@@ -2319,8 +1981,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 31,
 										EndLine:   31,
-										StartPos:  719,
-										EndPos:    720,
+										StartPos:  665,
+										EndPos:    666,
 									},
 								},
 								Value: []byte("1"),
@@ -2334,8 +1996,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 32,
 						EndLine:   32,
-						StartPos:  726,
-						EndPos:    780,
+						StartPos:  670,
+						EndPos:    724,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2343,8 +2005,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 32,
 							EndLine:   32,
-							StartPos:  726,
-							EndPos:    779,
+							StartPos:  670,
+							EndPos:    723,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2353,8 +2015,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 32,
 									EndLine:   32,
-									StartPos:  727,
-									EndPos:    732,
+									StartPos:  671,
+									EndPos:    676,
 								},
 							},
 							Value: []byte("test "),
@@ -2364,8 +2026,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 32,
 									EndLine:   32,
-									StartPos:  732,
-									EndPos:    778,
+									StartPos:  676,
+									EndPos:    722,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -2373,8 +2035,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 32,
 										EndLine:   32,
-										StartPos:  732,
-										EndPos:    736,
+										StartPos:  676,
+										EndPos:    680,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -2382,8 +2044,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 32,
 											EndLine:   32,
-											StartPos:  732,
-											EndPos:    736,
+											StartPos:  676,
+											EndPos:    680,
 										},
 									},
 									Value: []byte("$var"),
@@ -2394,8 +2056,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 32,
 										EndLine:   32,
-										StartPos:  737,
-										EndPos:    777,
+										StartPos:  681,
+										EndPos:    721,
 									},
 								},
 								Value: []byte("1234567890123456789012345678901234567890"),
@@ -2409,8 +2071,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 33,
 						EndLine:   33,
-						StartPos:  783,
-						EndPos:    800,
+						StartPos:  725,
+						EndPos:    742,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2418,8 +2080,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 33,
 							EndLine:   33,
-							StartPos:  783,
-							EndPos:    799,
+							StartPos:  725,
+							EndPos:    741,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2428,8 +2090,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 33,
 									EndLine:   33,
-									StartPos:  784,
-									EndPos:    789,
+									StartPos:  726,
+									EndPos:    731,
 								},
 							},
 							Value: []byte("test "),
@@ -2439,8 +2101,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 33,
 									EndLine:   33,
-									StartPos:  789,
-									EndPos:    798,
+									StartPos:  731,
+									EndPos:    740,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -2448,8 +2110,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 33,
 										EndLine:   33,
-										StartPos:  789,
-										EndPos:    793,
+										StartPos:  731,
+										EndPos:    735,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -2457,8 +2119,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 33,
 											EndLine:   33,
-											StartPos:  789,
-											EndPos:    793,
+											StartPos:  731,
+											EndPos:    735,
 										},
 									},
 									Value: []byte("$var"),
@@ -2469,8 +2131,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 33,
 										EndLine:   33,
-										StartPos:  794,
-										EndPos:    797,
+										StartPos:  736,
+										EndPos:    739,
 									},
 								},
 								Value: []byte("bar"),
@@ -2484,8 +2146,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 34,
 						EndLine:   34,
-						StartPos:  803,
-						EndPos:    821,
+						StartPos:  743,
+						EndPos:    761,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2493,8 +2155,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 34,
 							EndLine:   34,
-							StartPos:  803,
-							EndPos:    820,
+							StartPos:  743,
+							EndPos:    760,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2503,8 +2165,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 34,
 									EndLine:   34,
-									StartPos:  804,
-									EndPos:    809,
+									StartPos:  744,
+									EndPos:    749,
 								},
 							},
 							Value: []byte("test "),
@@ -2514,8 +2176,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 34,
 									EndLine:   34,
-									StartPos:  809,
-									EndPos:    819,
+									StartPos:  749,
+									EndPos:    759,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -2523,8 +2185,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 34,
 										EndLine:   34,
-										StartPos:  809,
-										EndPos:    813,
+										StartPos:  749,
+										EndPos:    753,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -2532,8 +2194,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 34,
 											EndLine:   34,
-											StartPos:  809,
-											EndPos:    813,
+											StartPos:  749,
+											EndPos:    753,
 										},
 									},
 									Value: []byte("$var"),
@@ -2544,8 +2206,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 34,
 										EndLine:   34,
-										StartPos:  814,
-										EndPos:    818,
+										StartPos:  754,
+										EndPos:    758,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -2553,8 +2215,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 34,
 											EndLine:   34,
-											StartPos:  814,
-											EndPos:    818,
+											StartPos:  754,
+											EndPos:    758,
 										},
 									},
 									Value: []byte("$bar"),
@@ -2569,8 +2231,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 35,
 						EndLine:   35,
-						StartPos:  824,
-						EndPos:    836,
+						StartPos:  762,
+						EndPos:    774,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2578,8 +2240,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 35,
 							EndLine:   35,
-							StartPos:  824,
-							EndPos:    835,
+							StartPos:  762,
+							EndPos:    773,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2588,8 +2250,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 35,
 									EndLine:   35,
-									StartPos:  825,
-									EndPos:    829,
+									StartPos:  763,
+									EndPos:    767,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -2597,8 +2259,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 35,
 										EndLine:   35,
-										StartPos:  825,
-										EndPos:    829,
+										StartPos:  763,
+										EndPos:    767,
 									},
 								},
 								Value: []byte("$foo"),
@@ -2609,8 +2271,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 35,
 									EndLine:   35,
-									StartPos:  829,
-									EndPos:    830,
+									StartPos:  767,
+									EndPos:    768,
 								},
 							},
 							Value: []byte(" "),
@@ -2620,8 +2282,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 35,
 									EndLine:   35,
-									StartPos:  830,
-									EndPos:    834,
+									StartPos:  768,
+									EndPos:    772,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -2629,8 +2291,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 35,
 										EndLine:   35,
-										StartPos:  830,
-										EndPos:    834,
+										StartPos:  768,
+										EndPos:    772,
 									},
 								},
 								Value: []byte("$bar"),
@@ -2644,8 +2306,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 36,
 						EndLine:   36,
-						StartPos:  839,
-						EndPos:    858,
+						StartPos:  775,
+						EndPos:    794,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2653,8 +2315,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 36,
 							EndLine:   36,
-							StartPos:  839,
-							EndPos:    857,
+							StartPos:  775,
+							EndPos:    793,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2663,8 +2325,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 36,
 									EndLine:   36,
-									StartPos:  840,
-									EndPos:    845,
+									StartPos:  776,
+									EndPos:    781,
 								},
 							},
 							Value: []byte("test "),
@@ -2674,8 +2336,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 36,
 									EndLine:   36,
-									StartPos:  845,
-									EndPos:    854,
+									StartPos:  781,
+									EndPos:    790,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -2683,8 +2345,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 36,
 										EndLine:   36,
-										StartPos:  845,
-										EndPos:    849,
+										StartPos:  781,
+										EndPos:    785,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -2692,8 +2354,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 36,
 											EndLine:   36,
-											StartPos:  845,
-											EndPos:    849,
+											StartPos:  781,
+											EndPos:    785,
 										},
 									},
 									Value: []byte("$foo"),
@@ -2704,8 +2366,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 36,
 										EndLine:   36,
-										StartPos:  851,
-										EndPos:    854,
+										StartPos:  787,
+										EndPos:    790,
 									},
 								},
 								Value: []byte("bar"),
@@ -2716,8 +2378,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 36,
 									EndLine:   36,
-									StartPos:  854,
-									EndPos:    856,
+									StartPos:  790,
+									EndPos:    792,
 								},
 							},
 							Value: []byte("()"),
@@ -2730,8 +2392,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 37,
 						EndLine:   37,
-						StartPos:  861,
-						EndPos:    875,
+						StartPos:  795,
+						EndPos:    809,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2739,8 +2401,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 37,
 							EndLine:   37,
-							StartPos:  861,
-							EndPos:    874,
+							StartPos:  795,
+							EndPos:    808,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2749,8 +2411,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 37,
 									EndLine:   37,
-									StartPos:  862,
-									EndPos:    867,
+									StartPos:  796,
+									EndPos:    801,
 								},
 							},
 							Value: []byte("test "),
@@ -2760,8 +2422,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 37,
 									EndLine:   37,
-									StartPos:  867,
-									EndPos:    873,
+									StartPos:  801,
+									EndPos:    807,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -2769,8 +2431,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 37,
 										EndLine:   37,
-										StartPos:  869,
-										EndPos:    872,
+										StartPos:  803,
+										EndPos:    806,
 									},
 								},
 								Value: []byte("foo"),
@@ -2784,8 +2446,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 38,
 						EndLine:   38,
-						StartPos:  878,
-						EndPos:    895,
+						StartPos:  810,
+						EndPos:    827,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2793,8 +2455,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 38,
 							EndLine:   38,
-							StartPos:  878,
-							EndPos:    894,
+							StartPos:  810,
+							EndPos:    826,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2803,8 +2465,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 38,
 									EndLine:   38,
-									StartPos:  879,
-									EndPos:    884,
+									StartPos:  811,
+									EndPos:    816,
 								},
 							},
 							Value: []byte("test "),
@@ -2814,8 +2476,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 38,
 									EndLine:   38,
-									StartPos:  884,
-									EndPos:    893,
+									StartPos:  816,
+									EndPos:    825,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -2823,8 +2485,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 38,
 										EndLine:   38,
-										StartPos:  886,
-										EndPos:    889,
+										StartPos:  818,
+										EndPos:    821,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -2832,8 +2494,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 38,
 											EndLine:   38,
-											StartPos:  886,
-											EndPos:    889,
+											StartPos:  818,
+											EndPos:    821,
 										},
 									},
 									Value: []byte("foo"),
@@ -2844,8 +2506,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 38,
 										EndLine:   38,
-										StartPos:  890,
-										EndPos:    891,
+										StartPos:  822,
+										EndPos:    823,
 									},
 								},
 								Value: []byte("0"),
@@ -2859,8 +2521,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 39,
 						EndLine:   39,
-						StartPos:  898,
-						EndPos:    919,
+						StartPos:  828,
+						EndPos:    849,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2868,8 +2530,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 39,
 							EndLine:   39,
-							StartPos:  898,
-							EndPos:    918,
+							StartPos:  828,
+							EndPos:    848,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2878,8 +2540,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 39,
 									EndLine:   39,
-									StartPos:  899,
-									EndPos:    904,
+									StartPos:  829,
+									EndPos:    834,
 								},
 							},
 							Value: []byte("test "),
@@ -2889,8 +2551,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 39,
 									EndLine:   39,
-									StartPos:  905,
-									EndPos:    916,
+									StartPos:  835,
+									EndPos:    846,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -2898,8 +2560,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 39,
 										EndLine:   39,
-										StartPos:  905,
-										EndPos:    909,
+										StartPos:  835,
+										EndPos:    839,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -2907,8 +2569,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 39,
 											EndLine:   39,
-											StartPos:  905,
-											EndPos:    909,
+											StartPos:  835,
+											EndPos:    839,
 										},
 									},
 									Value: []byte("$foo"),
@@ -2919,8 +2581,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 39,
 										EndLine:   39,
-										StartPos:  911,
-										EndPos:    914,
+										StartPos:  841,
+										EndPos:    844,
 									},
 								},
 								Value: []byte("bar"),
@@ -2930,8 +2592,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 39,
 										EndLine:   39,
-										StartPos:  914,
-										EndPos:    916,
+										StartPos:  844,
+										EndPos:    846,
 									},
 								},
 							},
@@ -2944,8 +2606,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 41,
 						EndLine:   42,
-						StartPos:  923,
-						EndPos:    941,
+						StartPos:  851,
+						EndPos:    867,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -2953,8 +2615,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 41,
 							EndLine:   41,
-							StartPos:  927,
-							EndPos:    929,
+							StartPos:  855,
+							EndPos:    857,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -2962,8 +2624,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 41,
 								EndLine:   41,
-								StartPos:  927,
-								EndPos:    929,
+								StartPos:  855,
+								EndPos:    857,
 							},
 						},
 						Value: []byte("$a"),
@@ -2986,8 +2648,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 43,
 						EndLine:   45,
-						StartPos:  944,
-						EndPos:    977,
+						StartPos:  868,
+						EndPos:    897,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -2995,8 +2657,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 43,
 							EndLine:   43,
-							StartPos:  948,
-							EndPos:    950,
+							StartPos:  872,
+							EndPos:    874,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -3004,8 +2666,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 43,
 								EndLine:   43,
-								StartPos:  948,
-								EndPos:    950,
+								StartPos:  872,
+								EndPos:    874,
 							},
 						},
 						Value: []byte("$a"),
@@ -3028,7 +2690,7 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 44,
 								EndLine:   -1,
-								StartPos:  956,
+								StartPos:  878,
 								EndPos:    -1,
 							},
 						},
@@ -3037,8 +2699,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 44,
 									EndLine:   44,
-									StartPos:  964,
-									EndPos:    966,
+									StartPos:  886,
+									EndPos:    888,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -3046,8 +2708,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 44,
 										EndLine:   44,
-										StartPos:  964,
-										EndPos:    966,
+										StartPos:  886,
+										EndPos:    888,
 									},
 								},
 								Value: []byte("$b"),
@@ -3072,8 +2734,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 46,
 						EndLine:   48,
-						StartPos:  980,
-						EndPos:    1006,
+						StartPos:  898,
+						EndPos:    920,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -3081,8 +2743,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 46,
 							EndLine:   46,
-							StartPos:  984,
-							EndPos:    986,
+							StartPos:  902,
+							EndPos:    904,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -3090,8 +2752,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 46,
 								EndLine:   46,
-								StartPos:  984,
-								EndPos:    986,
+								StartPos:  902,
+								EndPos:    904,
 							},
 						},
 						Value: []byte("$a"),
@@ -3113,7 +2775,7 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 47,
 							EndLine:   -1,
-							StartPos:  992,
+							StartPos:  908,
 							EndPos:    -1,
 						},
 					},
@@ -3135,8 +2797,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 49,
 						EndLine:   53,
-						StartPos:  1009,
-						EndPos:    1065,
+						StartPos:  921,
+						EndPos:    969,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -3144,8 +2806,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 49,
 							EndLine:   49,
-							StartPos:  1013,
-							EndPos:    1015,
+							StartPos:  925,
+							EndPos:    927,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -3153,8 +2815,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 49,
 								EndLine:   49,
-								StartPos:  1013,
-								EndPos:    1015,
+								StartPos:  925,
+								EndPos:    927,
 							},
 						},
 						Value: []byte("$a"),
@@ -3177,7 +2839,7 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 50,
 								EndLine:   -1,
-								StartPos:  1021,
+								StartPos:  931,
 								EndPos:    -1,
 							},
 						},
@@ -3186,8 +2848,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 50,
 									EndLine:   50,
-									StartPos:  1029,
-									EndPos:    1031,
+									StartPos:  939,
+									EndPos:    941,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -3195,8 +2857,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 50,
 										EndLine:   50,
-										StartPos:  1029,
-										EndPos:    1031,
+										StartPos:  939,
+										EndPos:    941,
 									},
 								},
 								Value: []byte("$b"),
@@ -3219,7 +2881,7 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 51,
 								EndLine:   -1,
-								StartPos:  1036,
+								StartPos:  944,
 								EndPos:    -1,
 							},
 						},
@@ -3228,8 +2890,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 51,
 									EndLine:   51,
-									StartPos:  1044,
-									EndPos:    1046,
+									StartPos:  952,
+									EndPos:    954,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -3237,8 +2899,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 51,
 										EndLine:   51,
-										StartPos:  1044,
-										EndPos:    1046,
+										StartPos:  952,
+										EndPos:    954,
 									},
 								},
 								Value: []byte("$c"),
@@ -3262,7 +2924,7 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 52,
 							EndLine:   -1,
-							StartPos:  1051,
+							StartPos:  957,
 							EndPos:    -1,
 						},
 					},
@@ -3284,8 +2946,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 55,
 						EndLine:   55,
-						StartPos:  1069,
-						EndPos:    1089,
+						StartPos:  971,
+						EndPos:    991,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -3293,8 +2955,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 55,
 							EndLine:   55,
-							StartPos:  1076,
-							EndPos:    1077,
+							StartPos:  978,
+							EndPos:    979,
 						},
 					},
 					Value: []byte("1"),
@@ -3304,8 +2966,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 55,
 							EndLine:   55,
-							StartPos:  1079,
-							EndPos:    1089,
+							StartPos:  981,
+							EndPos:    991,
 						},
 					},
 					Stmts: []ast.Vertex{
@@ -3314,8 +2976,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 55,
 									EndLine:   55,
-									StartPos:  1081,
-									EndPos:    1087,
+									StartPos:  983,
+									EndPos:    989,
 								},
 							},
 						},
@@ -3327,8 +2989,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 56,
 						EndLine:   56,
-						StartPos:  1092,
-						EndPos:    1114,
+						StartPos:  992,
+						EndPos:    1014,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -3336,8 +2998,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 56,
 							EndLine:   56,
-							StartPos:  1099,
-							EndPos:    1100,
+							StartPos:  999,
+							EndPos:    1000,
 						},
 					},
 					Value: []byte("1"),
@@ -3347,8 +3009,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 56,
 							EndLine:   56,
-							StartPos:  1102,
-							EndPos:    1114,
+							StartPos:  1002,
+							EndPos:    1014,
 						},
 					},
 					Stmts: []ast.Vertex{
@@ -3357,8 +3019,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 56,
 									EndLine:   56,
-									StartPos:  1104,
-									EndPos:    1112,
+									StartPos:  1004,
+									EndPos:    1012,
 								},
 							},
 							Expr: &ast.ScalarLnumber{
@@ -3366,8 +3028,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 56,
 										EndLine:   56,
-										StartPos:  1110,
-										EndPos:    1111,
+										StartPos:  1010,
+										EndPos:    1011,
 									},
 								},
 								Value: []byte("2"),
@@ -3381,8 +3043,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 57,
 						EndLine:   57,
-						StartPos:  1117,
-						EndPos:    1148,
+						StartPos:  1015,
+						EndPos:    1046,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -3390,8 +3052,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 57,
 							EndLine:   57,
-							StartPos:  1124,
-							EndPos:    1125,
+							StartPos:  1022,
+							EndPos:    1023,
 						},
 					},
 					Value: []byte("1"),
@@ -3401,8 +3063,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 57,
 							EndLine:   57,
-							StartPos:  1129,
-							EndPos:    1138,
+							StartPos:  1027,
+							EndPos:    1036,
 						},
 					},
 					Stmts: []ast.Vertex{
@@ -3411,8 +3073,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 57,
 									EndLine:   57,
-									StartPos:  1129,
-									EndPos:    1138,
+									StartPos:  1027,
+									EndPos:    1036,
 								},
 							},
 							Expr: &ast.ScalarLnumber{
@@ -3420,8 +3082,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 57,
 										EndLine:   57,
-										StartPos:  1135,
-										EndPos:    1136,
+										StartPos:  1033,
+										EndPos:    1034,
 									},
 								},
 								Value: []byte("3"),
@@ -3435,8 +3097,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 58,
 						EndLine:   58,
-						StartPos:  1151,
-						EndPos:    1187,
+						StartPos:  1047,
+						EndPos:    1083,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -3444,8 +3106,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 58,
 							EndLine:   58,
-							StartPos:  1157,
-							EndPos:    1160,
+							StartPos:  1053,
+							EndPos:    1056,
 						},
 					},
 					Value: []byte("foo"),
@@ -3456,8 +3118,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 58,
 								EndLine:   58,
-								StartPos:  1162,
-								EndPos:    1185,
+								StartPos:  1058,
+								EndPos:    1081,
 							},
 						},
 						Consts: []ast.Vertex{
@@ -3466,8 +3128,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 58,
 										EndLine:   58,
-										StartPos:  1168,
-										EndPos:    1175,
+										StartPos:  1064,
+										EndPos:    1071,
 									},
 								},
 								ConstantName: &ast.Identifier{
@@ -3475,8 +3137,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 58,
 											EndLine:   58,
-											StartPos:  1168,
-											EndPos:    1171,
+											StartPos:  1064,
+											EndPos:    1067,
 										},
 									},
 									Value: []byte("FOO"),
@@ -3486,8 +3148,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 58,
 											EndLine:   58,
-											StartPos:  1174,
-											EndPos:    1175,
+											StartPos:  1070,
+											EndPos:    1071,
 										},
 									},
 									Value: []byte("1"),
@@ -3498,8 +3160,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 58,
 										EndLine:   58,
-										StartPos:  1177,
-										EndPos:    1184,
+										StartPos:  1073,
+										EndPos:    1080,
 									},
 								},
 								ConstantName: &ast.Identifier{
@@ -3507,8 +3169,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 58,
 											EndLine:   58,
-											StartPos:  1177,
-											EndPos:    1180,
+											StartPos:  1073,
+											EndPos:    1076,
 										},
 									},
 									Value: []byte("BAR"),
@@ -3518,8 +3180,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 58,
 											EndLine:   58,
-											StartPos:  1183,
-											EndPos:    1184,
+											StartPos:  1079,
+											EndPos:    1080,
 										},
 									},
 									Value: []byte("2"),
@@ -3534,8 +3196,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 59,
 						EndLine:   59,
-						StartPos:  1190,
-						EndPos:    1220,
+						StartPos:  1084,
+						EndPos:    1114,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -3543,8 +3205,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 59,
 							EndLine:   59,
-							StartPos:  1196,
-							EndPos:    1199,
+							StartPos:  1090,
+							EndPos:    1093,
 						},
 					},
 					Value: []byte("foo"),
@@ -3555,18 +3217,17 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 59,
 								EndLine:   59,
-								StartPos:  1201,
-								EndPos:    1218,
+								StartPos:  1095,
+								EndPos:    1112,
 							},
 						},
-						ReturnsRef: false,
 						MethodName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 59,
 									EndLine:   59,
-									StartPos:  1210,
-									EndPos:    1213,
+									StartPos:  1104,
+									EndPos:    1107,
 								},
 							},
 							Value: []byte("bar"),
@@ -3576,8 +3237,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 59,
 									EndLine:   59,
-									StartPos:  1216,
-									EndPos:    1218,
+									StartPos:  1110,
+									EndPos:    1112,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -3590,8 +3251,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 60,
 						EndLine:   60,
-						StartPos:  1223,
-						EndPos:    1268,
+						StartPos:  1115,
+						EndPos:    1160,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -3599,8 +3260,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 60,
 							EndLine:   60,
-							StartPos:  1229,
-							EndPos:    1232,
+							StartPos:  1121,
+							EndPos:    1124,
 						},
 					},
 					Value: []byte("foo"),
@@ -3611,8 +3272,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 60,
 								EndLine:   60,
-								StartPos:  1234,
-								EndPos:    1266,
+								StartPos:  1126,
+								EndPos:    1158,
 							},
 						},
 						ReturnsRef: true,
@@ -3621,8 +3282,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 60,
 									EndLine:   60,
-									StartPos:  1258,
-									EndPos:    1261,
+									StartPos:  1150,
+									EndPos:    1153,
 								},
 							},
 							Value: []byte("bar"),
@@ -3633,8 +3294,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 60,
 										EndLine:   60,
-										StartPos:  1234,
-										EndPos:    1240,
+										StartPos:  1126,
+										EndPos:    1132,
 									},
 								},
 								Value: []byte("public"),
@@ -3644,8 +3305,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 60,
 										EndLine:   60,
-										StartPos:  1241,
-										EndPos:    1247,
+										StartPos:  1133,
+										EndPos:    1139,
 									},
 								},
 								Value: []byte("static"),
@@ -3656,8 +3317,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 60,
 									EndLine:   60,
-									StartPos:  1264,
-									EndPos:    1266,
+									StartPos:  1156,
+									EndPos:    1158,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -3670,8 +3331,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 61,
 						EndLine:   61,
-						StartPos:  1271,
-						EndPos:    1343,
+						StartPos:  1161,
+						EndPos:    1233,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -3679,8 +3340,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 61,
 							EndLine:   61,
-							StartPos:  1277,
-							EndPos:    1280,
+							StartPos:  1167,
+							EndPos:    1170,
 						},
 					},
 					Value: []byte("foo"),
@@ -3691,18 +3352,17 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 61,
 								EndLine:   61,
-								StartPos:  1282,
-								EndPos:    1313,
+								StartPos:  1172,
+								EndPos:    1203,
 							},
 						},
-						ReturnsRef: false,
 						MethodName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 61,
 									EndLine:   61,
-									StartPos:  1305,
-									EndPos:    1308,
+									StartPos:  1195,
+									EndPos:    1198,
 								},
 							},
 							Value: []byte("bar"),
@@ -3713,8 +3373,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 61,
 										EndLine:   61,
-										StartPos:  1282,
-										EndPos:    1287,
+										StartPos:  1172,
+										EndPos:    1177,
 									},
 								},
 								Value: []byte("final"),
@@ -3724,8 +3384,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 61,
 										EndLine:   61,
-										StartPos:  1288,
-										EndPos:    1295,
+										StartPos:  1178,
+										EndPos:    1185,
 									},
 								},
 								Value: []byte("private"),
@@ -3736,8 +3396,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 61,
 									EndLine:   61,
-									StartPos:  1311,
-									EndPos:    1313,
+									StartPos:  1201,
+									EndPos:    1203,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -3748,18 +3408,17 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 61,
 								EndLine:   61,
-								StartPos:  1314,
-								EndPos:    1341,
+								StartPos:  1204,
+								EndPos:    1231,
 							},
 						},
-						ReturnsRef: false,
 						MethodName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 61,
 									EndLine:   61,
-									StartPos:  1333,
-									EndPos:    1336,
+									StartPos:  1223,
+									EndPos:    1226,
 								},
 							},
 							Value: []byte("baz"),
@@ -3770,8 +3429,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 61,
 										EndLine:   61,
-										StartPos:  1314,
-										EndPos:    1323,
+										StartPos:  1204,
+										EndPos:    1213,
 									},
 								},
 								Value: []byte("protected"),
@@ -3782,8 +3441,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 61,
 									EndLine:   61,
-									StartPos:  1339,
-									EndPos:    1341,
+									StartPos:  1229,
+									EndPos:    1231,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -3796,8 +3455,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 62,
 						EndLine:   62,
-						StartPos:  1346,
-						EndPos:    1399,
+						StartPos:  1234,
+						EndPos:    1287,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -3805,8 +3464,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 62,
 							EndLine:   62,
-							StartPos:  1361,
-							EndPos:    1364,
+							StartPos:  1249,
+							EndPos:    1252,
 						},
 					},
 					Value: []byte("foo"),
@@ -3817,8 +3476,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 62,
 								EndLine:   62,
-								StartPos:  1346,
-								EndPos:    1354,
+								StartPos:  1234,
+								EndPos:    1242,
 							},
 						},
 						Value: []byte("abstract"),
@@ -3830,18 +3489,17 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 62,
 								EndLine:   62,
-								StartPos:  1366,
-								EndPos:    1397,
+								StartPos:  1254,
+								EndPos:    1285,
 							},
 						},
-						ReturnsRef: false,
 						MethodName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 62,
 									EndLine:   62,
-									StartPos:  1391,
-									EndPos:    1394,
+									StartPos:  1279,
+									EndPos:    1282,
 								},
 							},
 							Value: []byte("bar"),
@@ -3852,8 +3510,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 62,
 										EndLine:   62,
-										StartPos:  1366,
-										EndPos:    1374,
+										StartPos:  1254,
+										EndPos:    1262,
 									},
 								},
 								Value: []byte("abstract"),
@@ -3863,8 +3521,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 62,
 										EndLine:   62,
-										StartPos:  1375,
-										EndPos:    1381,
+										StartPos:  1263,
+										EndPos:    1269,
 									},
 								},
 								Value: []byte("public"),
@@ -3875,8 +3533,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 62,
 									EndLine:   62,
-									StartPos:  1396,
-									EndPos:    1397,
+									StartPos:  1284,
+									EndPos:    1285,
 								},
 							},
 						},
@@ -3888,8 +3546,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 63,
 						EndLine:   63,
-						StartPos:  1402,
-						EndPos:    1433,
+						StartPos:  1288,
+						EndPos:    1319,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -3897,8 +3555,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 63,
 							EndLine:   63,
-							StartPos:  1414,
-							EndPos:    1417,
+							StartPos:  1300,
+							EndPos:    1303,
 						},
 					},
 					Value: []byte("foo"),
@@ -3909,8 +3567,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 63,
 								EndLine:   63,
-								StartPos:  1402,
-								EndPos:    1407,
+								StartPos:  1288,
+								EndPos:    1293,
 							},
 						},
 						Value: []byte("final"),
@@ -3921,8 +3579,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 63,
 							EndLine:   63,
-							StartPos:  1418,
-							EndPos:    1429,
+							StartPos:  1304,
+							EndPos:    1315,
 						},
 					},
 					ClassName: &ast.NameName{
@@ -3930,8 +3588,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 63,
 								EndLine:   63,
-								StartPos:  1426,
-								EndPos:    1429,
+								StartPos:  1312,
+								EndPos:    1315,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -3940,8 +3598,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 63,
 										EndLine:   63,
-										StartPos:  1426,
-										EndPos:    1429,
+										StartPos:  1312,
+										EndPos:    1315,
 									},
 								},
 								Value: []byte("bar"),
@@ -3956,8 +3614,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 64,
 						EndLine:   64,
-						StartPos:  1436,
-						EndPos:    1470,
+						StartPos:  1320,
+						EndPos:    1354,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -3965,8 +3623,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 64,
 							EndLine:   64,
-							StartPos:  1448,
-							EndPos:    1451,
+							StartPos:  1332,
+							EndPos:    1335,
 						},
 					},
 					Value: []byte("foo"),
@@ -3977,8 +3635,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 64,
 								EndLine:   64,
-								StartPos:  1436,
-								EndPos:    1441,
+								StartPos:  1320,
+								EndPos:    1325,
 							},
 						},
 						Value: []byte("final"),
@@ -3989,8 +3647,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 64,
 							EndLine:   64,
-							StartPos:  1452,
-							EndPos:    1466,
+							StartPos:  1336,
+							EndPos:    1350,
 						},
 					},
 					InterfaceNames: []ast.Vertex{
@@ -3999,8 +3657,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 64,
 									EndLine:   64,
-									StartPos:  1463,
-									EndPos:    1466,
+									StartPos:  1347,
+									EndPos:    1350,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -4009,8 +3667,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 64,
 											EndLine:   64,
-											StartPos:  1463,
-											EndPos:    1466,
+											StartPos:  1347,
+											EndPos:    1350,
 										},
 									},
 									Value: []byte("bar"),
@@ -4026,8 +3684,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 65,
 						EndLine:   65,
-						StartPos:  1473,
-						EndPos:    1512,
+						StartPos:  1355,
+						EndPos:    1394,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -4035,8 +3693,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 65,
 							EndLine:   65,
-							StartPos:  1485,
-							EndPos:    1488,
+							StartPos:  1367,
+							EndPos:    1370,
 						},
 					},
 					Value: []byte("foo"),
@@ -4047,8 +3705,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 65,
 								EndLine:   65,
-								StartPos:  1473,
-								EndPos:    1478,
+								StartPos:  1355,
+								EndPos:    1360,
 							},
 						},
 						Value: []byte("final"),
@@ -4059,8 +3717,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 65,
 							EndLine:   65,
-							StartPos:  1489,
-							EndPos:    1508,
+							StartPos:  1371,
+							EndPos:    1390,
 						},
 					},
 					InterfaceNames: []ast.Vertex{
@@ -4069,8 +3727,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 65,
 									EndLine:   65,
-									StartPos:  1500,
-									EndPos:    1503,
+									StartPos:  1382,
+									EndPos:    1385,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -4079,8 +3737,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 65,
 											EndLine:   65,
-											StartPos:  1500,
-											EndPos:    1503,
+											StartPos:  1382,
+											EndPos:    1385,
 										},
 									},
 									Value: []byte("bar"),
@@ -4092,8 +3750,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 65,
 									EndLine:   65,
-									StartPos:  1505,
-									EndPos:    1508,
+									StartPos:  1387,
+									EndPos:    1390,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -4102,8 +3760,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 65,
 											EndLine:   65,
-											StartPos:  1505,
-											EndPos:    1508,
+											StartPos:  1387,
+											EndPos:    1390,
 										},
 									},
 									Value: []byte("baz"),
@@ -4119,8 +3777,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 67,
 						EndLine:   67,
-						StartPos:  1516,
-						EndPos:    1539,
+						StartPos:  1396,
+						EndPos:    1419,
 					},
 				},
 				Consts: []ast.Vertex{
@@ -4129,8 +3787,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 67,
 								EndLine:   67,
-								StartPos:  1522,
-								EndPos:    1529,
+								StartPos:  1402,
+								EndPos:    1409,
 							},
 						},
 						ConstantName: &ast.Identifier{
@@ -4138,8 +3796,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 67,
 									EndLine:   67,
-									StartPos:  1522,
-									EndPos:    1525,
+									StartPos:  1402,
+									EndPos:    1405,
 								},
 							},
 							Value: []byte("FOO"),
@@ -4149,8 +3807,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 67,
 									EndLine:   67,
-									StartPos:  1528,
-									EndPos:    1529,
+									StartPos:  1408,
+									EndPos:    1409,
 								},
 							},
 							Value: []byte("1"),
@@ -4161,8 +3819,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 67,
 								EndLine:   67,
-								StartPos:  1531,
-								EndPos:    1538,
+								StartPos:  1411,
+								EndPos:    1418,
 							},
 						},
 						ConstantName: &ast.Identifier{
@@ -4170,8 +3828,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 67,
 									EndLine:   67,
-									StartPos:  1531,
-									EndPos:    1534,
+									StartPos:  1411,
+									EndPos:    1414,
 								},
 							},
 							Value: []byte("BAR"),
@@ -4181,8 +3839,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 67,
 									EndLine:   67,
-									StartPos:  1537,
-									EndPos:    1538,
+									StartPos:  1417,
+									EndPos:    1418,
 								},
 							},
 							Value: []byte("2"),
@@ -4195,8 +3853,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 68,
 						EndLine:   68,
-						StartPos:  1542,
-						EndPos:    1565,
+						StartPos:  1420,
+						EndPos:    1443,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -4204,8 +3862,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 68,
 							EndLine:   68,
-							StartPos:  1549,
-							EndPos:    1550,
+							StartPos:  1427,
+							EndPos:    1428,
 						},
 					},
 					Value: []byte("1"),
@@ -4215,8 +3873,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 68,
 							EndLine:   68,
-							StartPos:  1552,
-							EndPos:    1565,
+							StartPos:  1430,
+							EndPos:    1443,
 						},
 					},
 					Stmts: []ast.Vertex{
@@ -4225,8 +3883,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 68,
 									EndLine:   68,
-									StartPos:  1554,
-									EndPos:    1563,
+									StartPos:  1432,
+									EndPos:    1441,
 								},
 							},
 						},
@@ -4238,8 +3896,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 69,
 						EndLine:   69,
-						StartPos:  1568,
-						EndPos:    1593,
+						StartPos:  1444,
+						EndPos:    1469,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -4247,8 +3905,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 69,
 							EndLine:   69,
-							StartPos:  1575,
-							EndPos:    1576,
+							StartPos:  1451,
+							EndPos:    1452,
 						},
 					},
 					Value: []byte("1"),
@@ -4258,8 +3916,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 69,
 							EndLine:   69,
-							StartPos:  1578,
-							EndPos:    1593,
+							StartPos:  1454,
+							EndPos:    1469,
 						},
 					},
 					Stmts: []ast.Vertex{
@@ -4268,8 +3926,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 69,
 									EndLine:   69,
-									StartPos:  1580,
-									EndPos:    1591,
+									StartPos:  1456,
+									EndPos:    1467,
 								},
 							},
 							Expr: &ast.ScalarLnumber{
@@ -4277,8 +3935,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 69,
 										EndLine:   69,
-										StartPos:  1589,
-										EndPos:    1590,
+										StartPos:  1465,
+										EndPos:    1466,
 									},
 								},
 								Value: []byte("2"),
@@ -4292,8 +3950,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 70,
 						EndLine:   70,
-						StartPos:  1596,
-						EndPos:    1622,
+						StartPos:  1470,
+						EndPos:    1496,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -4301,8 +3959,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 70,
 							EndLine:   70,
-							StartPos:  1603,
-							EndPos:    1604,
+							StartPos:  1477,
+							EndPos:    1478,
 						},
 					},
 					Value: []byte("1"),
@@ -4312,8 +3970,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 70,
 							EndLine:   70,
-							StartPos:  1606,
-							EndPos:    1622,
+							StartPos:  1480,
+							EndPos:    1496,
 						},
 					},
 					Stmts: []ast.Vertex{
@@ -4322,8 +3980,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 70,
 									EndLine:   70,
-									StartPos:  1608,
-									EndPos:    1620,
+									StartPos:  1482,
+									EndPos:    1494,
 								},
 							},
 							Expr: &ast.ScalarLnumber{
@@ -4331,8 +3989,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 70,
 										EndLine:   70,
-										StartPos:  1617,
-										EndPos:    1618,
+										StartPos:  1491,
+										EndPos:    1492,
 									},
 								},
 								Value: []byte("3"),
@@ -4346,19 +4004,18 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 71,
 						EndLine:   71,
-						StartPos:  1625,
-						EndPos:    1642,
+						StartPos:  1497,
+						EndPos:    1514,
 					},
 				},
-				Alt: false,
 				Consts: []ast.Vertex{
 					&ast.StmtConstant{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 71,
 								EndLine:   71,
-								StartPos:  1633,
-								EndPos:    1640,
+								StartPos:  1505,
+								EndPos:    1512,
 							},
 						},
 						ConstantName: &ast.Identifier{
@@ -4366,8 +4023,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 71,
 									EndLine:   71,
-									StartPos:  1633,
-									EndPos:    1638,
+									StartPos:  1505,
+									EndPos:    1510,
 								},
 							},
 							Value: []byte("ticks"),
@@ -4377,8 +4034,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 71,
 									EndLine:   71,
-									StartPos:  1639,
-									EndPos:    1640,
+									StartPos:  1511,
+									EndPos:    1512,
 								},
 							},
 							Value: []byte("1"),
@@ -4390,8 +4047,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 71,
 							EndLine:   71,
-							StartPos:  1641,
-							EndPos:    1642,
+							StartPos:  1513,
+							EndPos:    1514,
 						},
 					},
 				},
@@ -4401,19 +4058,18 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 72,
 						EndLine:   72,
-						StartPos:  1645,
-						EndPos:    1680,
+						StartPos:  1515,
+						EndPos:    1550,
 					},
 				},
-				Alt: false,
 				Consts: []ast.Vertex{
 					&ast.StmtConstant{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 72,
 								EndLine:   72,
-								StartPos:  1653,
-								EndPos:    1660,
+								StartPos:  1523,
+								EndPos:    1530,
 							},
 						},
 						ConstantName: &ast.Identifier{
@@ -4421,8 +4077,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 72,
 									EndLine:   72,
-									StartPos:  1653,
-									EndPos:    1658,
+									StartPos:  1523,
+									EndPos:    1528,
 								},
 							},
 							Value: []byte("ticks"),
@@ -4432,8 +4088,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 72,
 									EndLine:   72,
-									StartPos:  1659,
-									EndPos:    1660,
+									StartPos:  1529,
+									EndPos:    1530,
 								},
 							},
 							Value: []byte("1"),
@@ -4444,8 +4100,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 72,
 								EndLine:   72,
-								StartPos:  1662,
-								EndPos:    1676,
+								StartPos:  1532,
+								EndPos:    1546,
 							},
 						},
 						ConstantName: &ast.Identifier{
@@ -4453,8 +4109,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 72,
 									EndLine:   72,
-									StartPos:  1662,
-									EndPos:    1674,
+									StartPos:  1532,
+									EndPos:    1544,
 								},
 							},
 							Value: []byte("strict_types"),
@@ -4464,8 +4120,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 72,
 									EndLine:   72,
-									StartPos:  1675,
-									EndPos:    1676,
+									StartPos:  1545,
+									EndPos:    1546,
 								},
 							},
 							Value: []byte("1"),
@@ -4477,8 +4133,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 72,
 							EndLine:   72,
-							StartPos:  1678,
-							EndPos:    1680,
+							StartPos:  1548,
+							EndPos:    1550,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -4489,8 +4145,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 73,
 						EndLine:   73,
-						StartPos:  1683,
-						EndPos:    1712,
+						StartPos:  1551,
+						EndPos:    1580,
 					},
 				},
 				Alt: true,
@@ -4500,8 +4156,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 73,
 								EndLine:   73,
-								StartPos:  1691,
-								EndPos:    1698,
+								StartPos:  1559,
+								EndPos:    1566,
 							},
 						},
 						ConstantName: &ast.Identifier{
@@ -4509,8 +4165,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 73,
 									EndLine:   73,
-									StartPos:  1691,
-									EndPos:    1696,
+									StartPos:  1559,
+									EndPos:    1564,
 								},
 							},
 							Value: []byte("ticks"),
@@ -4520,8 +4176,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 73,
 									EndLine:   73,
-									StartPos:  1697,
-									EndPos:    1698,
+									StartPos:  1565,
+									EndPos:    1566,
 								},
 							},
 							Value: []byte("1"),
@@ -4545,8 +4201,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 74,
 						EndLine:   74,
-						StartPos:  1715,
-						EndPos:    1730,
+						StartPos:  1581,
+						EndPos:    1596,
 					},
 				},
 				Stmt: &ast.StmtStmtList{
@@ -4554,8 +4210,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 74,
 							EndLine:   74,
-							StartPos:  1718,
-							EndPos:    1720,
+							StartPos:  1584,
+							EndPos:    1586,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -4565,8 +4221,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 74,
 							EndLine:   74,
-							StartPos:  1727,
-							EndPos:    1728,
+							StartPos:  1593,
+							EndPos:    1594,
 						},
 					},
 					Value: []byte("1"),
@@ -4577,8 +4233,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 75,
 						EndLine:   75,
-						StartPos:  1733,
-						EndPos:    1744,
+						StartPos:  1597,
+						EndPos:    1608,
 					},
 				},
 				Exprs: []ast.Vertex{
@@ -4587,8 +4243,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 75,
 								EndLine:   75,
-								StartPos:  1738,
-								EndPos:    1740,
+								StartPos:  1602,
+								EndPos:    1604,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -4596,8 +4252,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 75,
 									EndLine:   75,
-									StartPos:  1738,
-									EndPos:    1740,
+									StartPos:  1602,
+									EndPos:    1604,
 								},
 							},
 							Value: []byte("$a"),
@@ -4608,8 +4264,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 75,
 								EndLine:   75,
-								StartPos:  1742,
-								EndPos:    1743,
+								StartPos:  1606,
+								EndPos:    1607,
 							},
 						},
 						Value: []byte("1"),
@@ -4621,8 +4277,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 76,
 						EndLine:   76,
-						StartPos:  1747,
-						EndPos:    1756,
+						StartPos:  1609,
+						EndPos:    1618,
 					},
 				},
 				Exprs: []ast.Vertex{
@@ -4631,8 +4287,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 76,
 								EndLine:   76,
-								StartPos:  1752,
-								EndPos:    1754,
+								StartPos:  1614,
+								EndPos:    1616,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -4640,8 +4296,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 76,
 									EndLine:   76,
-									StartPos:  1752,
-									EndPos:    1754,
+									StartPos:  1614,
+									EndPos:    1616,
 								},
 							},
 							Value: []byte("$a"),
@@ -4654,8 +4310,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 77,
 						EndLine:   77,
-						StartPos:  1759,
-						EndPos:    1794,
+						StartPos:  1619,
+						EndPos:    1654,
 					},
 				},
 				Init: []ast.Vertex{
@@ -4664,8 +4320,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 77,
 								EndLine:   77,
-								StartPos:  1763,
-								EndPos:    1769,
+								StartPos:  1623,
+								EndPos:    1629,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -4673,8 +4329,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 77,
 									EndLine:   77,
-									StartPos:  1763,
-									EndPos:    1765,
+									StartPos:  1623,
+									EndPos:    1625,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -4682,8 +4338,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 77,
 										EndLine:   77,
-										StartPos:  1763,
-										EndPos:    1765,
+										StartPos:  1623,
+										EndPos:    1625,
 									},
 								},
 								Value: []byte("$i"),
@@ -4694,8 +4350,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 77,
 									EndLine:   77,
-									StartPos:  1768,
-									EndPos:    1769,
+									StartPos:  1628,
+									EndPos:    1629,
 								},
 							},
 							Value: []byte("0"),
@@ -4708,8 +4364,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 77,
 								EndLine:   77,
-								StartPos:  1771,
-								EndPos:    1778,
+								StartPos:  1631,
+								EndPos:    1638,
 							},
 						},
 						Left: &ast.ExprVariable{
@@ -4717,8 +4373,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 77,
 									EndLine:   77,
-									StartPos:  1771,
-									EndPos:    1773,
+									StartPos:  1631,
+									EndPos:    1633,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -4726,8 +4382,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 77,
 										EndLine:   77,
-										StartPos:  1771,
-										EndPos:    1773,
+										StartPos:  1631,
+										EndPos:    1633,
 									},
 								},
 								Value: []byte("$i"),
@@ -4738,8 +4394,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 77,
 									EndLine:   77,
-									StartPos:  1776,
-									EndPos:    1778,
+									StartPos:  1636,
+									EndPos:    1638,
 								},
 							},
 							Value: []byte("10"),
@@ -4752,8 +4408,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 77,
 								EndLine:   77,
-								StartPos:  1780,
-								EndPos:    1784,
+								StartPos:  1640,
+								EndPos:    1644,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -4761,8 +4417,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 77,
 									EndLine:   77,
-									StartPos:  1780,
-									EndPos:    1782,
+									StartPos:  1640,
+									EndPos:    1642,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -4770,8 +4426,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 77,
 										EndLine:   77,
-										StartPos:  1780,
-										EndPos:    1782,
+										StartPos:  1640,
+										EndPos:    1642,
 									},
 								},
 								Value: []byte("$i"),
@@ -4783,8 +4439,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 77,
 								EndLine:   77,
-								StartPos:  1786,
-								EndPos:    1790,
+								StartPos:  1646,
+								EndPos:    1650,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -4792,8 +4448,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 77,
 									EndLine:   77,
-									StartPos:  1786,
-									EndPos:    1788,
+									StartPos:  1646,
+									EndPos:    1648,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -4801,8 +4457,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 77,
 										EndLine:   77,
-										StartPos:  1786,
-										EndPos:    1788,
+										StartPos:  1646,
+										EndPos:    1648,
 									},
 								},
 								Value: []byte("$i"),
@@ -4815,8 +4471,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 77,
 							EndLine:   77,
-							StartPos:  1792,
-							EndPos:    1794,
+							StartPos:  1652,
+							EndPos:    1654,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -4827,8 +4483,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 78,
 						EndLine:   78,
-						StartPos:  1797,
-						EndPos:    1827,
+						StartPos:  1655,
+						EndPos:    1685,
 					},
 				},
 				Cond: []ast.Vertex{
@@ -4837,8 +4493,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 78,
 								EndLine:   78,
-								StartPos:  1803,
-								EndPos:    1810,
+								StartPos:  1661,
+								EndPos:    1668,
 							},
 						},
 						Left: &ast.ExprVariable{
@@ -4846,8 +4502,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 78,
 									EndLine:   78,
-									StartPos:  1803,
-									EndPos:    1805,
+									StartPos:  1661,
+									EndPos:    1663,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -4855,8 +4511,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 78,
 										EndLine:   78,
-										StartPos:  1803,
-										EndPos:    1805,
+										StartPos:  1661,
+										EndPos:    1663,
 									},
 								},
 								Value: []byte("$i"),
@@ -4867,8 +4523,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 78,
 									EndLine:   78,
-									StartPos:  1808,
-									EndPos:    1810,
+									StartPos:  1666,
+									EndPos:    1668,
 								},
 							},
 							Value: []byte("10"),
@@ -4881,8 +4537,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 78,
 								EndLine:   78,
-								StartPos:  1812,
-								EndPos:    1816,
+								StartPos:  1670,
+								EndPos:    1674,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -4890,8 +4546,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 78,
 									EndLine:   78,
-									StartPos:  1812,
-									EndPos:    1814,
+									StartPos:  1670,
+									EndPos:    1672,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -4899,8 +4555,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 78,
 										EndLine:   78,
-										StartPos:  1812,
-										EndPos:    1814,
+										StartPos:  1670,
+										EndPos:    1672,
 									},
 								},
 								Value: []byte("$i"),
@@ -4925,8 +4581,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 79,
 						EndLine:   79,
-						StartPos:  1830,
-						EndPos:    1851,
+						StartPos:  1686,
+						EndPos:    1707,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -4934,8 +4590,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 79,
 							EndLine:   79,
-							StartPos:  1839,
-							EndPos:    1841,
+							StartPos:  1695,
+							EndPos:    1697,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -4943,8 +4599,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 79,
 								EndLine:   79,
-								StartPos:  1839,
-								EndPos:    1841,
+								StartPos:  1695,
+								EndPos:    1697,
 							},
 						},
 						Value: []byte("$a"),
@@ -4955,8 +4611,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 79,
 							EndLine:   79,
-							StartPos:  1845,
-							EndPos:    1847,
+							StartPos:  1701,
+							EndPos:    1703,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -4964,8 +4620,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 79,
 								EndLine:   79,
-								StartPos:  1845,
-								EndPos:    1847,
+								StartPos:  1701,
+								EndPos:    1703,
 							},
 						},
 						Value: []byte("$v"),
@@ -4976,8 +4632,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 79,
 							EndLine:   79,
-							StartPos:  1849,
-							EndPos:    1851,
+							StartPos:  1705,
+							EndPos:    1707,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -4988,8 +4644,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 80,
 						EndLine:   80,
-						StartPos:  1854,
-						EndPos:    1875,
+						StartPos:  1708,
+						EndPos:    1729,
 					},
 				},
 				Expr: &ast.ExprShortArray{
@@ -4997,8 +4653,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 80,
 							EndLine:   80,
-							StartPos:  1863,
-							EndPos:    1865,
+							StartPos:  1717,
+							EndPos:    1719,
 						},
 					},
 					Items: []ast.Vertex{},
@@ -5008,8 +4664,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 80,
 							EndLine:   80,
-							StartPos:  1869,
-							EndPos:    1871,
+							StartPos:  1723,
+							EndPos:    1725,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5017,8 +4673,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 80,
 								EndLine:   80,
-								StartPos:  1869,
-								EndPos:    1871,
+								StartPos:  1723,
+								EndPos:    1725,
 							},
 						},
 						Value: []byte("$v"),
@@ -5029,8 +4685,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 80,
 							EndLine:   80,
-							StartPos:  1873,
-							EndPos:    1875,
+							StartPos:  1727,
+							EndPos:    1729,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -5041,8 +4697,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 81,
 						EndLine:   81,
-						StartPos:  1878,
-						EndPos:    1910,
+						StartPos:  1730,
+						EndPos:    1762,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -5050,8 +4706,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 81,
 							EndLine:   81,
-							StartPos:  1887,
-							EndPos:    1889,
+							StartPos:  1739,
+							EndPos:    1741,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5059,8 +4715,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 81,
 								EndLine:   81,
-								StartPos:  1887,
-								EndPos:    1889,
+								StartPos:  1739,
+								EndPos:    1741,
 							},
 						},
 						Value: []byte("$a"),
@@ -5071,8 +4727,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 81,
 							EndLine:   81,
-							StartPos:  1893,
-							EndPos:    1895,
+							StartPos:  1745,
+							EndPos:    1747,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5080,8 +4736,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 81,
 								EndLine:   81,
-								StartPos:  1893,
-								EndPos:    1895,
+								StartPos:  1745,
+								EndPos:    1747,
 							},
 						},
 						Value: []byte("$v"),
@@ -5104,8 +4760,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 82,
 						EndLine:   82,
-						StartPos:  1913,
-						EndPos:    1940,
+						StartPos:  1763,
+						EndPos:    1790,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -5113,8 +4769,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 82,
 							EndLine:   82,
-							StartPos:  1922,
-							EndPos:    1924,
+							StartPos:  1772,
+							EndPos:    1774,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5122,8 +4778,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 82,
 								EndLine:   82,
-								StartPos:  1922,
-								EndPos:    1924,
+								StartPos:  1772,
+								EndPos:    1774,
 							},
 						},
 						Value: []byte("$a"),
@@ -5134,8 +4790,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 82,
 							EndLine:   82,
-							StartPos:  1928,
-							EndPos:    1930,
+							StartPos:  1778,
+							EndPos:    1780,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5143,8 +4799,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 82,
 								EndLine:   82,
-								StartPos:  1928,
-								EndPos:    1930,
+								StartPos:  1778,
+								EndPos:    1780,
 							},
 						},
 						Value: []byte("$k"),
@@ -5155,8 +4811,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 82,
 							EndLine:   82,
-							StartPos:  1934,
-							EndPos:    1936,
+							StartPos:  1784,
+							EndPos:    1786,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5164,8 +4820,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 82,
 								EndLine:   82,
-								StartPos:  1934,
-								EndPos:    1936,
+								StartPos:  1784,
+								EndPos:    1786,
 							},
 						},
 						Value: []byte("$v"),
@@ -5176,8 +4832,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 82,
 							EndLine:   82,
-							StartPos:  1938,
-							EndPos:    1940,
+							StartPos:  1788,
+							EndPos:    1790,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -5188,8 +4844,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 83,
 						EndLine:   83,
-						StartPos:  1943,
-						EndPos:    1970,
+						StartPos:  1791,
+						EndPos:    1818,
 					},
 				},
 				Expr: &ast.ExprShortArray{
@@ -5197,8 +4853,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 83,
 							EndLine:   83,
-							StartPos:  1952,
-							EndPos:    1954,
+							StartPos:  1800,
+							EndPos:    1802,
 						},
 					},
 					Items: []ast.Vertex{},
@@ -5208,8 +4864,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 83,
 							EndLine:   83,
-							StartPos:  1958,
-							EndPos:    1960,
+							StartPos:  1806,
+							EndPos:    1808,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5217,8 +4873,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 83,
 								EndLine:   83,
-								StartPos:  1958,
-								EndPos:    1960,
+								StartPos:  1806,
+								EndPos:    1808,
 							},
 						},
 						Value: []byte("$k"),
@@ -5229,8 +4885,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 83,
 							EndLine:   83,
-							StartPos:  1964,
-							EndPos:    1966,
+							StartPos:  1812,
+							EndPos:    1814,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5238,8 +4894,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 83,
 								EndLine:   83,
-								StartPos:  1964,
-								EndPos:    1966,
+								StartPos:  1812,
+								EndPos:    1814,
 							},
 						},
 						Value: []byte("$v"),
@@ -5250,8 +4906,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 83,
 							EndLine:   83,
-							StartPos:  1968,
-							EndPos:    1970,
+							StartPos:  1816,
+							EndPos:    1818,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -5262,8 +4918,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 84,
 						EndLine:   84,
-						StartPos:  1973,
-						EndPos:    2001,
+						StartPos:  1819,
+						EndPos:    1847,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -5271,8 +4927,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 84,
 							EndLine:   84,
-							StartPos:  1982,
-							EndPos:    1984,
+							StartPos:  1828,
+							EndPos:    1830,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5280,8 +4936,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 84,
 								EndLine:   84,
-								StartPos:  1982,
-								EndPos:    1984,
+								StartPos:  1828,
+								EndPos:    1830,
 							},
 						},
 						Value: []byte("$a"),
@@ -5292,8 +4948,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 84,
 							EndLine:   84,
-							StartPos:  1988,
-							EndPos:    1990,
+							StartPos:  1834,
+							EndPos:    1836,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5301,8 +4957,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 84,
 								EndLine:   84,
-								StartPos:  1988,
-								EndPos:    1990,
+								StartPos:  1834,
+								EndPos:    1836,
 							},
 						},
 						Value: []byte("$k"),
@@ -5313,8 +4969,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 84,
 							EndLine:   84,
-							StartPos:  1994,
-							EndPos:    1997,
+							StartPos:  1840,
+							EndPos:    1843,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -5322,8 +4978,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 84,
 								EndLine:   84,
-								StartPos:  1995,
-								EndPos:    1997,
+								StartPos:  1841,
+								EndPos:    1843,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -5331,8 +4987,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 84,
 									EndLine:   84,
-									StartPos:  1995,
-									EndPos:    1997,
+									StartPos:  1841,
+									EndPos:    1843,
 								},
 							},
 							Value: []byte("$v"),
@@ -5344,8 +5000,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 84,
 							EndLine:   84,
-							StartPos:  1999,
-							EndPos:    2001,
+							StartPos:  1845,
+							EndPos:    1847,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -5356,8 +5012,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 85,
 						EndLine:   85,
-						StartPos:  2004,
-						EndPos:    2037,
+						StartPos:  1848,
+						EndPos:    1881,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -5365,8 +5021,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 85,
 							EndLine:   85,
-							StartPos:  2013,
-							EndPos:    2015,
+							StartPos:  1857,
+							EndPos:    1859,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5374,8 +5030,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 85,
 								EndLine:   85,
-								StartPos:  2013,
-								EndPos:    2015,
+								StartPos:  1857,
+								EndPos:    1859,
 							},
 						},
 						Value: []byte("$a"),
@@ -5386,8 +5042,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 85,
 							EndLine:   85,
-							StartPos:  2019,
-							EndPos:    2021,
+							StartPos:  1863,
+							EndPos:    1865,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5395,8 +5051,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 85,
 								EndLine:   85,
-								StartPos:  2019,
-								EndPos:    2021,
+								StartPos:  1863,
+								EndPos:    1865,
 							},
 						},
 						Value: []byte("$k"),
@@ -5407,8 +5063,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 85,
 							EndLine:   85,
-							StartPos:  2025,
-							EndPos:    2033,
+							StartPos:  1869,
+							EndPos:    1877,
 						},
 					},
 					Items: []ast.Vertex{
@@ -5417,8 +5073,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 85,
 									EndLine:   85,
-									StartPos:  2030,
-									EndPos:    2032,
+									StartPos:  1874,
+									EndPos:    1876,
 								},
 							},
 							Val: &ast.ExprVariable{
@@ -5426,8 +5082,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 85,
 										EndLine:   85,
-										StartPos:  2030,
-										EndPos:    2032,
+										StartPos:  1874,
+										EndPos:    1876,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -5435,8 +5091,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 85,
 											EndLine:   85,
-											StartPos:  2030,
-											EndPos:    2032,
+											StartPos:  1874,
+											EndPos:    1876,
 										},
 									},
 									Value: []byte("$v"),
@@ -5450,8 +5106,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 85,
 							EndLine:   85,
-							StartPos:  2035,
-							EndPos:    2037,
+							StartPos:  1879,
+							EndPos:    1881,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -5462,18 +5118,17 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 86,
 						EndLine:   86,
-						StartPos:  2040,
-						EndPos:    2057,
+						StartPos:  1882,
+						EndPos:    1899,
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 86,
 							EndLine:   86,
-							StartPos:  2049,
-							EndPos:    2052,
+							StartPos:  1891,
+							EndPos:    1894,
 						},
 					},
 					Value: []byte("foo"),
@@ -5485,18 +5140,17 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 88,
 						EndLine:   92,
-						StartPos:  2061,
-						EndPos:    2132,
+						StartPos:  1901,
+						EndPos:    1973,
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 88,
 							EndLine:   88,
-							StartPos:  2070,
-							EndPos:    2073,
+							StartPos:  1910,
+							EndPos:    1913,
 						},
 					},
 					Value: []byte("foo"),
@@ -5507,18 +5161,17 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 89,
 								EndLine:   89,
-								StartPos:  2081,
-								EndPos:    2098,
+								StartPos:  1922,
+								EndPos:    1939,
 							},
 						},
-						ReturnsRef: false,
 						FunctionName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 89,
 									EndLine:   89,
-									StartPos:  2090,
-									EndPos:    2093,
+									StartPos:  1931,
+									EndPos:    1934,
 								},
 							},
 							Value: []byte("bar"),
@@ -5530,8 +5183,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 90,
 								EndLine:   90,
-								StartPos:  2102,
-								EndPos:    2114,
+								StartPos:  1944,
+								EndPos:    1956,
 							},
 						},
 						ClassName: &ast.Identifier{
@@ -5539,8 +5192,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 90,
 									EndLine:   90,
-									StartPos:  2108,
-									EndPos:    2111,
+									StartPos:  1950,
+									EndPos:    1953,
 								},
 							},
 							Value: []byte("Baz"),
@@ -5552,8 +5205,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 91,
 								EndLine:   91,
-								StartPos:  2118,
-								EndPos:    2128,
+								StartPos:  1961,
+								EndPos:    1971,
 							},
 						},
 						Expr: &ast.ExprVariable{
@@ -5561,8 +5214,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 91,
 									EndLine:   91,
-									StartPos:  2125,
-									EndPos:    2127,
+									StartPos:  1968,
+									EndPos:    1970,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -5570,8 +5223,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 91,
 										EndLine:   91,
-										StartPos:  2125,
-										EndPos:    2127,
+										StartPos:  1968,
+										EndPos:    1970,
 									},
 								},
 								Value: []byte("$a"),
@@ -5585,18 +5238,17 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 94,
 						EndLine:   94,
-						StartPos:  2138,
-						EndPos:    2183,
+						StartPos:  1975,
+						EndPos:    2020,
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 94,
 							EndLine:   94,
-							StartPos:  2147,
-							EndPos:    2150,
+							StartPos:  1984,
+							EndPos:    1987,
 						},
 					},
 					Value: []byte("foo"),
@@ -5607,19 +5259,17 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 94,
 								EndLine:   94,
-								StartPos:  2151,
-								EndPos:    2159,
+								StartPos:  1988,
+								EndPos:    1996,
 							},
 						},
-						Variadic: false,
-						ByRef:    false,
 						Type: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 94,
 									EndLine:   94,
-									StartPos:  2151,
-									EndPos:    2156,
+									StartPos:  1988,
+									EndPos:    1993,
 								},
 							},
 							Value: []byte("array"),
@@ -5629,8 +5279,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 94,
 									EndLine:   94,
-									StartPos:  2157,
-									EndPos:    2159,
+									StartPos:  1994,
+									EndPos:    1996,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -5638,8 +5288,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 94,
 										EndLine:   94,
-										StartPos:  2157,
-										EndPos:    2159,
+										StartPos:  1994,
+										EndPos:    1996,
 									},
 								},
 								Value: []byte("$a"),
@@ -5651,19 +5301,17 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 94,
 								EndLine:   94,
-								StartPos:  2161,
-								EndPos:    2172,
+								StartPos:  1998,
+								EndPos:    2009,
 							},
 						},
-						ByRef:    false,
-						Variadic: false,
 						Type: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 94,
 									EndLine:   94,
-									StartPos:  2161,
-									EndPos:    2169,
+									StartPos:  1998,
+									EndPos:    2006,
 								},
 							},
 							Value: []byte("callable"),
@@ -5673,8 +5321,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 94,
 									EndLine:   94,
-									StartPos:  2170,
-									EndPos:    2172,
+									StartPos:  2007,
+									EndPos:    2009,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -5682,8 +5330,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 94,
 										EndLine:   94,
-										StartPos:  2170,
-										EndPos:    2172,
+										StartPos:  2007,
+										EndPos:    2009,
 									},
 								},
 								Value: []byte("$b"),
@@ -5697,8 +5345,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 94,
 								EndLine:   94,
-								StartPos:  2175,
-								EndPos:    2182,
+								StartPos:  2012,
+								EndPos:    2019,
 							},
 						},
 					},
@@ -5709,8 +5357,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 95,
 						EndLine:   95,
-						StartPos:  2186,
-						EndPos:    2213,
+						StartPos:  2021,
+						EndPos:    2048,
 					},
 				},
 				ReturnsRef: true,
@@ -5719,8 +5367,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 95,
 							EndLine:   95,
-							StartPos:  2196,
-							EndPos:    2199,
+							StartPos:  2031,
+							EndPos:    2034,
 						},
 					},
 					Value: []byte("foo"),
@@ -5731,8 +5379,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 95,
 								EndLine:   95,
-								StartPos:  2203,
-								EndPos:    2212,
+								StartPos:  2038,
+								EndPos:    2047,
 							},
 						},
 						Expr: &ast.ScalarLnumber{
@@ -5740,8 +5388,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 95,
 									EndLine:   95,
-									StartPos:  2210,
-									EndPos:    2211,
+									StartPos:  2045,
+									EndPos:    2046,
 								},
 							},
 							Value: []byte("1"),
@@ -5754,8 +5402,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 96,
 						EndLine:   96,
-						StartPos:  2216,
-						EndPos:    2234,
+						StartPos:  2049,
+						EndPos:    2067,
 					},
 				},
 				ReturnsRef: true,
@@ -5764,8 +5412,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 96,
 							EndLine:   96,
-							StartPos:  2226,
-							EndPos:    2229,
+							StartPos:  2059,
+							EndPos:    2062,
 						},
 					},
 					Value: []byte("foo"),
@@ -5777,8 +5425,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 97,
 						EndLine:   97,
-						StartPos:  2237,
-						EndPos:    2266,
+						StartPos:  2068,
+						EndPos:    2097,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -5787,8 +5435,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 97,
 								EndLine:   97,
-								StartPos:  2244,
-								EndPos:    2246,
+								StartPos:  2075,
+								EndPos:    2077,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -5796,8 +5444,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 97,
 									EndLine:   97,
-									StartPos:  2244,
-									EndPos:    2246,
+									StartPos:  2075,
+									EndPos:    2077,
 								},
 							},
 							Value: []byte("$a"),
@@ -5808,8 +5456,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 97,
 								EndLine:   97,
-								StartPos:  2248,
-								EndPos:    2250,
+								StartPos:  2079,
+								EndPos:    2081,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -5817,8 +5465,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 97,
 									EndLine:   97,
-									StartPos:  2248,
-									EndPos:    2250,
+									StartPos:  2079,
+									EndPos:    2081,
 								},
 							},
 							Value: []byte("$b"),
@@ -5829,8 +5477,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 97,
 								EndLine:   97,
-								StartPos:  2252,
-								EndPos:    2255,
+								StartPos:  2083,
+								EndPos:    2086,
 							},
 						},
 						VarName: &ast.ExprVariable{
@@ -5838,8 +5486,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 97,
 									EndLine:   97,
-									StartPos:  2253,
-									EndPos:    2255,
+									StartPos:  2084,
+									EndPos:    2086,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -5847,8 +5495,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 97,
 										EndLine:   97,
-										StartPos:  2253,
-										EndPos:    2255,
+										StartPos:  2084,
+										EndPos:    2086,
 									},
 								},
 								Value: []byte("$c"),
@@ -5860,8 +5508,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 97,
 								EndLine:   97,
-								StartPos:  2257,
-								EndPos:    2265,
+								StartPos:  2088,
+								EndPos:    2096,
 							},
 						},
 						VarName: &ast.ExprFunctionCall{
@@ -5869,8 +5517,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 97,
 									EndLine:   97,
-									StartPos:  2259,
-									EndPos:    2264,
+									StartPos:  2090,
+									EndPos:    2095,
 								},
 							},
 							Function: &ast.NameName{
@@ -5878,8 +5526,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 97,
 										EndLine:   97,
-										StartPos:  2259,
-										EndPos:    2262,
+										StartPos:  2090,
+										EndPos:    2093,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -5888,8 +5536,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 97,
 												EndLine:   97,
-												StartPos:  2259,
-												EndPos:    2262,
+												StartPos:  2090,
+												EndPos:    2093,
 											},
 										},
 										Value: []byte("foo"),
@@ -5901,8 +5549,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 97,
 										EndLine:   97,
-										StartPos:  2262,
-										EndPos:    2264,
+										StartPos:  2093,
+										EndPos:    2095,
 									},
 								},
 							},
@@ -5915,8 +5563,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 98,
 						EndLine:   98,
-						StartPos:  2269,
-						EndPos:    2271,
+						StartPos:  2098,
+						EndPos:    2100,
 					},
 				},
 				LabelName: &ast.Identifier{
@@ -5924,8 +5572,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 98,
 							EndLine:   98,
-							StartPos:  2269,
-							EndPos:    2270,
+							StartPos:  2098,
+							EndPos:    2099,
 						},
 					},
 					Value: []byte("a"),
@@ -5936,8 +5584,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 99,
 						EndLine:   99,
-						StartPos:  2275,
-						EndPos:    2282,
+						StartPos:  2101,
+						EndPos:    2108,
 					},
 				},
 				Label: &ast.Identifier{
@@ -5945,8 +5593,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 99,
 							EndLine:   99,
-							StartPos:  2280,
-							EndPos:    2281,
+							StartPos:  2106,
+							EndPos:    2107,
 						},
 					},
 					Value: []byte("a"),
@@ -5957,8 +5605,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 100,
 						EndLine:   100,
-						StartPos:  2285,
-						EndPos:    2295,
+						StartPos:  2109,
+						EndPos:    2119,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -5966,8 +5614,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 100,
 							EndLine:   100,
-							StartPos:  2289,
-							EndPos:    2291,
+							StartPos:  2113,
+							EndPos:    2115,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5975,8 +5623,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 100,
 								EndLine:   100,
-								StartPos:  2289,
-								EndPos:    2291,
+								StartPos:  2113,
+								EndPos:    2115,
 							},
 						},
 						Value: []byte("$a"),
@@ -5987,8 +5635,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 100,
 							EndLine:   100,
-							StartPos:  2293,
-							EndPos:    2295,
+							StartPos:  2117,
+							EndPos:    2119,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -5999,8 +5647,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 101,
 						EndLine:   101,
-						StartPos:  2298,
-						EndPos:    2323,
+						StartPos:  2120,
+						EndPos:    2145,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -6008,8 +5656,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 101,
 							EndLine:   101,
-							StartPos:  2302,
-							EndPos:    2304,
+							StartPos:  2124,
+							EndPos:    2126,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6017,8 +5665,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 101,
 								EndLine:   101,
-								StartPos:  2302,
-								EndPos:    2304,
+								StartPos:  2124,
+								EndPos:    2126,
 							},
 						},
 						Value: []byte("$a"),
@@ -6029,8 +5677,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 101,
 							EndLine:   101,
-							StartPos:  2306,
-							EndPos:    2308,
+							StartPos:  2128,
+							EndPos:    2130,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -6041,8 +5689,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 101,
 								EndLine:   101,
-								StartPos:  2309,
-								EndPos:    2323,
+								StartPos:  2131,
+								EndPos:    2145,
 							},
 						},
 						Cond: &ast.ExprVariable{
@@ -6050,8 +5698,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 101,
 									EndLine:   101,
-									StartPos:  2317,
-									EndPos:    2319,
+									StartPos:  2139,
+									EndPos:    2141,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -6059,8 +5707,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 101,
 										EndLine:   101,
-										StartPos:  2317,
-										EndPos:    2319,
+										StartPos:  2139,
+										EndPos:    2141,
 									},
 								},
 								Value: []byte("$b"),
@@ -6071,8 +5719,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 101,
 									EndLine:   101,
-									StartPos:  2321,
-									EndPos:    2323,
+									StartPos:  2143,
+									EndPos:    2145,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -6085,8 +5733,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 102,
 						EndLine:   102,
-						StartPos:  2326,
-						EndPos:    2344,
+						StartPos:  2146,
+						EndPos:    2164,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -6094,8 +5742,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 102,
 							EndLine:   102,
-							StartPos:  2330,
-							EndPos:    2332,
+							StartPos:  2150,
+							EndPos:    2152,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6103,8 +5751,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 102,
 								EndLine:   102,
-								StartPos:  2330,
-								EndPos:    2332,
+								StartPos:  2150,
+								EndPos:    2152,
 							},
 						},
 						Value: []byte("$a"),
@@ -6115,8 +5763,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 102,
 							EndLine:   102,
-							StartPos:  2334,
-							EndPos:    2336,
+							StartPos:  2154,
+							EndPos:    2156,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -6126,8 +5774,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 102,
 							EndLine:   102,
-							StartPos:  2337,
-							EndPos:    2344,
+							StartPos:  2157,
+							EndPos:    2164,
 						},
 					},
 					Stmt: &ast.StmtStmtList{
@@ -6135,8 +5783,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 102,
 								EndLine:   102,
-								StartPos:  2342,
-								EndPos:    2344,
+								StartPos:  2162,
+								EndPos:    2164,
 							},
 						},
 						Stmts: []ast.Vertex{},
@@ -6148,8 +5796,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 103,
 						EndLine:   103,
-						StartPos:  2347,
-						EndPos:    2395,
+						StartPos:  2165,
+						EndPos:    2213,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -6157,8 +5805,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 103,
 							EndLine:   103,
-							StartPos:  2351,
-							EndPos:    2353,
+							StartPos:  2169,
+							EndPos:    2171,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6166,8 +5814,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 103,
 								EndLine:   103,
-								StartPos:  2351,
-								EndPos:    2353,
+								StartPos:  2169,
+								EndPos:    2171,
 							},
 						},
 						Value: []byte("$a"),
@@ -6178,8 +5826,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 103,
 							EndLine:   103,
-							StartPos:  2355,
-							EndPos:    2357,
+							StartPos:  2173,
+							EndPos:    2175,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -6190,8 +5838,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 103,
 								EndLine:   103,
-								StartPos:  2358,
-								EndPos:    2372,
+								StartPos:  2176,
+								EndPos:    2190,
 							},
 						},
 						Cond: &ast.ExprVariable{
@@ -6199,8 +5847,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 103,
 									EndLine:   103,
-									StartPos:  2366,
-									EndPos:    2368,
+									StartPos:  2184,
+									EndPos:    2186,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -6208,8 +5856,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 103,
 										EndLine:   103,
-										StartPos:  2366,
-										EndPos:    2368,
+										StartPos:  2184,
+										EndPos:    2186,
 									},
 								},
 								Value: []byte("$b"),
@@ -6220,8 +5868,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 103,
 									EndLine:   103,
-									StartPos:  2370,
-									EndPos:    2372,
+									StartPos:  2188,
+									EndPos:    2190,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -6232,8 +5880,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 103,
 								EndLine:   103,
-								StartPos:  2373,
-								EndPos:    2387,
+								StartPos:  2191,
+								EndPos:    2205,
 							},
 						},
 						Cond: &ast.ExprVariable{
@@ -6241,8 +5889,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 103,
 									EndLine:   103,
-									StartPos:  2381,
-									EndPos:    2383,
+									StartPos:  2199,
+									EndPos:    2201,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -6250,8 +5898,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 103,
 										EndLine:   103,
-										StartPos:  2381,
-										EndPos:    2383,
+										StartPos:  2199,
+										EndPos:    2201,
 									},
 								},
 								Value: []byte("$c"),
@@ -6262,8 +5910,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 103,
 									EndLine:   103,
-									StartPos:  2385,
-									EndPos:    2387,
+									StartPos:  2203,
+									EndPos:    2205,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -6275,8 +5923,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 103,
 							EndLine:   103,
-							StartPos:  2388,
-							EndPos:    2395,
+							StartPos:  2206,
+							EndPos:    2213,
 						},
 					},
 					Stmt: &ast.StmtStmtList{
@@ -6284,8 +5932,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 103,
 								EndLine:   103,
-								StartPos:  2393,
-								EndPos:    2395,
+								StartPos:  2211,
+								EndPos:    2213,
 							},
 						},
 						Stmts: []ast.Vertex{},
@@ -6297,8 +5945,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 104,
 						EndLine:   104,
-						StartPos:  2398,
-						EndPos:    2447,
+						StartPos:  2214,
+						EndPos:    2263,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -6306,8 +5954,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 104,
 							EndLine:   104,
-							StartPos:  2402,
-							EndPos:    2404,
+							StartPos:  2218,
+							EndPos:    2220,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6315,8 +5963,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 104,
 								EndLine:   104,
-								StartPos:  2402,
-								EndPos:    2404,
+								StartPos:  2218,
+								EndPos:    2220,
 							},
 						},
 						Value: []byte("$a"),
@@ -6327,8 +5975,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 104,
 							EndLine:   104,
-							StartPos:  2406,
-							EndPos:    2408,
+							StartPos:  2222,
+							EndPos:    2224,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -6339,8 +5987,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 104,
 								EndLine:   104,
-								StartPos:  2409,
-								EndPos:    2423,
+								StartPos:  2225,
+								EndPos:    2239,
 							},
 						},
 						Cond: &ast.ExprVariable{
@@ -6348,8 +5996,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 104,
 									EndLine:   104,
-									StartPos:  2417,
-									EndPos:    2419,
+									StartPos:  2233,
+									EndPos:    2235,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -6357,8 +6005,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 104,
 										EndLine:   104,
-										StartPos:  2417,
-										EndPos:    2419,
+										StartPos:  2233,
+										EndPos:    2235,
 									},
 								},
 								Value: []byte("$b"),
@@ -6369,8 +6017,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 104,
 									EndLine:   104,
-									StartPos:  2421,
-									EndPos:    2423,
+									StartPos:  2237,
+									EndPos:    2239,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -6382,8 +6030,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 104,
 							EndLine:   104,
-							StartPos:  2424,
-							EndPos:    2447,
+							StartPos:  2240,
+							EndPos:    2263,
 						},
 					},
 					Stmt: &ast.StmtIf{
@@ -6391,8 +6039,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 104,
 								EndLine:   104,
-								StartPos:  2429,
-								EndPos:    2447,
+								StartPos:  2245,
+								EndPos:    2263,
 							},
 						},
 						Cond: &ast.ExprVariable{
@@ -6400,8 +6048,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 104,
 									EndLine:   104,
-									StartPos:  2433,
-									EndPos:    2435,
+									StartPos:  2249,
+									EndPos:    2251,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -6409,8 +6057,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 104,
 										EndLine:   104,
-										StartPos:  2433,
-										EndPos:    2435,
+										StartPos:  2249,
+										EndPos:    2251,
 									},
 								},
 								Value: []byte("$c"),
@@ -6421,8 +6069,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 104,
 									EndLine:   104,
-									StartPos:  2437,
-									EndPos:    2439,
+									StartPos:  2253,
+									EndPos:    2255,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -6432,8 +6080,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 104,
 									EndLine:   104,
-									StartPos:  2440,
-									EndPos:    2447,
+									StartPos:  2256,
+									EndPos:    2263,
 								},
 							},
 							Stmt: &ast.StmtStmtList{
@@ -6441,8 +6089,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 104,
 										EndLine:   104,
-										StartPos:  2445,
-										EndPos:    2447,
+										StartPos:  2261,
+										EndPos:    2263,
 									},
 								},
 								Stmts: []ast.Vertex{},
@@ -6456,8 +6104,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 105,
 						EndLine:   105,
-						StartPos:  2450,
-						EndPos:    2452,
+						StartPos:  2264,
+						EndPos:    2266,
 					},
 				},
 			},
@@ -6466,8 +6114,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 105,
 						EndLine:   105,
-						StartPos:  2452,
-						EndPos:    2465,
+						StartPos:  2266,
+						EndPos:    2279,
 					},
 				},
 				Value: []byte(" <div></div> "),
@@ -6477,8 +6125,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 106,
 						EndLine:   106,
-						StartPos:  2470,
-						EndPos:    2486,
+						StartPos:  2282,
+						EndPos:    2298,
 					},
 				},
 				InterfaceName: &ast.Identifier{
@@ -6486,8 +6134,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 106,
 							EndLine:   106,
-							StartPos:  2480,
-							EndPos:    2483,
+							StartPos:  2292,
+							EndPos:    2295,
 						},
 					},
 					Value: []byte("Foo"),
@@ -6499,8 +6147,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 107,
 						EndLine:   107,
-						StartPos:  2489,
-						EndPos:    2517,
+						StartPos:  2299,
+						EndPos:    2327,
 					},
 				},
 				InterfaceName: &ast.Identifier{
@@ -6508,8 +6156,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 107,
 							EndLine:   107,
-							StartPos:  2499,
-							EndPos:    2502,
+							StartPos:  2309,
+							EndPos:    2312,
 						},
 					},
 					Value: []byte("Foo"),
@@ -6519,8 +6167,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 107,
 							EndLine:   107,
-							StartPos:  2503,
-							EndPos:    2514,
+							StartPos:  2313,
+							EndPos:    2324,
 						},
 					},
 					InterfaceNames: []ast.Vertex{
@@ -6529,8 +6177,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 107,
 									EndLine:   107,
-									StartPos:  2511,
-									EndPos:    2514,
+									StartPos:  2321,
+									EndPos:    2324,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -6539,8 +6187,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 107,
 											EndLine:   107,
-											StartPos:  2511,
-											EndPos:    2514,
+											StartPos:  2321,
+											EndPos:    2324,
 										},
 									},
 									Value: []byte("Bar"),
@@ -6556,8 +6204,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 108,
 						EndLine:   108,
-						StartPos:  2520,
-						EndPos:    2553,
+						StartPos:  2328,
+						EndPos:    2361,
 					},
 				},
 				InterfaceName: &ast.Identifier{
@@ -6565,8 +6213,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 108,
 							EndLine:   108,
-							StartPos:  2530,
-							EndPos:    2533,
+							StartPos:  2338,
+							EndPos:    2341,
 						},
 					},
 					Value: []byte("Foo"),
@@ -6576,8 +6224,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 108,
 							EndLine:   108,
-							StartPos:  2534,
-							EndPos:    2550,
+							StartPos:  2342,
+							EndPos:    2358,
 						},
 					},
 					InterfaceNames: []ast.Vertex{
@@ -6586,8 +6234,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 108,
 									EndLine:   108,
-									StartPos:  2542,
-									EndPos:    2545,
+									StartPos:  2350,
+									EndPos:    2353,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -6596,8 +6244,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 108,
 											EndLine:   108,
-											StartPos:  2542,
-											EndPos:    2545,
+											StartPos:  2350,
+											EndPos:    2353,
 										},
 									},
 									Value: []byte("Bar"),
@@ -6609,8 +6257,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 108,
 									EndLine:   108,
-									StartPos:  2547,
-									EndPos:    2550,
+									StartPos:  2355,
+									EndPos:    2358,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -6619,8 +6267,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 108,
 											EndLine:   108,
-											StartPos:  2547,
-											EndPos:    2550,
+											StartPos:  2355,
+											EndPos:    2358,
 										},
 									},
 									Value: []byte("Baz"),
@@ -6636,8 +6284,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 109,
 						EndLine:   109,
-						StartPos:  2556,
-						EndPos:    2570,
+						StartPos:  2362,
+						EndPos:    2376,
 					},
 				},
 				NamespaceName: &ast.NameName{
@@ -6645,8 +6293,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 109,
 							EndLine:   109,
-							StartPos:  2566,
-							EndPos:    2569,
+							StartPos:  2372,
+							EndPos:    2375,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -6655,8 +6303,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 109,
 									EndLine:   109,
-									StartPos:  2566,
-									EndPos:    2569,
+									StartPos:  2372,
+									EndPos:    2375,
 								},
 							},
 							Value: []byte("Foo"),
@@ -6669,8 +6317,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 110,
 						EndLine:   110,
-						StartPos:  2573,
-						EndPos:    2593,
+						StartPos:  2377,
+						EndPos:    2397,
 					},
 				},
 				NamespaceName: &ast.NameName{
@@ -6678,8 +6326,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 110,
 							EndLine:   110,
-							StartPos:  2583,
-							EndPos:    2590,
+							StartPos:  2387,
+							EndPos:    2394,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -6688,8 +6336,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 110,
 									EndLine:   110,
-									StartPos:  2583,
-									EndPos:    2586,
+									StartPos:  2387,
+									EndPos:    2390,
 								},
 							},
 							Value: []byte("Foo"),
@@ -6699,8 +6347,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 110,
 									EndLine:   110,
-									StartPos:  2587,
-									EndPos:    2590,
+									StartPos:  2391,
+									EndPos:    2394,
 								},
 							},
 							Value: []byte("Bar"),
@@ -6714,8 +6362,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 111,
 						EndLine:   111,
-						StartPos:  2596,
-						EndPos:    2608,
+						StartPos:  2398,
+						EndPos:    2410,
 					},
 				},
 				Stmts: []ast.Vertex{},
@@ -6725,8 +6373,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 112,
 						EndLine:   112,
-						StartPos:  2611,
-						EndPos:    2630,
+						StartPos:  2411,
+						EndPos:    2430,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -6734,8 +6382,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 112,
 							EndLine:   112,
-							StartPos:  2617,
-							EndPos:    2620,
+							StartPos:  2417,
+							EndPos:    2420,
 						},
 					},
 					Value: []byte("foo"),
@@ -6746,8 +6394,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 112,
 								EndLine:   112,
-								StartPos:  2622,
-								EndPos:    2629,
+								StartPos:  2422,
+								EndPos:    2429,
 							},
 						},
 						Modifiers: []ast.Vertex{
@@ -6756,8 +6404,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 112,
 										EndLine:   112,
-										StartPos:  2622,
-										EndPos:    2625,
+										StartPos:  2422,
+										EndPos:    2425,
 									},
 								},
 								Value: []byte("var"),
@@ -6769,8 +6417,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 112,
 										EndLine:   112,
-										StartPos:  2626,
-										EndPos:    2628,
+										StartPos:  2426,
+										EndPos:    2428,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -6778,8 +6426,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 112,
 											EndLine:   112,
-											StartPos:  2626,
-											EndPos:    2628,
+											StartPos:  2426,
+											EndPos:    2428,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -6787,8 +6435,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 112,
 												EndLine:   112,
-												StartPos:  2626,
-												EndPos:    2628,
+												StartPos:  2426,
+												EndPos:    2428,
 											},
 										},
 										Value: []byte("$a"),
@@ -6804,8 +6452,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 113,
 						EndLine:   113,
-						StartPos:  2633,
-						EndPos:    2670,
+						StartPos:  2431,
+						EndPos:    2468,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -6813,8 +6461,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 113,
 							EndLine:   113,
-							StartPos:  2639,
-							EndPos:    2642,
+							StartPos:  2437,
+							EndPos:    2440,
 						},
 					},
 					Value: []byte("foo"),
@@ -6825,8 +6473,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 113,
 								EndLine:   113,
-								StartPos:  2644,
-								EndPos:    2669,
+								StartPos:  2442,
+								EndPos:    2467,
 							},
 						},
 						Modifiers: []ast.Vertex{
@@ -6835,8 +6483,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 113,
 										EndLine:   113,
-										StartPos:  2644,
-										EndPos:    2650,
+										StartPos:  2442,
+										EndPos:    2448,
 									},
 								},
 								Value: []byte("public"),
@@ -6846,8 +6494,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 113,
 										EndLine:   113,
-										StartPos:  2651,
-										EndPos:    2657,
+										StartPos:  2449,
+										EndPos:    2455,
 									},
 								},
 								Value: []byte("static"),
@@ -6859,8 +6507,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 113,
 										EndLine:   113,
-										StartPos:  2658,
-										EndPos:    2660,
+										StartPos:  2456,
+										EndPos:    2458,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -6868,8 +6516,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 113,
 											EndLine:   113,
-											StartPos:  2658,
-											EndPos:    2660,
+											StartPos:  2456,
+											EndPos:    2458,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -6877,8 +6525,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 113,
 												EndLine:   113,
-												StartPos:  2658,
-												EndPos:    2660,
+												StartPos:  2456,
+												EndPos:    2458,
 											},
 										},
 										Value: []byte("$a"),
@@ -6890,8 +6538,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 113,
 										EndLine:   113,
-										StartPos:  2662,
-										EndPos:    2668,
+										StartPos:  2460,
+										EndPos:    2466,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -6899,8 +6547,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 113,
 											EndLine:   113,
-											StartPos:  2662,
-											EndPos:    2664,
+											StartPos:  2460,
+											EndPos:    2462,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -6908,8 +6556,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 113,
 												EndLine:   113,
-												StartPos:  2662,
-												EndPos:    2664,
+												StartPos:  2460,
+												EndPos:    2462,
 											},
 										},
 										Value: []byte("$b"),
@@ -6920,8 +6568,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 113,
 											EndLine:   113,
-											StartPos:  2667,
-											EndPos:    2668,
+											StartPos:  2465,
+											EndPos:    2466,
 										},
 									},
 									Value: []byte("1"),
@@ -6936,8 +6584,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 114,
 						EndLine:   114,
-						StartPos:  2673,
-						EndPos:    2710,
+						StartPos:  2469,
+						EndPos:    2506,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -6945,8 +6593,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 114,
 							EndLine:   114,
-							StartPos:  2679,
-							EndPos:    2682,
+							StartPos:  2475,
+							EndPos:    2478,
 						},
 					},
 					Value: []byte("foo"),
@@ -6957,8 +6605,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 114,
 								EndLine:   114,
-								StartPos:  2684,
-								EndPos:    2709,
+								StartPos:  2480,
+								EndPos:    2505,
 							},
 						},
 						Modifiers: []ast.Vertex{
@@ -6967,8 +6615,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 114,
 										EndLine:   114,
-										StartPos:  2684,
-										EndPos:    2690,
+										StartPos:  2480,
+										EndPos:    2486,
 									},
 								},
 								Value: []byte("public"),
@@ -6978,8 +6626,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 114,
 										EndLine:   114,
-										StartPos:  2691,
-										EndPos:    2697,
+										StartPos:  2487,
+										EndPos:    2493,
 									},
 								},
 								Value: []byte("static"),
@@ -6991,8 +6639,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 114,
 										EndLine:   114,
-										StartPos:  2698,
-										EndPos:    2704,
+										StartPos:  2494,
+										EndPos:    2500,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -7000,8 +6648,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 114,
 											EndLine:   114,
-											StartPos:  2698,
-											EndPos:    2700,
+											StartPos:  2494,
+											EndPos:    2496,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -7009,8 +6657,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 114,
 												EndLine:   114,
-												StartPos:  2698,
-												EndPos:    2700,
+												StartPos:  2494,
+												EndPos:    2496,
 											},
 										},
 										Value: []byte("$a"),
@@ -7021,8 +6669,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 114,
 											EndLine:   114,
-											StartPos:  2703,
-											EndPos:    2704,
+											StartPos:  2499,
+											EndPos:    2500,
 										},
 									},
 									Value: []byte("1"),
@@ -7033,8 +6681,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 114,
 										EndLine:   114,
-										StartPos:  2706,
-										EndPos:    2708,
+										StartPos:  2502,
+										EndPos:    2504,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -7042,8 +6690,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 114,
 											EndLine:   114,
-											StartPos:  2706,
-											EndPos:    2708,
+											StartPos:  2502,
+											EndPos:    2504,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -7051,8 +6699,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 114,
 												EndLine:   114,
-												StartPos:  2706,
-												EndPos:    2708,
+												StartPos:  2502,
+												EndPos:    2504,
 											},
 										},
 										Value: []byte("$b"),
@@ -7068,8 +6716,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 115,
 						EndLine:   115,
-						StartPos:  2713,
-						EndPos:    2731,
+						StartPos:  2507,
+						EndPos:    2525,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -7078,8 +6726,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 115,
 								EndLine:   115,
-								StartPos:  2720,
-								EndPos:    2722,
+								StartPos:  2514,
+								EndPos:    2516,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -7087,8 +6735,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 115,
 									EndLine:   115,
-									StartPos:  2720,
-									EndPos:    2722,
+									StartPos:  2514,
+									EndPos:    2516,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -7096,8 +6744,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 115,
 										EndLine:   115,
-										StartPos:  2720,
-										EndPos:    2722,
+										StartPos:  2514,
+										EndPos:    2516,
 									},
 								},
 								Value: []byte("$a"),
@@ -7109,8 +6757,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 115,
 								EndLine:   115,
-								StartPos:  2724,
-								EndPos:    2730,
+								StartPos:  2518,
+								EndPos:    2524,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -7118,8 +6766,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 115,
 									EndLine:   115,
-									StartPos:  2724,
-									EndPos:    2726,
+									StartPos:  2518,
+									EndPos:    2520,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -7127,8 +6775,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 115,
 										EndLine:   115,
-										StartPos:  2724,
-										EndPos:    2726,
+										StartPos:  2518,
+										EndPos:    2520,
 									},
 								},
 								Value: []byte("$b"),
@@ -7139,8 +6787,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 115,
 									EndLine:   115,
-									StartPos:  2729,
-									EndPos:    2730,
+									StartPos:  2523,
+									EndPos:    2524,
 								},
 							},
 							Value: []byte("1"),
@@ -7153,8 +6801,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 116,
 						EndLine:   116,
-						StartPos:  2734,
-						EndPos:    2752,
+						StartPos:  2526,
+						EndPos:    2544,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -7163,8 +6811,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 116,
 								EndLine:   116,
-								StartPos:  2741,
-								EndPos:    2747,
+								StartPos:  2533,
+								EndPos:    2539,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -7172,8 +6820,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 116,
 									EndLine:   116,
-									StartPos:  2741,
-									EndPos:    2743,
+									StartPos:  2533,
+									EndPos:    2535,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -7181,8 +6829,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 116,
 										EndLine:   116,
-										StartPos:  2741,
-										EndPos:    2743,
+										StartPos:  2533,
+										EndPos:    2535,
 									},
 								},
 								Value: []byte("$a"),
@@ -7193,8 +6841,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 116,
 									EndLine:   116,
-									StartPos:  2746,
-									EndPos:    2747,
+									StartPos:  2538,
+									EndPos:    2539,
 								},
 							},
 							Value: []byte("1"),
@@ -7205,8 +6853,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 116,
 								EndLine:   116,
-								StartPos:  2749,
-								EndPos:    2751,
+								StartPos:  2541,
+								EndPos:    2543,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -7214,8 +6862,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 116,
 									EndLine:   116,
-									StartPos:  2749,
-									EndPos:    2751,
+									StartPos:  2541,
+									EndPos:    2543,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -7223,8 +6871,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 116,
 										EndLine:   116,
-										StartPos:  2749,
-										EndPos:    2751,
+										StartPos:  2541,
+										EndPos:    2543,
 									},
 								},
 								Value: []byte("$b"),
@@ -7238,8 +6886,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 118,
 						EndLine:   122,
-						StartPos:  2756,
-						EndPos:    2815,
+						StartPos:  2546,
+						EndPos:    2606,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -7247,8 +6895,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 118,
 							EndLine:   118,
-							StartPos:  2764,
-							EndPos:    2765,
+							StartPos:  2554,
+							EndPos:    2555,
 						},
 					},
 					Value: []byte("1"),
@@ -7258,7 +6906,7 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 119,
 							EndLine:   -1,
-							StartPos:  2772,
+							StartPos:  2563,
 							EndPos:    -1,
 						},
 					},
@@ -7268,7 +6916,7 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 119,
 									EndLine:   -1,
-									StartPos:  2772,
+									StartPos:  2563,
 									EndPos:    -1,
 								},
 							},
@@ -7277,8 +6925,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 119,
 										EndLine:   119,
-										StartPos:  2777,
-										EndPos:    2778,
+										StartPos:  2568,
+										EndPos:    2569,
 									},
 								},
 								Value: []byte("1"),
@@ -7290,7 +6938,7 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 120,
 									EndLine:   -1,
-									StartPos:  2783,
+									StartPos:  2575,
 									EndPos:    -1,
 								},
 							},
@@ -7301,7 +6949,7 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 121,
 									EndLine:   -1,
-									StartPos:  2795,
+									StartPos:  2588,
 									EndPos:    -1,
 								},
 							},
@@ -7310,8 +6958,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 121,
 										EndLine:   121,
-										StartPos:  2800,
-										EndPos:    2801,
+										StartPos:  2593,
+										EndPos:    2594,
 									},
 								},
 								Value: []byte("2"),
@@ -7326,8 +6974,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 124,
 						EndLine:   127,
-						StartPos:  2819,
-						EndPos:    2867,
+						StartPos:  2608,
+						EndPos:    2656,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -7335,8 +6983,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 124,
 							EndLine:   124,
-							StartPos:  2827,
-							EndPos:    2828,
+							StartPos:  2616,
+							EndPos:    2617,
 						},
 					},
 					Value: []byte("1"),
@@ -7346,7 +6994,7 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 125,
 							EndLine:   -1,
-							StartPos:  2836,
+							StartPos:  2626,
 							EndPos:    -1,
 						},
 					},
@@ -7356,7 +7004,7 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 125,
 									EndLine:   -1,
-									StartPos:  2836,
+									StartPos:  2626,
 									EndPos:    -1,
 								},
 							},
@@ -7365,8 +7013,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 125,
 										EndLine:   125,
-										StartPos:  2841,
-										EndPos:    2842,
+										StartPos:  2631,
+										EndPos:    2632,
 									},
 								},
 								Value: []byte("1"),
@@ -7378,7 +7026,7 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 126,
 									EndLine:   -1,
-									StartPos:  2847,
+									StartPos:  2638,
 									EndPos:    -1,
 								},
 							},
@@ -7387,8 +7035,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 126,
 										EndLine:   126,
-										StartPos:  2852,
-										EndPos:    2853,
+										StartPos:  2643,
+										EndPos:    2644,
 									},
 								},
 								Value: []byte("2"),
@@ -7403,8 +7051,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 129,
 						EndLine:   132,
-						StartPos:  2873,
-						EndPos:    2925,
+						StartPos:  2658,
+						EndPos:    2710,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -7412,8 +7060,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 129,
 							EndLine:   129,
-							StartPos:  2881,
-							EndPos:    2882,
+							StartPos:  2666,
+							EndPos:    2667,
 						},
 					},
 					Value: []byte("1"),
@@ -7423,8 +7071,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 129,
 							EndLine:   132,
-							StartPos:  2884,
-							EndPos:    2925,
+							StartPos:  2669,
+							EndPos:    2710,
 						},
 					},
 					Cases: []ast.Vertex{
@@ -7433,8 +7081,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 130,
 									EndLine:   130,
-									StartPos:  2889,
-									EndPos:    2903,
+									StartPos:  2675,
+									EndPos:    2689,
 								},
 							},
 							Cond: &ast.ScalarLnumber{
@@ -7442,8 +7090,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 130,
 										EndLine:   130,
-										StartPos:  2894,
-										EndPos:    2895,
+										StartPos:  2680,
+										EndPos:    2681,
 									},
 								},
 								Value: []byte("1"),
@@ -7454,8 +7102,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 130,
 											EndLine:   130,
-											StartPos:  2897,
-											EndPos:    2903,
+											StartPos:  2683,
+											EndPos:    2689,
 										},
 									},
 								},
@@ -7466,8 +7114,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 131,
 									EndLine:   131,
-									StartPos:  2907,
-									EndPos:    2921,
+									StartPos:  2694,
+									EndPos:    2708,
 								},
 							},
 							Cond: &ast.ScalarLnumber{
@@ -7475,8 +7123,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 131,
 										EndLine:   131,
-										StartPos:  2912,
-										EndPos:    2913,
+										StartPos:  2699,
+										EndPos:    2700,
 									},
 								},
 								Value: []byte("2"),
@@ -7487,8 +7135,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 131,
 											EndLine:   131,
-											StartPos:  2915,
-											EndPos:    2921,
+											StartPos:  2702,
+											EndPos:    2708,
 										},
 									},
 								},
@@ -7502,8 +7150,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 134,
 						EndLine:   137,
-						StartPos:  2931,
-						EndPos:    2984,
+						StartPos:  2712,
+						EndPos:    2765,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -7511,8 +7159,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 134,
 							EndLine:   134,
-							StartPos:  2939,
-							EndPos:    2940,
+							StartPos:  2720,
+							EndPos:    2721,
 						},
 					},
 					Value: []byte("1"),
@@ -7522,8 +7170,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 134,
 							EndLine:   137,
-							StartPos:  2942,
-							EndPos:    2984,
+							StartPos:  2723,
+							EndPos:    2765,
 						},
 					},
 					Cases: []ast.Vertex{
@@ -7532,8 +7180,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 135,
 									EndLine:   135,
-									StartPos:  2948,
-									EndPos:    2962,
+									StartPos:  2730,
+									EndPos:    2744,
 								},
 							},
 							Cond: &ast.ScalarLnumber{
@@ -7541,8 +7189,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 135,
 										EndLine:   135,
-										StartPos:  2953,
-										EndPos:    2954,
+										StartPos:  2735,
+										EndPos:    2736,
 									},
 								},
 								Value: []byte("1"),
@@ -7553,8 +7201,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 135,
 											EndLine:   135,
-											StartPos:  2956,
-											EndPos:    2962,
+											StartPos:  2738,
+											EndPos:    2744,
 										},
 									},
 								},
@@ -7565,8 +7213,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 136,
 									EndLine:   136,
-									StartPos:  2966,
-									EndPos:    2980,
+									StartPos:  2749,
+									EndPos:    2763,
 								},
 							},
 							Cond: &ast.ScalarLnumber{
@@ -7574,8 +7222,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 136,
 										EndLine:   136,
-										StartPos:  2971,
-										EndPos:    2972,
+										StartPos:  2754,
+										EndPos:    2755,
 									},
 								},
 								Value: []byte("2"),
@@ -7586,8 +7234,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 136,
 											EndLine:   136,
-											StartPos:  2974,
-											EndPos:    2980,
+											StartPos:  2757,
+											EndPos:    2763,
 										},
 									},
 								},
@@ -7601,8 +7249,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 138,
 						EndLine:   138,
-						StartPos:  2987,
-						EndPos:    2996,
+						StartPos:  2766,
+						EndPos:    2775,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -7610,8 +7258,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 138,
 							EndLine:   138,
-							StartPos:  2993,
-							EndPos:    2995,
+							StartPos:  2772,
+							EndPos:    2774,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -7619,8 +7267,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 138,
 								EndLine:   138,
-								StartPos:  2993,
-								EndPos:    2995,
+								StartPos:  2772,
+								EndPos:    2774,
 							},
 						},
 						Value: []byte("$e"),
@@ -7632,8 +7280,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 139,
 						EndLine:   139,
-						StartPos:  2999,
-						EndPos:    3011,
+						StartPos:  2776,
+						EndPos:    2788,
 					},
 				},
 				TraitName: &ast.Identifier{
@@ -7641,8 +7289,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 139,
 							EndLine:   139,
-							StartPos:  3005,
-							EndPos:    3008,
+							StartPos:  2782,
+							EndPos:    2785,
 						},
 					},
 					Value: []byte("Foo"),
@@ -7654,8 +7302,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 140,
 						EndLine:   140,
-						StartPos:  3014,
-						EndPos:    3036,
+						StartPos:  2789,
+						EndPos:    2811,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -7663,8 +7311,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 140,
 							EndLine:   140,
-							StartPos:  3020,
-							EndPos:    3023,
+							StartPos:  2795,
+							EndPos:    2798,
 						},
 					},
 					Value: []byte("Foo"),
@@ -7675,8 +7323,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 140,
 								EndLine:   140,
-								StartPos:  3026,
-								EndPos:    3034,
+								StartPos:  2801,
+								EndPos:    2809,
 							},
 						},
 						Traits: []ast.Vertex{
@@ -7685,8 +7333,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 140,
 										EndLine:   140,
-										StartPos:  3030,
-										EndPos:    3033,
+										StartPos:  2805,
+										EndPos:    2808,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -7695,8 +7343,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 140,
 												EndLine:   140,
-												StartPos:  3030,
-												EndPos:    3033,
+												StartPos:  2805,
+												EndPos:    2808,
 											},
 										},
 										Value: []byte("Bar"),
@@ -7709,8 +7357,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 140,
 									EndLine:   140,
-									StartPos:  3033,
-									EndPos:    3034,
+									StartPos:  2808,
+									EndPos:    2809,
 								},
 							},
 						},
@@ -7722,8 +7370,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 141,
 						EndLine:   141,
-						StartPos:  3039,
-						EndPos:    3068,
+						StartPos:  2812,
+						EndPos:    2841,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -7731,8 +7379,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 141,
 							EndLine:   141,
-							StartPos:  3045,
-							EndPos:    3048,
+							StartPos:  2818,
+							EndPos:    2821,
 						},
 					},
 					Value: []byte("Foo"),
@@ -7743,8 +7391,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 141,
 								EndLine:   141,
-								StartPos:  3051,
-								EndPos:    3066,
+								StartPos:  2824,
+								EndPos:    2839,
 							},
 						},
 						Traits: []ast.Vertex{
@@ -7753,8 +7401,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 141,
 										EndLine:   141,
-										StartPos:  3055,
-										EndPos:    3058,
+										StartPos:  2828,
+										EndPos:    2831,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -7763,8 +7411,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 141,
 												EndLine:   141,
-												StartPos:  3055,
-												EndPos:    3058,
+												StartPos:  2828,
+												EndPos:    2831,
 											},
 										},
 										Value: []byte("Bar"),
@@ -7776,8 +7424,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 141,
 										EndLine:   141,
-										StartPos:  3060,
-										EndPos:    3063,
+										StartPos:  2833,
+										EndPos:    2836,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -7786,8 +7434,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 141,
 												EndLine:   141,
-												StartPos:  3060,
-												EndPos:    3063,
+												StartPos:  2833,
+												EndPos:    2836,
 											},
 										},
 										Value: []byte("Baz"),
@@ -7800,8 +7448,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 141,
 									EndLine:   141,
-									StartPos:  3064,
-									EndPos:    3066,
+									StartPos:  2837,
+									EndPos:    2839,
 								},
 							},
 						},
@@ -7813,8 +7461,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 142,
 						EndLine:   142,
-						StartPos:  3071,
-						EndPos:    3116,
+						StartPos:  2842,
+						EndPos:    2887,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -7822,8 +7470,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 142,
 							EndLine:   142,
-							StartPos:  3077,
-							EndPos:    3080,
+							StartPos:  2848,
+							EndPos:    2851,
 						},
 					},
 					Value: []byte("Foo"),
@@ -7834,8 +7482,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 142,
 								EndLine:   142,
-								StartPos:  3083,
-								EndPos:    3114,
+								StartPos:  2854,
+								EndPos:    2885,
 							},
 						},
 						Traits: []ast.Vertex{
@@ -7844,8 +7492,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 142,
 										EndLine:   142,
-										StartPos:  3087,
-										EndPos:    3090,
+										StartPos:  2858,
+										EndPos:    2861,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -7854,8 +7502,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 142,
 												EndLine:   142,
-												StartPos:  3087,
-												EndPos:    3090,
+												StartPos:  2858,
+												EndPos:    2861,
 											},
 										},
 										Value: []byte("Bar"),
@@ -7867,8 +7515,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 142,
 										EndLine:   142,
-										StartPos:  3092,
-										EndPos:    3095,
+										StartPos:  2863,
+										EndPos:    2866,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -7877,8 +7525,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 142,
 												EndLine:   142,
-												StartPos:  3092,
-												EndPos:    3095,
+												StartPos:  2863,
+												EndPos:    2866,
 											},
 										},
 										Value: []byte("Baz"),
@@ -7891,8 +7539,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 142,
 									EndLine:   142,
-									StartPos:  3096,
-									EndPos:    3114,
+									StartPos:  2867,
+									EndPos:    2885,
 								},
 							},
 							Adaptations: []ast.Vertex{
@@ -7901,8 +7549,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 142,
 											EndLine:   142,
-											StartPos:  3098,
-											EndPos:    3111,
+											StartPos:  2869,
+											EndPos:    2882,
 										},
 									},
 									Ref: &ast.StmtTraitMethodRef{
@@ -7910,8 +7558,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 142,
 												EndLine:   142,
-												StartPos:  3098,
-												EndPos:    3101,
+												StartPos:  2869,
+												EndPos:    2872,
 											},
 										},
 										Method: &ast.Identifier{
@@ -7919,8 +7567,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 142,
 													EndLine:   142,
-													StartPos:  3098,
-													EndPos:    3101,
+													StartPos:  2869,
+													EndPos:    2872,
 												},
 											},
 											Value: []byte("one"),
@@ -7931,8 +7579,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 142,
 												EndLine:   142,
-												StartPos:  3105,
-												EndPos:    3111,
+												StartPos:  2876,
+												EndPos:    2882,
 											},
 										},
 										Value: []byte("public"),
@@ -7948,8 +7596,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 143,
 						EndLine:   143,
-						StartPos:  3119,
-						EndPos:    3168,
+						StartPos:  2888,
+						EndPos:    2937,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -7957,8 +7605,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 143,
 							EndLine:   143,
-							StartPos:  3125,
-							EndPos:    3128,
+							StartPos:  2894,
+							EndPos:    2897,
 						},
 					},
 					Value: []byte("Foo"),
@@ -7969,8 +7617,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 143,
 								EndLine:   143,
-								StartPos:  3131,
-								EndPos:    3166,
+								StartPos:  2900,
+								EndPos:    2935,
 							},
 						},
 						Traits: []ast.Vertex{
@@ -7979,8 +7627,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 143,
 										EndLine:   143,
-										StartPos:  3135,
-										EndPos:    3138,
+										StartPos:  2904,
+										EndPos:    2907,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -7989,8 +7637,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 143,
 												EndLine:   143,
-												StartPos:  3135,
-												EndPos:    3138,
+												StartPos:  2904,
+												EndPos:    2907,
 											},
 										},
 										Value: []byte("Bar"),
@@ -8002,8 +7650,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 143,
 										EndLine:   143,
-										StartPos:  3140,
-										EndPos:    3143,
+										StartPos:  2909,
+										EndPos:    2912,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8012,8 +7660,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 143,
 												EndLine:   143,
-												StartPos:  3140,
-												EndPos:    3143,
+												StartPos:  2909,
+												EndPos:    2912,
 											},
 										},
 										Value: []byte("Baz"),
@@ -8026,8 +7674,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 143,
 									EndLine:   143,
-									StartPos:  3144,
-									EndPos:    3166,
+									StartPos:  2913,
+									EndPos:    2935,
 								},
 							},
 							Adaptations: []ast.Vertex{
@@ -8036,8 +7684,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 143,
 											EndLine:   143,
-											StartPos:  3146,
-											EndPos:    3163,
+											StartPos:  2915,
+											EndPos:    2932,
 										},
 									},
 									Ref: &ast.StmtTraitMethodRef{
@@ -8045,8 +7693,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 143,
 												EndLine:   143,
-												StartPos:  3146,
-												EndPos:    3149,
+												StartPos:  2915,
+												EndPos:    2918,
 											},
 										},
 										Method: &ast.Identifier{
@@ -8054,8 +7702,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 143,
 													EndLine:   143,
-													StartPos:  3146,
-													EndPos:    3149,
+													StartPos:  2915,
+													EndPos:    2918,
 												},
 											},
 											Value: []byte("one"),
@@ -8066,8 +7714,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 143,
 												EndLine:   143,
-												StartPos:  3153,
-												EndPos:    3159,
+												StartPos:  2922,
+												EndPos:    2928,
 											},
 										},
 										Value: []byte("public"),
@@ -8077,8 +7725,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 143,
 												EndLine:   143,
-												StartPos:  3160,
-												EndPos:    3163,
+												StartPos:  2929,
+												EndPos:    2932,
 											},
 										},
 										Value: []byte("two"),
@@ -8094,8 +7742,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 144,
 						EndLine:   144,
-						StartPos:  3171,
-						EndPos:    3248,
+						StartPos:  2938,
+						EndPos:    3015,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -8103,8 +7751,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 144,
 							EndLine:   144,
-							StartPos:  3177,
-							EndPos:    3180,
+							StartPos:  2944,
+							EndPos:    2947,
 						},
 					},
 					Value: []byte("Foo"),
@@ -8115,8 +7763,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 144,
 								EndLine:   144,
-								StartPos:  3183,
-								EndPos:    3246,
+								StartPos:  2950,
+								EndPos:    3013,
 							},
 						},
 						Traits: []ast.Vertex{
@@ -8125,8 +7773,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 144,
 										EndLine:   144,
-										StartPos:  3187,
-										EndPos:    3190,
+										StartPos:  2954,
+										EndPos:    2957,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8135,8 +7783,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 144,
 												EndLine:   144,
-												StartPos:  3187,
-												EndPos:    3190,
+												StartPos:  2954,
+												EndPos:    2957,
 											},
 										},
 										Value: []byte("Bar"),
@@ -8148,8 +7796,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 144,
 										EndLine:   144,
-										StartPos:  3192,
-										EndPos:    3195,
+										StartPos:  2959,
+										EndPos:    2962,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8158,8 +7806,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 144,
 												EndLine:   144,
-												StartPos:  3192,
-												EndPos:    3195,
+												StartPos:  2959,
+												EndPos:    2962,
 											},
 										},
 										Value: []byte("Baz"),
@@ -8172,8 +7820,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 144,
 									EndLine:   144,
-									StartPos:  3196,
-									EndPos:    3246,
+									StartPos:  2963,
+									EndPos:    3013,
 								},
 							},
 							Adaptations: []ast.Vertex{
@@ -8182,8 +7830,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 144,
 											EndLine:   144,
-											StartPos:  3198,
-											EndPos:    3226,
+											StartPos:  2965,
+											EndPos:    2993,
 										},
 									},
 									Ref: &ast.StmtTraitMethodRef{
@@ -8191,8 +7839,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 144,
 												EndLine:   144,
-												StartPos:  3198,
-												EndPos:    3206,
+												StartPos:  2965,
+												EndPos:    2973,
 											},
 										},
 										Trait: &ast.NameName{
@@ -8200,8 +7848,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 144,
 													EndLine:   144,
-													StartPos:  3198,
-													EndPos:    3201,
+													StartPos:  2965,
+													EndPos:    2968,
 												},
 											},
 											Parts: []ast.Vertex{
@@ -8210,8 +7858,8 @@ func TestPhp5(t *testing.T) {
 														Position: &position.Position{
 															StartLine: 144,
 															EndLine:   144,
-															StartPos:  3198,
-															EndPos:    3201,
+															StartPos:  2965,
+															EndPos:    2968,
 														},
 													},
 													Value: []byte("Bar"),
@@ -8223,8 +7871,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 144,
 													EndLine:   144,
-													StartPos:  3203,
-													EndPos:    3206,
+													StartPos:  2970,
+													EndPos:    2973,
 												},
 											},
 											Value: []byte("one"),
@@ -8236,8 +7884,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 144,
 													EndLine:   144,
-													StartPos:  3217,
-													EndPos:    3220,
+													StartPos:  2984,
+													EndPos:    2987,
 												},
 											},
 											Parts: []ast.Vertex{
@@ -8246,8 +7894,8 @@ func TestPhp5(t *testing.T) {
 														Position: &position.Position{
 															StartLine: 144,
 															EndLine:   144,
-															StartPos:  3217,
-															EndPos:    3220,
+															StartPos:  2984,
+															EndPos:    2987,
 														},
 													},
 													Value: []byte("Baz"),
@@ -8259,8 +7907,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 144,
 													EndLine:   144,
-													StartPos:  3222,
-													EndPos:    3226,
+													StartPos:  2989,
+													EndPos:    2993,
 												},
 											},
 											Parts: []ast.Vertex{
@@ -8269,8 +7917,8 @@ func TestPhp5(t *testing.T) {
 														Position: &position.Position{
 															StartLine: 144,
 															EndLine:   144,
-															StartPos:  3222,
-															EndPos:    3226,
+															StartPos:  2989,
+															EndPos:    2993,
 														},
 													},
 													Value: []byte("Quux"),
@@ -8284,8 +7932,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 144,
 											EndLine:   144,
-											StartPos:  3228,
-											EndPos:    3243,
+											StartPos:  2995,
+											EndPos:    3010,
 										},
 									},
 									Ref: &ast.StmtTraitMethodRef{
@@ -8293,8 +7941,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 144,
 												EndLine:   144,
-												StartPos:  3228,
-												EndPos:    3236,
+												StartPos:  2995,
+												EndPos:    3003,
 											},
 										},
 										Trait: &ast.NameName{
@@ -8302,8 +7950,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 144,
 													EndLine:   144,
-													StartPos:  3228,
-													EndPos:    3231,
+													StartPos:  2995,
+													EndPos:    2998,
 												},
 											},
 											Parts: []ast.Vertex{
@@ -8312,8 +7960,8 @@ func TestPhp5(t *testing.T) {
 														Position: &position.Position{
 															StartLine: 144,
 															EndLine:   144,
-															StartPos:  3228,
-															EndPos:    3231,
+															StartPos:  2995,
+															EndPos:    2998,
 														},
 													},
 													Value: []byte("Baz"),
@@ -8325,8 +7973,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 144,
 													EndLine:   144,
-													StartPos:  3233,
-													EndPos:    3236,
+													StartPos:  3000,
+													EndPos:    3003,
 												},
 											},
 											Value: []byte("one"),
@@ -8337,8 +7985,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 144,
 												EndLine:   144,
-												StartPos:  3240,
-												EndPos:    3243,
+												StartPos:  3007,
+												EndPos:    3010,
 											},
 										},
 										Value: []byte("two"),
@@ -8354,7 +8002,7 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 146,
 						EndLine:   -1,
-						StartPos:  3252,
+						StartPos:  3017,
 						EndPos:    -1,
 					},
 				},
@@ -8366,8 +8014,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 147,
 						EndLine:   147,
-						StartPos:  3261,
-						EndPos:    3291,
+						StartPos:  3024,
+						EndPos:    3054,
 					},
 				},
 				Stmts: []ast.Vertex{},
@@ -8377,8 +8025,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 147,
 								EndLine:   147,
-								StartPos:  3268,
-								EndPos:    3291,
+								StartPos:  3031,
+								EndPos:    3054,
 							},
 						},
 						Types: []ast.Vertex{
@@ -8387,8 +8035,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 147,
 										EndLine:   147,
-										StartPos:  3275,
-										EndPos:    3284,
+										StartPos:  3038,
+										EndPos:    3047,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8397,8 +8045,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 147,
 												EndLine:   147,
-												StartPos:  3275,
-												EndPos:    3284,
+												StartPos:  3038,
+												EndPos:    3047,
 											},
 										},
 										Value: []byte("Exception"),
@@ -8411,8 +8059,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 147,
 									EndLine:   147,
-									StartPos:  3285,
-									EndPos:    3287,
+									StartPos:  3048,
+									EndPos:    3050,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -8420,8 +8068,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 147,
 										EndLine:   147,
-										StartPos:  3285,
-										EndPos:    3287,
+										StartPos:  3048,
+										EndPos:    3050,
 									},
 								},
 								Value: []byte("$e"),
@@ -8436,8 +8084,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 148,
 						EndLine:   148,
-						StartPos:  3294,
-						EndPos:    3355,
+						StartPos:  3055,
+						EndPos:    3116,
 					},
 				},
 				Stmts: []ast.Vertex{},
@@ -8447,8 +8095,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 148,
 								EndLine:   148,
-								StartPos:  3301,
-								EndPos:    3324,
+								StartPos:  3062,
+								EndPos:    3085,
 							},
 						},
 						Types: []ast.Vertex{
@@ -8457,8 +8105,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 148,
 										EndLine:   148,
-										StartPos:  3308,
-										EndPos:    3317,
+										StartPos:  3069,
+										EndPos:    3078,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8467,8 +8115,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 148,
 												EndLine:   148,
-												StartPos:  3308,
-												EndPos:    3317,
+												StartPos:  3069,
+												EndPos:    3078,
 											},
 										},
 										Value: []byte("Exception"),
@@ -8481,8 +8129,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 148,
 									EndLine:   148,
-									StartPos:  3318,
-									EndPos:    3320,
+									StartPos:  3079,
+									EndPos:    3081,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -8490,8 +8138,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 148,
 										EndLine:   148,
-										StartPos:  3318,
-										EndPos:    3320,
+										StartPos:  3079,
+										EndPos:    3081,
 									},
 								},
 								Value: []byte("$e"),
@@ -8504,8 +8152,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 148,
 								EndLine:   148,
-								StartPos:  3325,
-								EndPos:    3355,
+								StartPos:  3086,
+								EndPos:    3116,
 							},
 						},
 						Types: []ast.Vertex{
@@ -8514,8 +8162,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 148,
 										EndLine:   148,
-										StartPos:  3332,
-										EndPos:    3348,
+										StartPos:  3093,
+										EndPos:    3109,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8524,8 +8172,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 148,
 												EndLine:   148,
-												StartPos:  3332,
-												EndPos:    3348,
+												StartPos:  3093,
+												EndPos:    3109,
 											},
 										},
 										Value: []byte("RuntimeException"),
@@ -8538,8 +8186,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 148,
 									EndLine:   148,
-									StartPos:  3349,
-									EndPos:    3351,
+									StartPos:  3110,
+									EndPos:    3112,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -8547,8 +8195,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 148,
 										EndLine:   148,
-										StartPos:  3349,
-										EndPos:    3351,
+										StartPos:  3110,
+										EndPos:    3112,
 									},
 								},
 								Value: []byte("$e"),
@@ -8563,8 +8211,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 149,
 						EndLine:   149,
-						StartPos:  3358,
-						EndPos:    3462,
+						StartPos:  3117,
+						EndPos:    3221,
 					},
 				},
 				Stmts: []ast.Vertex{},
@@ -8574,8 +8222,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 149,
 								EndLine:   149,
-								StartPos:  3365,
-								EndPos:    3388,
+								StartPos:  3124,
+								EndPos:    3147,
 							},
 						},
 						Types: []ast.Vertex{
@@ -8584,8 +8232,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 149,
 										EndLine:   149,
-										StartPos:  3372,
-										EndPos:    3381,
+										StartPos:  3131,
+										EndPos:    3140,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8594,8 +8242,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 149,
 												EndLine:   149,
-												StartPos:  3372,
-												EndPos:    3381,
+												StartPos:  3131,
+												EndPos:    3140,
 											},
 										},
 										Value: []byte("Exception"),
@@ -8608,8 +8256,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 149,
 									EndLine:   149,
-									StartPos:  3382,
-									EndPos:    3384,
+									StartPos:  3141,
+									EndPos:    3143,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -8617,8 +8265,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 149,
 										EndLine:   149,
-										StartPos:  3382,
-										EndPos:    3384,
+										StartPos:  3141,
+										EndPos:    3143,
 									},
 								},
 								Value: []byte("$e"),
@@ -8631,8 +8279,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 149,
 								EndLine:   149,
-								StartPos:  3389,
-								EndPos:    3420,
+								StartPos:  3148,
+								EndPos:    3179,
 							},
 						},
 						Types: []ast.Vertex{
@@ -8641,8 +8289,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 149,
 										EndLine:   149,
-										StartPos:  3396,
-										EndPos:    3413,
+										StartPos:  3155,
+										EndPos:    3172,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8651,8 +8299,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 149,
 												EndLine:   149,
-												StartPos:  3397,
-												EndPos:    3413,
+												StartPos:  3156,
+												EndPos:    3172,
 											},
 										},
 										Value: []byte("RuntimeException"),
@@ -8665,8 +8313,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 149,
 									EndLine:   149,
-									StartPos:  3414,
-									EndPos:    3416,
+									StartPos:  3173,
+									EndPos:    3175,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -8674,8 +8322,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 149,
 										EndLine:   149,
-										StartPos:  3414,
-										EndPos:    3416,
+										StartPos:  3173,
+										EndPos:    3175,
 									},
 								},
 								Value: []byte("$e"),
@@ -8688,8 +8336,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 149,
 								EndLine:   149,
-								StartPos:  3421,
-								EndPos:    3462,
+								StartPos:  3180,
+								EndPos:    3221,
 							},
 						},
 						Types: []ast.Vertex{
@@ -8698,8 +8346,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 149,
 										EndLine:   149,
-										StartPos:  3428,
-										EndPos:    3455,
+										StartPos:  3187,
+										EndPos:    3214,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8708,8 +8356,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 149,
 												EndLine:   149,
-												StartPos:  3438,
-												EndPos:    3455,
+												StartPos:  3197,
+												EndPos:    3214,
 											},
 										},
 										Value: []byte("AdditionException"),
@@ -8722,8 +8370,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 149,
 									EndLine:   149,
-									StartPos:  3456,
-									EndPos:    3458,
+									StartPos:  3215,
+									EndPos:    3217,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -8731,8 +8379,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 149,
 										EndLine:   149,
-										StartPos:  3456,
-										EndPos:    3458,
+										StartPos:  3215,
+										EndPos:    3217,
 									},
 								},
 								Value: []byte("$e"),
@@ -8747,8 +8395,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 150,
 						EndLine:   150,
-						StartPos:  3465,
-						EndPos:    3506,
+						StartPos:  3222,
+						EndPos:    3263,
 					},
 				},
 				Stmts: []ast.Vertex{},
@@ -8758,8 +8406,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 150,
 								EndLine:   150,
-								StartPos:  3472,
-								EndPos:    3495,
+								StartPos:  3229,
+								EndPos:    3252,
 							},
 						},
 						Types: []ast.Vertex{
@@ -8768,8 +8416,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 150,
 										EndLine:   150,
-										StartPos:  3479,
-										EndPos:    3488,
+										StartPos:  3236,
+										EndPos:    3245,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8778,8 +8426,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 150,
 												EndLine:   150,
-												StartPos:  3479,
-												EndPos:    3488,
+												StartPos:  3236,
+												EndPos:    3245,
 											},
 										},
 										Value: []byte("Exception"),
@@ -8792,8 +8440,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 150,
 									EndLine:   150,
-									StartPos:  3489,
-									EndPos:    3491,
+									StartPos:  3246,
+									EndPos:    3248,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -8801,8 +8449,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 150,
 										EndLine:   150,
-										StartPos:  3489,
-										EndPos:    3491,
+										StartPos:  3246,
+										EndPos:    3248,
 									},
 								},
 								Value: []byte("$e"),
@@ -8816,8 +8464,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 150,
 							EndLine:   150,
-							StartPos:  3496,
-							EndPos:    3506,
+							StartPos:  3253,
+							EndPos:    3263,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -8828,8 +8476,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 152,
 						EndLine:   152,
-						StartPos:  3510,
-						EndPos:    3524,
+						StartPos:  3265,
+						EndPos:    3279,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -8838,8 +8486,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 152,
 								EndLine:   152,
-								StartPos:  3516,
-								EndPos:    3518,
+								StartPos:  3271,
+								EndPos:    3273,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -8847,8 +8495,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 152,
 									EndLine:   152,
-									StartPos:  3516,
-									EndPos:    3518,
+									StartPos:  3271,
+									EndPos:    3273,
 								},
 							},
 							Value: []byte("$a"),
@@ -8859,8 +8507,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 152,
 								EndLine:   152,
-								StartPos:  3520,
-								EndPos:    3522,
+								StartPos:  3275,
+								EndPos:    3277,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -8868,8 +8516,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 152,
 									EndLine:   152,
-									StartPos:  3520,
-									EndPos:    3522,
+									StartPos:  3275,
+									EndPos:    3277,
 								},
 							},
 							Value: []byte("$b"),
@@ -8882,8 +8530,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 154,
 						EndLine:   154,
-						StartPos:  3528,
-						EndPos:    3536,
+						StartPos:  3281,
+						EndPos:    3289,
 					},
 				},
 				Uses: []ast.Vertex{
@@ -8892,8 +8540,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 154,
 								EndLine:   154,
-								StartPos:  3532,
-								EndPos:    3535,
+								StartPos:  3285,
+								EndPos:    3288,
 							},
 						},
 						Use: &ast.NameName{
@@ -8901,8 +8549,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 154,
 									EndLine:   154,
-									StartPos:  3532,
-									EndPos:    3535,
+									StartPos:  3285,
+									EndPos:    3288,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -8911,8 +8559,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 154,
 											EndLine:   154,
-											StartPos:  3532,
-											EndPos:    3535,
+											StartPos:  3285,
+											EndPos:    3288,
 										},
 									},
 									Value: []byte("Foo"),
@@ -8927,8 +8575,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 155,
 						EndLine:   155,
-						StartPos:  3539,
-						EndPos:    3548,
+						StartPos:  3290,
+						EndPos:    3299,
 					},
 				},
 				Uses: []ast.Vertex{
@@ -8937,8 +8585,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 155,
 								EndLine:   155,
-								StartPos:  3544,
-								EndPos:    3547,
+								StartPos:  3295,
+								EndPos:    3298,
 							},
 						},
 						Use: &ast.NameName{
@@ -8946,8 +8594,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 155,
 									EndLine:   155,
-									StartPos:  3544,
-									EndPos:    3547,
+									StartPos:  3295,
+									EndPos:    3298,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -8956,8 +8604,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 155,
 											EndLine:   155,
-											StartPos:  3544,
-											EndPos:    3547,
+											StartPos:  3295,
+											EndPos:    3298,
 										},
 									},
 									Value: []byte("Foo"),
@@ -8972,8 +8620,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 156,
 						EndLine:   156,
-						StartPos:  3551,
-						EndPos:    3567,
+						StartPos:  3300,
+						EndPos:    3316,
 					},
 				},
 				Uses: []ast.Vertex{
@@ -8982,8 +8630,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 156,
 								EndLine:   156,
-								StartPos:  3556,
-								EndPos:    3566,
+								StartPos:  3305,
+								EndPos:    3315,
 							},
 						},
 						Use: &ast.NameName{
@@ -8991,8 +8639,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 156,
 									EndLine:   156,
-									StartPos:  3556,
-									EndPos:    3559,
+									StartPos:  3305,
+									EndPos:    3308,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9001,8 +8649,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 156,
 											EndLine:   156,
-											StartPos:  3556,
-											EndPos:    3559,
+											StartPos:  3305,
+											EndPos:    3308,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9014,8 +8662,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 156,
 									EndLine:   156,
-									StartPos:  3563,
-									EndPos:    3566,
+									StartPos:  3312,
+									EndPos:    3315,
 								},
 							},
 							Value: []byte("Bar"),
@@ -9028,8 +8676,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 157,
 						EndLine:   157,
-						StartPos:  3570,
-						EndPos:    3583,
+						StartPos:  3317,
+						EndPos:    3330,
 					},
 				},
 				Uses: []ast.Vertex{
@@ -9038,8 +8686,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 157,
 								EndLine:   157,
-								StartPos:  3574,
-								EndPos:    3577,
+								StartPos:  3321,
+								EndPos:    3324,
 							},
 						},
 						Use: &ast.NameName{
@@ -9047,8 +8695,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 157,
 									EndLine:   157,
-									StartPos:  3574,
-									EndPos:    3577,
+									StartPos:  3321,
+									EndPos:    3324,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9057,8 +8705,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 157,
 											EndLine:   157,
-											StartPos:  3574,
-											EndPos:    3577,
+											StartPos:  3321,
+											EndPos:    3324,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9071,8 +8719,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 157,
 								EndLine:   157,
-								StartPos:  3579,
-								EndPos:    3582,
+								StartPos:  3326,
+								EndPos:    3329,
 							},
 						},
 						Use: &ast.NameName{
@@ -9080,8 +8728,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 157,
 									EndLine:   157,
-									StartPos:  3579,
-									EndPos:    3582,
+									StartPos:  3326,
+									EndPos:    3329,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9090,8 +8738,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 157,
 											EndLine:   157,
-											StartPos:  3579,
-											EndPos:    3582,
+											StartPos:  3326,
+											EndPos:    3329,
 										},
 									},
 									Value: []byte("Bar"),
@@ -9106,8 +8754,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 158,
 						EndLine:   158,
-						StartPos:  3586,
-						EndPos:    3606,
+						StartPos:  3331,
+						EndPos:    3351,
 					},
 				},
 				Uses: []ast.Vertex{
@@ -9116,8 +8764,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 158,
 								EndLine:   158,
-								StartPos:  3590,
-								EndPos:    3593,
+								StartPos:  3335,
+								EndPos:    3338,
 							},
 						},
 						Use: &ast.NameName{
@@ -9125,8 +8773,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 158,
 									EndLine:   158,
-									StartPos:  3590,
-									EndPos:    3593,
+									StartPos:  3335,
+									EndPos:    3338,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9135,8 +8783,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 158,
 											EndLine:   158,
-											StartPos:  3590,
-											EndPos:    3593,
+											StartPos:  3335,
+											EndPos:    3338,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9149,8 +8797,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 158,
 								EndLine:   158,
-								StartPos:  3595,
-								EndPos:    3605,
+								StartPos:  3340,
+								EndPos:    3350,
 							},
 						},
 						Use: &ast.NameName{
@@ -9158,8 +8806,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 158,
 									EndLine:   158,
-									StartPos:  3595,
-									EndPos:    3598,
+									StartPos:  3340,
+									EndPos:    3343,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9168,8 +8816,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 158,
 											EndLine:   158,
-											StartPos:  3595,
-											EndPos:    3598,
+											StartPos:  3340,
+											EndPos:    3343,
 										},
 									},
 									Value: []byte("Bar"),
@@ -9181,8 +8829,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 158,
 									EndLine:   158,
-									StartPos:  3602,
-									EndPos:    3605,
+									StartPos:  3347,
+									EndPos:    3350,
 								},
 							},
 							Value: []byte("Baz"),
@@ -9195,8 +8843,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 159,
 						EndLine:   159,
-						StartPos:  3609,
-						EndPos:    3632,
+						StartPos:  3352,
+						EndPos:    3375,
 					},
 				},
 				UseType: &ast.Identifier{
@@ -9204,8 +8852,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 159,
 							EndLine:   159,
-							StartPos:  3613,
-							EndPos:    3621,
+							StartPos:  3356,
+							EndPos:    3364,
 						},
 					},
 					Value: []byte("function"),
@@ -9216,8 +8864,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 159,
 								EndLine:   159,
-								StartPos:  3622,
-								EndPos:    3625,
+								StartPos:  3365,
+								EndPos:    3368,
 							},
 						},
 						Use: &ast.NameName{
@@ -9225,8 +8873,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 159,
 									EndLine:   159,
-									StartPos:  3622,
-									EndPos:    3625,
+									StartPos:  3365,
+									EndPos:    3368,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9235,8 +8883,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 159,
 											EndLine:   159,
-											StartPos:  3622,
-											EndPos:    3625,
+											StartPos:  3365,
+											EndPos:    3368,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9249,8 +8897,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 159,
 								EndLine:   159,
-								StartPos:  3628,
-								EndPos:    3631,
+								StartPos:  3371,
+								EndPos:    3374,
 							},
 						},
 						Use: &ast.NameName{
@@ -9258,8 +8906,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 159,
 									EndLine:   159,
-									StartPos:  3628,
-									EndPos:    3631,
+									StartPos:  3371,
+									EndPos:    3374,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9268,8 +8916,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 159,
 											EndLine:   159,
-											StartPos:  3628,
-											EndPos:    3631,
+											StartPos:  3371,
+											EndPos:    3374,
 										},
 									},
 									Value: []byte("Bar"),
@@ -9284,8 +8932,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 160,
 						EndLine:   160,
-						StartPos:  3635,
-						EndPos:    3672,
+						StartPos:  3376,
+						EndPos:    3413,
 					},
 				},
 				UseType: &ast.Identifier{
@@ -9293,8 +8941,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 160,
 							EndLine:   160,
-							StartPos:  3639,
-							EndPos:    3647,
+							StartPos:  3380,
+							EndPos:    3388,
 						},
 					},
 					Value: []byte("function"),
@@ -9305,8 +8953,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 160,
 								EndLine:   160,
-								StartPos:  3648,
-								EndPos:    3658,
+								StartPos:  3389,
+								EndPos:    3399,
 							},
 						},
 						Use: &ast.NameName{
@@ -9314,8 +8962,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 160,
 									EndLine:   160,
-									StartPos:  3648,
-									EndPos:    3651,
+									StartPos:  3389,
+									EndPos:    3392,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9324,8 +8972,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 160,
 											EndLine:   160,
-											StartPos:  3648,
-											EndPos:    3651,
+											StartPos:  3389,
+											EndPos:    3392,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9337,8 +8985,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 160,
 									EndLine:   160,
-									StartPos:  3655,
-									EndPos:    3658,
+									StartPos:  3396,
+									EndPos:    3399,
 								},
 							},
 							Value: []byte("foo"),
@@ -9349,8 +8997,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 160,
 								EndLine:   160,
-								StartPos:  3661,
-								EndPos:    3671,
+								StartPos:  3402,
+								EndPos:    3412,
 							},
 						},
 						Use: &ast.NameName{
@@ -9358,8 +9006,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 160,
 									EndLine:   160,
-									StartPos:  3661,
-									EndPos:    3664,
+									StartPos:  3402,
+									EndPos:    3405,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9368,8 +9016,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 160,
 											EndLine:   160,
-											StartPos:  3661,
-											EndPos:    3664,
+											StartPos:  3402,
+											EndPos:    3405,
 										},
 									},
 									Value: []byte("Bar"),
@@ -9381,8 +9029,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 160,
 									EndLine:   160,
-									StartPos:  3668,
-									EndPos:    3671,
+									StartPos:  3409,
+									EndPos:    3412,
 								},
 							},
 							Value: []byte("bar"),
@@ -9395,8 +9043,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 161,
 						EndLine:   161,
-						StartPos:  3675,
-						EndPos:    3695,
+						StartPos:  3414,
+						EndPos:    3434,
 					},
 				},
 				UseType: &ast.Identifier{
@@ -9404,8 +9052,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 161,
 							EndLine:   161,
-							StartPos:  3679,
-							EndPos:    3684,
+							StartPos:  3418,
+							EndPos:    3423,
 						},
 					},
 					Value: []byte("const"),
@@ -9416,8 +9064,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 161,
 								EndLine:   161,
-								StartPos:  3685,
-								EndPos:    3688,
+								StartPos:  3424,
+								EndPos:    3427,
 							},
 						},
 						Use: &ast.NameName{
@@ -9425,8 +9073,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 161,
 									EndLine:   161,
-									StartPos:  3685,
-									EndPos:    3688,
+									StartPos:  3424,
+									EndPos:    3427,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9435,8 +9083,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 161,
 											EndLine:   161,
-											StartPos:  3685,
-											EndPos:    3688,
+											StartPos:  3424,
+											EndPos:    3427,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9449,8 +9097,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 161,
 								EndLine:   161,
-								StartPos:  3691,
-								EndPos:    3694,
+								StartPos:  3430,
+								EndPos:    3433,
 							},
 						},
 						Use: &ast.NameName{
@@ -9458,8 +9106,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 161,
 									EndLine:   161,
-									StartPos:  3691,
-									EndPos:    3694,
+									StartPos:  3430,
+									EndPos:    3433,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9468,8 +9116,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 161,
 											EndLine:   161,
-											StartPos:  3691,
-											EndPos:    3694,
+											StartPos:  3430,
+											EndPos:    3433,
 										},
 									},
 									Value: []byte("Bar"),
@@ -9484,8 +9132,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 162,
 						EndLine:   162,
-						StartPos:  3698,
-						EndPos:    3732,
+						StartPos:  3435,
+						EndPos:    3469,
 					},
 				},
 				UseType: &ast.Identifier{
@@ -9493,8 +9141,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 162,
 							EndLine:   162,
-							StartPos:  3702,
-							EndPos:    3707,
+							StartPos:  3439,
+							EndPos:    3444,
 						},
 					},
 					Value: []byte("const"),
@@ -9505,8 +9153,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 162,
 								EndLine:   162,
-								StartPos:  3708,
-								EndPos:    3718,
+								StartPos:  3445,
+								EndPos:    3455,
 							},
 						},
 						Use: &ast.NameName{
@@ -9514,8 +9162,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 162,
 									EndLine:   162,
-									StartPos:  3708,
-									EndPos:    3711,
+									StartPos:  3445,
+									EndPos:    3448,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9524,8 +9172,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 162,
 											EndLine:   162,
-											StartPos:  3708,
-											EndPos:    3711,
+											StartPos:  3445,
+											EndPos:    3448,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9537,8 +9185,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 162,
 									EndLine:   162,
-									StartPos:  3715,
-									EndPos:    3718,
+									StartPos:  3452,
+									EndPos:    3455,
 								},
 							},
 							Value: []byte("foo"),
@@ -9549,8 +9197,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 162,
 								EndLine:   162,
-								StartPos:  3721,
-								EndPos:    3731,
+								StartPos:  3458,
+								EndPos:    3468,
 							},
 						},
 						Use: &ast.NameName{
@@ -9558,8 +9206,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 162,
 									EndLine:   162,
-									StartPos:  3721,
-									EndPos:    3724,
+									StartPos:  3458,
+									EndPos:    3461,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9568,8 +9216,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 162,
 											EndLine:   162,
-											StartPos:  3721,
-											EndPos:    3724,
+											StartPos:  3458,
+											EndPos:    3461,
 										},
 									},
 									Value: []byte("Bar"),
@@ -9581,8 +9229,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 162,
 									EndLine:   162,
-									StartPos:  3728,
-									EndPos:    3731,
+									StartPos:  3465,
+									EndPos:    3468,
 								},
 							},
 							Value: []byte("bar"),
@@ -9595,8 +9243,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 164,
 						EndLine:   164,
-						StartPos:  3736,
-						EndPos:    3742,
+						StartPos:  3471,
+						EndPos:    3477,
 					},
 				},
 				Expr: &ast.ExprArrayDimFetch{
@@ -9604,8 +9252,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 164,
 							EndLine:   164,
-							StartPos:  3736,
-							EndPos:    3741,
+							StartPos:  3471,
+							EndPos:    3476,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -9613,8 +9261,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 164,
 								EndLine:   164,
-								StartPos:  3736,
-								EndPos:    3738,
+								StartPos:  3471,
+								EndPos:    3473,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -9622,8 +9270,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 164,
 									EndLine:   164,
-									StartPos:  3736,
-									EndPos:    3738,
+									StartPos:  3471,
+									EndPos:    3473,
 								},
 							},
 							Value: []byte("$a"),
@@ -9634,8 +9282,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 164,
 								EndLine:   164,
-								StartPos:  3739,
-								EndPos:    3740,
+								StartPos:  3474,
+								EndPos:    3475,
 							},
 						},
 						Value: []byte("1"),
@@ -9647,8 +9295,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 165,
 						EndLine:   165,
-						StartPos:  3745,
-						EndPos:    3754,
+						StartPos:  3478,
+						EndPos:    3487,
 					},
 				},
 				Expr: &ast.ExprArrayDimFetch{
@@ -9656,8 +9304,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 165,
 							EndLine:   165,
-							StartPos:  3745,
-							EndPos:    3753,
+							StartPos:  3478,
+							EndPos:    3486,
 						},
 					},
 					Var: &ast.ExprArrayDimFetch{
@@ -9665,8 +9313,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 165,
 								EndLine:   165,
-								StartPos:  3745,
-								EndPos:    3750,
+								StartPos:  3478,
+								EndPos:    3483,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -9674,8 +9322,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 165,
 									EndLine:   165,
-									StartPos:  3745,
-									EndPos:    3747,
+									StartPos:  3478,
+									EndPos:    3480,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -9683,8 +9331,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 165,
 										EndLine:   165,
-										StartPos:  3745,
-										EndPos:    3747,
+										StartPos:  3478,
+										EndPos:    3480,
 									},
 								},
 								Value: []byte("$a"),
@@ -9695,8 +9343,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 165,
 									EndLine:   165,
-									StartPos:  3748,
-									EndPos:    3749,
+									StartPos:  3481,
+									EndPos:    3482,
 								},
 							},
 							Value: []byte("1"),
@@ -9707,8 +9355,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 165,
 								EndLine:   165,
-								StartPos:  3751,
-								EndPos:    3752,
+								StartPos:  3484,
+								EndPos:    3485,
 							},
 						},
 						Value: []byte("2"),
@@ -9720,8 +9368,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 166,
 						EndLine:   166,
-						StartPos:  3757,
-						EndPos:    3765,
+						StartPos:  3488,
+						EndPos:    3496,
 					},
 				},
 				Expr: &ast.ExprArray{
@@ -9729,8 +9377,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 166,
 							EndLine:   166,
-							StartPos:  3757,
-							EndPos:    3764,
+							StartPos:  3488,
+							EndPos:    3495,
 						},
 					},
 					Items: []ast.Vertex{},
@@ -9741,8 +9389,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 167,
 						EndLine:   167,
-						StartPos:  3768,
-						EndPos:    3777,
+						StartPos:  3497,
+						EndPos:    3506,
 					},
 				},
 				Expr: &ast.ExprArray{
@@ -9750,8 +9398,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 167,
 							EndLine:   167,
-							StartPos:  3768,
-							EndPos:    3776,
+							StartPos:  3497,
+							EndPos:    3505,
 						},
 					},
 					Items: []ast.Vertex{
@@ -9760,8 +9408,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 167,
 									EndLine:   167,
-									StartPos:  3774,
-									EndPos:    3775,
+									StartPos:  3503,
+									EndPos:    3504,
 								},
 							},
 							Val: &ast.ScalarLnumber{
@@ -9769,8 +9417,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 167,
 										EndLine:   167,
-										StartPos:  3774,
-										EndPos:    3775,
+										StartPos:  3503,
+										EndPos:    3504,
 									},
 								},
 								Value: []byte("1"),
@@ -9784,8 +9432,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 168,
 						EndLine:   168,
-						StartPos:  3780,
-						EndPos:    3798,
+						StartPos:  3507,
+						EndPos:    3525,
 					},
 				},
 				Expr: &ast.ExprArray{
@@ -9793,8 +9441,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 168,
 							EndLine:   168,
-							StartPos:  3780,
-							EndPos:    3797,
+							StartPos:  3507,
+							EndPos:    3524,
 						},
 					},
 					Items: []ast.Vertex{
@@ -9803,8 +9451,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 168,
 									EndLine:   168,
-									StartPos:  3786,
-									EndPos:    3790,
+									StartPos:  3513,
+									EndPos:    3517,
 								},
 							},
 							Key: &ast.ScalarLnumber{
@@ -9812,8 +9460,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 168,
 										EndLine:   168,
-										StartPos:  3786,
-										EndPos:    3787,
+										StartPos:  3513,
+										EndPos:    3514,
 									},
 								},
 								Value: []byte("1"),
@@ -9823,8 +9471,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 168,
 										EndLine:   168,
-										StartPos:  3789,
-										EndPos:    3790,
+										StartPos:  3516,
+										EndPos:    3517,
 									},
 								},
 								Value: []byte("1"),
@@ -9835,8 +9483,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 168,
 									EndLine:   168,
-									StartPos:  3792,
-									EndPos:    3795,
+									StartPos:  3519,
+									EndPos:    3522,
 								},
 							},
 							Val: &ast.ExprReference{
@@ -9844,8 +9492,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 168,
 										EndLine:   168,
-										StartPos:  3792,
-										EndPos:    3795,
+										StartPos:  3519,
+										EndPos:    3522,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -9853,8 +9501,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 168,
 											EndLine:   168,
-											StartPos:  3793,
-											EndPos:    3795,
+											StartPos:  3520,
+											EndPos:    3522,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -9862,8 +9510,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 168,
 												EndLine:   168,
-												StartPos:  3793,
-												EndPos:    3795,
+												StartPos:  3520,
+												EndPos:    3522,
 											},
 										},
 										Value: []byte("$b"),
@@ -9880,8 +9528,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 169,
 						EndLine:   169,
-						StartPos:  3801,
-						EndPos:    3816,
+						StartPos:  3526,
+						EndPos:    3541,
 					},
 				},
 				Expr: &ast.ExprArray{
@@ -9889,8 +9537,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 169,
 							EndLine:   169,
-							StartPos:  3801,
-							EndPos:    3815,
+							StartPos:  3526,
+							EndPos:    3540,
 						},
 					},
 					Items: []ast.Vertex{
@@ -9899,8 +9547,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 169,
 									EndLine:   169,
-									StartPos:  3807,
-									EndPos:    3814,
+									StartPos:  3532,
+									EndPos:    3539,
 								},
 							},
 							Key: &ast.ScalarLnumber{
@@ -9908,8 +9556,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 169,
 										EndLine:   169,
-										StartPos:  3807,
-										EndPos:    3808,
+										StartPos:  3532,
+										EndPos:    3533,
 									},
 								},
 								Value: []byte("3"),
@@ -9919,8 +9567,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 169,
 										EndLine:   169,
-										StartPos:  3811,
-										EndPos:    3814,
+										StartPos:  3536,
+										EndPos:    3539,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -9928,8 +9576,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 169,
 											EndLine:   169,
-											StartPos:  3812,
-											EndPos:    3814,
+											StartPos:  3537,
+											EndPos:    3539,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -9937,8 +9585,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 169,
 												EndLine:   169,
-												StartPos:  3812,
-												EndPos:    3814,
+												StartPos:  3537,
+												EndPos:    3539,
 											},
 										},
 										Value: []byte("$b"),
@@ -9954,8 +9602,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 170,
 						EndLine:   170,
-						StartPos:  3819,
-						EndPos:    3848,
+						StartPos:  3542,
+						EndPos:    3571,
 					},
 				},
 				Expr: &ast.ExprArray{
@@ -9963,8 +9611,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 170,
 							EndLine:   170,
-							StartPos:  3819,
-							EndPos:    3847,
+							StartPos:  3542,
+							EndPos:    3570,
 						},
 					},
 					Items: []ast.Vertex{
@@ -9973,8 +9621,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 170,
 									EndLine:   170,
-									StartPos:  3825,
-									EndPos:    3828,
+									StartPos:  3548,
+									EndPos:    3551,
 								},
 							},
 							Val: &ast.ExprReference{
@@ -9982,8 +9630,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 170,
 										EndLine:   170,
-										StartPos:  3825,
-										EndPos:    3828,
+										StartPos:  3548,
+										EndPos:    3551,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -9991,8 +9639,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 170,
 											EndLine:   170,
-											StartPos:  3826,
-											EndPos:    3828,
+											StartPos:  3549,
+											EndPos:    3551,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -10000,8 +9648,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 170,
 												EndLine:   170,
-												StartPos:  3826,
-												EndPos:    3828,
+												StartPos:  3549,
+												EndPos:    3551,
 											},
 										},
 										Value: []byte("$b"),
@@ -10014,8 +9662,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 170,
 									EndLine:   170,
-									StartPos:  3830,
-									EndPos:    3834,
+									StartPos:  3553,
+									EndPos:    3557,
 								},
 							},
 							Key: &ast.ScalarLnumber{
@@ -10023,8 +9671,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 170,
 										EndLine:   170,
-										StartPos:  3830,
-										EndPos:    3831,
+										StartPos:  3553,
+										EndPos:    3554,
 									},
 								},
 								Value: []byte("1"),
@@ -10034,8 +9682,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 170,
 										EndLine:   170,
-										StartPos:  3833,
-										EndPos:    3834,
+										StartPos:  3556,
+										EndPos:    3557,
 									},
 								},
 								Value: []byte("1"),
@@ -10046,8 +9694,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 170,
 									EndLine:   170,
-									StartPos:  3836,
-									EndPos:    3837,
+									StartPos:  3559,
+									EndPos:    3560,
 								},
 							},
 							Val: &ast.ScalarLnumber{
@@ -10055,8 +9703,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 170,
 										EndLine:   170,
-										StartPos:  3836,
-										EndPos:    3837,
+										StartPos:  3559,
+										EndPos:    3560,
 									},
 								},
 								Value: []byte("1"),
@@ -10067,8 +9715,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 170,
 									EndLine:   170,
-									StartPos:  3839,
-									EndPos:    3846,
+									StartPos:  3562,
+									EndPos:    3569,
 								},
 							},
 							Key: &ast.ScalarLnumber{
@@ -10076,8 +9724,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 170,
 										EndLine:   170,
-										StartPos:  3839,
-										EndPos:    3840,
+										StartPos:  3562,
+										EndPos:    3563,
 									},
 								},
 								Value: []byte("3"),
@@ -10087,8 +9735,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 170,
 										EndLine:   170,
-										StartPos:  3843,
-										EndPos:    3846,
+										StartPos:  3566,
+										EndPos:    3569,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -10096,8 +9744,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 170,
 											EndLine:   170,
-											StartPos:  3844,
-											EndPos:    3846,
+											StartPos:  3567,
+											EndPos:    3569,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -10105,8 +9753,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 170,
 												EndLine:   170,
-												StartPos:  3844,
-												EndPos:    3846,
+												StartPos:  3567,
+												EndPos:    3569,
 											},
 										},
 										Value: []byte("$b"),
@@ -10122,8 +9770,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 171,
 						EndLine:   171,
-						StartPos:  3851,
-						EndPos:    3855,
+						StartPos:  3572,
+						EndPos:    3576,
 					},
 				},
 				Expr: &ast.ExprBitwiseNot{
@@ -10131,8 +9779,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 171,
 							EndLine:   171,
-							StartPos:  3851,
-							EndPos:    3854,
+							StartPos:  3572,
+							EndPos:    3575,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -10140,8 +9788,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 171,
 								EndLine:   171,
-								StartPos:  3852,
-								EndPos:    3854,
+								StartPos:  3573,
+								EndPos:    3575,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -10149,8 +9797,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 171,
 									EndLine:   171,
-									StartPos:  3852,
-									EndPos:    3854,
+									StartPos:  3573,
+									EndPos:    3575,
 								},
 							},
 							Value: []byte("$a"),
@@ -10163,8 +9811,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 172,
 						EndLine:   172,
-						StartPos:  3858,
-						EndPos:    3862,
+						StartPos:  3577,
+						EndPos:    3581,
 					},
 				},
 				Expr: &ast.ExprBooleanNot{
@@ -10172,8 +9820,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 172,
 							EndLine:   172,
-							StartPos:  3858,
-							EndPos:    3861,
+							StartPos:  3577,
+							EndPos:    3580,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -10181,8 +9829,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 172,
 								EndLine:   172,
-								StartPos:  3859,
-								EndPos:    3861,
+								StartPos:  3578,
+								EndPos:    3580,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -10190,8 +9838,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 172,
 									EndLine:   172,
-									StartPos:  3859,
-									EndPos:    3861,
+									StartPos:  3578,
+									EndPos:    3580,
 								},
 							},
 							Value: []byte("$a"),
@@ -10204,8 +9852,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 174,
 						EndLine:   174,
-						StartPos:  3866,
-						EndPos:    3875,
+						StartPos:  3583,
+						EndPos:    3592,
 					},
 				},
 				Expr: &ast.ExprClassConstFetch{
@@ -10213,8 +9861,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 174,
 							EndLine:   174,
-							StartPos:  3866,
-							EndPos:    3874,
+							StartPos:  3583,
+							EndPos:    3591,
 						},
 					},
 					Class: &ast.NameName{
@@ -10222,8 +9870,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 174,
 								EndLine:   174,
-								StartPos:  3866,
-								EndPos:    3869,
+								StartPos:  3583,
+								EndPos:    3586,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -10232,8 +9880,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 174,
 										EndLine:   174,
-										StartPos:  3866,
-										EndPos:    3869,
+										StartPos:  3583,
+										EndPos:    3586,
 									},
 								},
 								Value: []byte("Foo"),
@@ -10245,8 +9893,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 174,
 								EndLine:   174,
-								StartPos:  3871,
-								EndPos:    3874,
+								StartPos:  3588,
+								EndPos:    3591,
 							},
 						},
 						Value: []byte("Bar"),
@@ -10258,8 +9906,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 175,
 						EndLine:   175,
-						StartPos:  3878,
-						EndPos:    3888,
+						StartPos:  3593,
+						EndPos:    3603,
 					},
 				},
 				Expr: &ast.ExprClone{
@@ -10267,8 +9915,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 175,
 							EndLine:   175,
-							StartPos:  3878,
-							EndPos:    3886,
+							StartPos:  3593,
+							EndPos:    3601,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -10276,8 +9924,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 175,
 								EndLine:   175,
-								StartPos:  3884,
-								EndPos:    3886,
+								StartPos:  3599,
+								EndPos:    3601,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -10285,8 +9933,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 175,
 									EndLine:   175,
-									StartPos:  3884,
-									EndPos:    3886,
+									StartPos:  3599,
+									EndPos:    3601,
 								},
 							},
 							Value: []byte("$a"),
@@ -10299,8 +9947,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 176,
 						EndLine:   176,
-						StartPos:  3891,
-						EndPos:    3900,
+						StartPos:  3604,
+						EndPos:    3613,
 					},
 				},
 				Expr: &ast.ExprClone{
@@ -10308,8 +9956,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 176,
 							EndLine:   176,
-							StartPos:  3891,
-							EndPos:    3899,
+							StartPos:  3604,
+							EndPos:    3612,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -10317,8 +9965,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 176,
 								EndLine:   176,
-								StartPos:  3897,
-								EndPos:    3899,
+								StartPos:  3610,
+								EndPos:    3612,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -10326,8 +9974,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 176,
 									EndLine:   176,
-									StartPos:  3897,
-									EndPos:    3899,
+									StartPos:  3610,
+									EndPos:    3612,
 								},
 							},
 							Value: []byte("$a"),
@@ -10340,8 +9988,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 177,
 						EndLine:   177,
-						StartPos:  3903,
-						EndPos:    3916,
+						StartPos:  3614,
+						EndPos:    3627,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -10349,13 +9997,11 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 177,
 							EndLine:   177,
-							StartPos:  3903,
-							EndPos:    3915,
+							StartPos:  3614,
+							EndPos:    3626,
 						},
 					},
-					Static:     false,
-					ReturnsRef: false,
-					Stmts:      []ast.Vertex{},
+					Stmts: []ast.Vertex{},
 				},
 			},
 			&ast.StmtExpression{
@@ -10363,8 +10009,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 178,
 						EndLine:   178,
-						StartPos:  3919,
-						EndPos:    3953,
+						StartPos:  3628,
+						EndPos:    3662,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -10372,31 +10018,27 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 178,
 							EndLine:   178,
-							StartPos:  3919,
-							EndPos:    3952,
+							StartPos:  3628,
+							EndPos:    3661,
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
 					Params: []ast.Vertex{
 						&ast.Parameter{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 178,
 									EndLine:   178,
-									StartPos:  3928,
-									EndPos:    3930,
+									StartPos:  3637,
+									EndPos:    3639,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 178,
 										EndLine:   178,
-										StartPos:  3928,
-										EndPos:    3930,
+										StartPos:  3637,
+										EndPos:    3639,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -10404,8 +10046,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 178,
 											EndLine:   178,
-											StartPos:  3928,
-											EndPos:    3930,
+											StartPos:  3637,
+											EndPos:    3639,
 										},
 									},
 									Value: []byte("$a"),
@@ -10417,19 +10059,17 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 178,
 									EndLine:   178,
-									StartPos:  3932,
-									EndPos:    3934,
+									StartPos:  3641,
+									EndPos:    3643,
 								},
 							},
-							Variadic: false,
-							ByRef:    false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 178,
 										EndLine:   178,
-										StartPos:  3932,
-										EndPos:    3934,
+										StartPos:  3641,
+										EndPos:    3643,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -10437,8 +10077,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 178,
 											EndLine:   178,
-											StartPos:  3932,
-											EndPos:    3934,
+											StartPos:  3641,
+											EndPos:    3643,
 										},
 									},
 									Value: []byte("$b"),
@@ -10451,8 +10091,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 178,
 								EndLine:   178,
-								StartPos:  3936,
-								EndPos:    3949,
+								StartPos:  3645,
+								EndPos:    3658,
 							},
 						},
 						Uses: []ast.Vertex{
@@ -10461,8 +10101,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 178,
 										EndLine:   178,
-										StartPos:  3941,
-										EndPos:    3943,
+										StartPos:  3650,
+										EndPos:    3652,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -10470,8 +10110,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 178,
 											EndLine:   178,
-											StartPos:  3941,
-											EndPos:    3943,
+											StartPos:  3650,
+											EndPos:    3652,
 										},
 									},
 									Value: []byte("$c"),
@@ -10482,8 +10122,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 178,
 										EndLine:   178,
-										StartPos:  3945,
-										EndPos:    3948,
+										StartPos:  3654,
+										EndPos:    3657,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -10491,8 +10131,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 178,
 											EndLine:   178,
-											StartPos:  3946,
-											EndPos:    3948,
+											StartPos:  3655,
+											EndPos:    3657,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -10500,8 +10140,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 178,
 												EndLine:   178,
-												StartPos:  3946,
-												EndPos:    3948,
+												StartPos:  3655,
+												EndPos:    3657,
 											},
 										},
 										Value: []byte("$d"),
@@ -10518,8 +10158,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 179,
 						EndLine:   179,
-						StartPos:  3956,
-						EndPos:    3990,
+						StartPos:  3663,
+						EndPos:    3697,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -10527,31 +10167,27 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 179,
 							EndLine:   179,
-							StartPos:  3956,
-							EndPos:    3989,
+							StartPos:  3663,
+							EndPos:    3696,
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
 					Params: []ast.Vertex{
 						&ast.Parameter{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 179,
 									EndLine:   179,
-									StartPos:  3965,
-									EndPos:    3967,
+									StartPos:  3672,
+									EndPos:    3674,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 179,
 										EndLine:   179,
-										StartPos:  3965,
-										EndPos:    3967,
+										StartPos:  3672,
+										EndPos:    3674,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -10559,8 +10195,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 179,
 											EndLine:   179,
-											StartPos:  3965,
-											EndPos:    3967,
+											StartPos:  3672,
+											EndPos:    3674,
 										},
 									},
 									Value: []byte("$a"),
@@ -10572,19 +10208,17 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 179,
 									EndLine:   179,
-									StartPos:  3969,
-									EndPos:    3971,
+									StartPos:  3676,
+									EndPos:    3678,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 179,
 										EndLine:   179,
-										StartPos:  3969,
-										EndPos:    3971,
+										StartPos:  3676,
+										EndPos:    3678,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -10592,8 +10226,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 179,
 											EndLine:   179,
-											StartPos:  3969,
-											EndPos:    3971,
+											StartPos:  3676,
+											EndPos:    3678,
 										},
 									},
 									Value: []byte("$b"),
@@ -10606,8 +10240,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 179,
 								EndLine:   179,
-								StartPos:  3973,
-								EndPos:    3986,
+								StartPos:  3680,
+								EndPos:    3693,
 							},
 						},
 						Uses: []ast.Vertex{
@@ -10616,8 +10250,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 179,
 										EndLine:   179,
-										StartPos:  3978,
-										EndPos:    3981,
+										StartPos:  3685,
+										EndPos:    3688,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -10625,8 +10259,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 179,
 											EndLine:   179,
-											StartPos:  3979,
-											EndPos:    3981,
+											StartPos:  3686,
+											EndPos:    3688,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -10634,8 +10268,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 179,
 												EndLine:   179,
-												StartPos:  3979,
-												EndPos:    3981,
+												StartPos:  3686,
+												EndPos:    3688,
 											},
 										},
 										Value: []byte("$c"),
@@ -10647,8 +10281,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 179,
 										EndLine:   179,
-										StartPos:  3983,
-										EndPos:    3985,
+										StartPos:  3690,
+										EndPos:    3692,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -10656,8 +10290,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 179,
 											EndLine:   179,
-											StartPos:  3983,
-											EndPos:    3985,
+											StartPos:  3690,
+											EndPos:    3692,
 										},
 									},
 									Value: []byte("$d"),
@@ -10673,8 +10307,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 180,
 						EndLine:   180,
-						StartPos:  3993,
-						EndPos:    4007,
+						StartPos:  3698,
+						EndPos:    3712,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -10682,13 +10316,11 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 180,
 							EndLine:   180,
-							StartPos:  3993,
-							EndPos:    4006,
+							StartPos:  3698,
+							EndPos:    3711,
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
-					Stmts:      []ast.Vertex{},
+					Stmts: []ast.Vertex{},
 				},
 			},
 			&ast.StmtExpression{
@@ -10696,8 +10328,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 181,
 						EndLine:   181,
-						StartPos:  4010,
-						EndPos:    4014,
+						StartPos:  3713,
+						EndPos:    3717,
 					},
 				},
 				Expr: &ast.ExprConstFetch{
@@ -10705,8 +10337,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 181,
 							EndLine:   181,
-							StartPos:  4010,
-							EndPos:    4013,
+							StartPos:  3713,
+							EndPos:    3716,
 						},
 					},
 					Const: &ast.NameName{
@@ -10714,8 +10346,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 181,
 								EndLine:   181,
-								StartPos:  4010,
-								EndPos:    4013,
+								StartPos:  3713,
+								EndPos:    3716,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -10724,8 +10356,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 181,
 										EndLine:   181,
-										StartPos:  4010,
-										EndPos:    4013,
+										StartPos:  3713,
+										EndPos:    3716,
 									},
 								},
 								Value: []byte("foo"),
@@ -10739,8 +10371,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 182,
 						EndLine:   182,
-						StartPos:  4017,
-						EndPos:    4031,
+						StartPos:  3718,
+						EndPos:    3732,
 					},
 				},
 				Expr: &ast.ExprConstFetch{
@@ -10748,8 +10380,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 182,
 							EndLine:   182,
-							StartPos:  4017,
-							EndPos:    4030,
+							StartPos:  3718,
+							EndPos:    3731,
 						},
 					},
 					Const: &ast.NameRelative{
@@ -10757,8 +10389,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 182,
 								EndLine:   182,
-								StartPos:  4017,
-								EndPos:    4030,
+								StartPos:  3718,
+								EndPos:    3731,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -10767,8 +10399,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 182,
 										EndLine:   182,
-										StartPos:  4027,
-										EndPos:    4030,
+										StartPos:  3728,
+										EndPos:    3731,
 									},
 								},
 								Value: []byte("foo"),
@@ -10782,8 +10414,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 183,
 						EndLine:   183,
-						StartPos:  4034,
-						EndPos:    4039,
+						StartPos:  3733,
+						EndPos:    3738,
 					},
 				},
 				Expr: &ast.ExprConstFetch{
@@ -10791,8 +10423,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 183,
 							EndLine:   183,
-							StartPos:  4034,
-							EndPos:    4038,
+							StartPos:  3733,
+							EndPos:    3737,
 						},
 					},
 					Const: &ast.NameFullyQualified{
@@ -10800,8 +10432,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 183,
 								EndLine:   183,
-								StartPos:  4034,
-								EndPos:    4038,
+								StartPos:  3733,
+								EndPos:    3737,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -10810,8 +10442,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 183,
 										EndLine:   183,
-										StartPos:  4035,
-										EndPos:    4038,
+										StartPos:  3734,
+										EndPos:    3737,
 									},
 								},
 								Value: []byte("foo"),
@@ -10825,8 +10457,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 185,
 						EndLine:   185,
-						StartPos:  4043,
-						EndPos:    4053,
+						StartPos:  3740,
+						EndPos:    3750,
 					},
 				},
 				Expr: &ast.ExprEmpty{
@@ -10834,8 +10466,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 185,
 							EndLine:   185,
-							StartPos:  4043,
-							EndPos:    4052,
+							StartPos:  3740,
+							EndPos:    3749,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -10843,8 +10475,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 185,
 								EndLine:   185,
-								StartPos:  4049,
-								EndPos:    4051,
+								StartPos:  3746,
+								EndPos:    3748,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -10852,8 +10484,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 185,
 									EndLine:   185,
-									StartPos:  4049,
-									EndPos:    4051,
+									StartPos:  3746,
+									EndPos:    3748,
 								},
 							},
 							Value: []byte("$a"),
@@ -10866,8 +10498,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 186,
 						EndLine:   186,
-						StartPos:  4056,
-						EndPos:    4067,
+						StartPos:  3751,
+						EndPos:    3762,
 					},
 				},
 				Expr: &ast.ExprEmpty{
@@ -10875,8 +10507,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 186,
 							EndLine:   186,
-							StartPos:  4056,
-							EndPos:    4066,
+							StartPos:  3751,
+							EndPos:    3761,
 						},
 					},
 					Expr: &ast.ExprConstFetch{
@@ -10884,8 +10516,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 186,
 								EndLine:   186,
-								StartPos:  4062,
-								EndPos:    4065,
+								StartPos:  3757,
+								EndPos:    3760,
 							},
 						},
 						Const: &ast.NameName{
@@ -10893,8 +10525,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 186,
 									EndLine:   186,
-									StartPos:  4062,
-									EndPos:    4065,
+									StartPos:  3757,
+									EndPos:    3760,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -10903,8 +10535,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 186,
 											EndLine:   186,
-											StartPos:  4062,
-											EndPos:    4065,
+											StartPos:  3757,
+											EndPos:    3760,
 										},
 									},
 									Value: []byte("Foo"),
@@ -10919,8 +10551,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 187,
 						EndLine:   187,
-						StartPos:  4070,
-						EndPos:    4074,
+						StartPos:  3763,
+						EndPos:    3767,
 					},
 				},
 				Expr: &ast.ExprErrorSuppress{
@@ -10928,8 +10560,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 187,
 							EndLine:   187,
-							StartPos:  4070,
-							EndPos:    4073,
+							StartPos:  3763,
+							EndPos:    3766,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -10937,8 +10569,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 187,
 								EndLine:   187,
-								StartPos:  4071,
-								EndPos:    4073,
+								StartPos:  3764,
+								EndPos:    3766,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -10946,8 +10578,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 187,
 									EndLine:   187,
-									StartPos:  4071,
-									EndPos:    4073,
+									StartPos:  3764,
+									EndPos:    3766,
 								},
 							},
 							Value: []byte("$a"),
@@ -10960,8 +10592,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 188,
 						EndLine:   188,
-						StartPos:  4077,
-						EndPos:    4086,
+						StartPos:  3768,
+						EndPos:    3777,
 					},
 				},
 				Expr: &ast.ExprEval{
@@ -10969,8 +10601,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 188,
 							EndLine:   188,
-							StartPos:  4077,
-							EndPos:    4085,
+							StartPos:  3768,
+							EndPos:    3776,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -10978,8 +10610,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 188,
 								EndLine:   188,
-								StartPos:  4082,
-								EndPos:    4084,
+								StartPos:  3773,
+								EndPos:    3775,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -10987,8 +10619,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 188,
 									EndLine:   188,
-									StartPos:  4082,
-									EndPos:    4084,
+									StartPos:  3773,
+									EndPos:    3775,
 								},
 							},
 							Value: []byte("$a"),
@@ -11001,8 +10633,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 189,
 						EndLine:   189,
-						StartPos:  4089,
-						EndPos:    4094,
+						StartPos:  3778,
+						EndPos:    3783,
 					},
 				},
 				Expr: &ast.ExprExit{
@@ -11010,11 +10642,10 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 189,
 							EndLine:   189,
-							StartPos:  4089,
-							EndPos:    4093,
+							StartPos:  3778,
+							EndPos:    3782,
 						},
 					},
-					Die: false,
 				},
 			},
 			&ast.StmtExpression{
@@ -11022,8 +10653,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 190,
 						EndLine:   190,
-						StartPos:  4097,
-						EndPos:    4106,
+						StartPos:  3784,
+						EndPos:    3793,
 					},
 				},
 				Expr: &ast.ExprExit{
@@ -11031,18 +10662,17 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 190,
 							EndLine:   190,
-							StartPos:  4097,
-							EndPos:    4105,
+							StartPos:  3784,
+							EndPos:    3792,
 						},
 					},
-					Die: false,
 					Expr: &ast.ExprVariable{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 190,
 								EndLine:   190,
-								StartPos:  4102,
-								EndPos:    4104,
+								StartPos:  3789,
+								EndPos:    3791,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11050,8 +10680,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 190,
 									EndLine:   190,
-									StartPos:  4102,
-									EndPos:    4104,
+									StartPos:  3789,
+									EndPos:    3791,
 								},
 							},
 							Value: []byte("$a"),
@@ -11064,8 +10694,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 191,
 						EndLine:   191,
-						StartPos:  4109,
-						EndPos:    4115,
+						StartPos:  3794,
+						EndPos:    3800,
 					},
 				},
 				Expr: &ast.ExprExit{
@@ -11073,8 +10703,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 191,
 							EndLine:   191,
-							StartPos:  4109,
-							EndPos:    4114,
+							StartPos:  3794,
+							EndPos:    3799,
 						},
 					},
 					Die: true,
@@ -11085,8 +10715,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 192,
 						EndLine:   192,
-						StartPos:  4118,
-						EndPos:    4126,
+						StartPos:  3801,
+						EndPos:    3809,
 					},
 				},
 				Expr: &ast.ExprExit{
@@ -11094,8 +10724,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 192,
 							EndLine:   192,
-							StartPos:  4118,
-							EndPos:    4125,
+							StartPos:  3801,
+							EndPos:    3808,
 						},
 					},
 					Die: true,
@@ -11104,8 +10734,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 192,
 								EndLine:   192,
-								StartPos:  4122,
-								EndPos:    4124,
+								StartPos:  3805,
+								EndPos:    3807,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11113,8 +10743,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 192,
 									EndLine:   192,
-									StartPos:  4122,
-									EndPos:    4124,
+									StartPos:  3805,
+									EndPos:    3807,
 								},
 							},
 							Value: []byte("$a"),
@@ -11127,8 +10757,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 193,
 						EndLine:   193,
-						StartPos:  4129,
-						EndPos:    4135,
+						StartPos:  3810,
+						EndPos:    3816,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -11136,8 +10766,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 193,
 							EndLine:   193,
-							StartPos:  4129,
-							EndPos:    4134,
+							StartPos:  3810,
+							EndPos:    3815,
 						},
 					},
 					Function: &ast.NameName{
@@ -11145,8 +10775,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 193,
 								EndLine:   193,
-								StartPos:  4129,
-								EndPos:    4132,
+								StartPos:  3810,
+								EndPos:    3813,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11155,8 +10785,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 193,
 										EndLine:   193,
-										StartPos:  4129,
-										EndPos:    4132,
+										StartPos:  3810,
+										EndPos:    3813,
 									},
 								},
 								Value: []byte("foo"),
@@ -11168,8 +10798,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 193,
 								EndLine:   193,
-								StartPos:  4132,
-								EndPos:    4134,
+								StartPos:  3813,
+								EndPos:    3815,
 							},
 						},
 					},
@@ -11180,8 +10810,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 194,
 						EndLine:   194,
-						StartPos:  4138,
-						EndPos:    4157,
+						StartPos:  3817,
+						EndPos:    3836,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -11189,8 +10819,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 194,
 							EndLine:   194,
-							StartPos:  4138,
-							EndPos:    4156,
+							StartPos:  3817,
+							EndPos:    3835,
 						},
 					},
 					Function: &ast.NameRelative{
@@ -11198,8 +10828,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 194,
 								EndLine:   194,
-								StartPos:  4138,
-								EndPos:    4151,
+								StartPos:  3817,
+								EndPos:    3830,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11208,8 +10838,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 194,
 										EndLine:   194,
-										StartPos:  4148,
-										EndPos:    4151,
+										StartPos:  3827,
+										EndPos:    3830,
 									},
 								},
 								Value: []byte("foo"),
@@ -11221,8 +10851,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 194,
 								EndLine:   194,
-								StartPos:  4151,
-								EndPos:    4156,
+								StartPos:  3830,
+								EndPos:    3835,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -11231,19 +10861,18 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 194,
 										EndLine:   194,
-										StartPos:  4153,
-										EndPos:    4155,
+										StartPos:  3832,
+										EndPos:    3834,
 									},
 								},
-								Variadic:    false,
 								IsReference: true,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 194,
 											EndLine:   194,
-											StartPos:  4153,
-											EndPos:    4155,
+											StartPos:  3832,
+											EndPos:    3834,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -11251,8 +10880,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 194,
 												EndLine:   194,
-												StartPos:  4153,
-												EndPos:    4155,
+												StartPos:  3832,
+												EndPos:    3834,
 											},
 										},
 										Value: []byte("$a"),
@@ -11268,8 +10897,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 195,
 						EndLine:   195,
-						StartPos:  4160,
-						EndPos:    4169,
+						StartPos:  3837,
+						EndPos:    3846,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -11277,8 +10906,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 195,
 							EndLine:   195,
-							StartPos:  4160,
-							EndPos:    4168,
+							StartPos:  3837,
+							EndPos:    3845,
 						},
 					},
 					Function: &ast.NameFullyQualified{
@@ -11286,8 +10915,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 195,
 								EndLine:   195,
-								StartPos:  4160,
-								EndPos:    4164,
+								StartPos:  3837,
+								EndPos:    3841,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11296,8 +10925,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 195,
 										EndLine:   195,
-										StartPos:  4161,
-										EndPos:    4164,
+										StartPos:  3838,
+										EndPos:    3841,
 									},
 								},
 								Value: []byte("foo"),
@@ -11309,8 +10938,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 195,
 								EndLine:   195,
-								StartPos:  4164,
-								EndPos:    4168,
+								StartPos:  3841,
+								EndPos:    3845,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -11319,19 +10948,17 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 195,
 										EndLine:   195,
-										StartPos:  4165,
-										EndPos:    4167,
+										StartPos:  3842,
+										EndPos:    3844,
 									},
 								},
-								Variadic:    false,
-								IsReference: false,
 								Expr: &ast.ExprShortArray{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 195,
 											EndLine:   195,
-											StartPos:  4165,
-											EndPos:    4167,
+											StartPos:  3842,
+											EndPos:    3844,
 										},
 									},
 									Items: []ast.Vertex{},
@@ -11346,8 +10973,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 196,
 						EndLine:   196,
-						StartPos:  4172,
-						EndPos:    4187,
+						StartPos:  3847,
+						EndPos:    3862,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -11355,8 +10982,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 196,
 							EndLine:   196,
-							StartPos:  4172,
-							EndPos:    4186,
+							StartPos:  3847,
+							EndPos:    3861,
 						},
 					},
 					Function: &ast.ExprVariable{
@@ -11364,8 +10991,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 196,
 								EndLine:   196,
-								StartPos:  4172,
-								EndPos:    4176,
+								StartPos:  3847,
+								EndPos:    3851,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11373,8 +11000,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 196,
 									EndLine:   196,
-									StartPos:  4172,
-									EndPos:    4176,
+									StartPos:  3847,
+									EndPos:    3851,
 								},
 							},
 							Value: []byte("$foo"),
@@ -11385,8 +11012,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 196,
 								EndLine:   196,
-								StartPos:  4176,
-								EndPos:    4186,
+								StartPos:  3851,
+								EndPos:    3861,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -11395,19 +11022,17 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 196,
 										EndLine:   196,
-										StartPos:  4177,
-										EndPos:    4185,
+										StartPos:  3852,
+										EndPos:    3860,
 									},
 								},
-								IsReference: false,
-								Variadic:    false,
 								Expr: &ast.ExprYield{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 196,
 											EndLine:   196,
-											StartPos:  4177,
-											EndPos:    4185,
+											StartPos:  3852,
+											EndPos:    3860,
 										},
 									},
 									Value: &ast.ExprVariable{
@@ -11415,8 +11040,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 196,
 												EndLine:   196,
-												StartPos:  4183,
-												EndPos:    4185,
+												StartPos:  3858,
+												EndPos:    3860,
 											},
 										},
 										VarName: &ast.Identifier{
@@ -11424,8 +11049,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 196,
 													EndLine:   196,
-													StartPos:  4183,
-													EndPos:    4185,
+													StartPos:  3858,
+													EndPos:    3860,
 												},
 											},
 											Value: []byte("$a"),
@@ -11442,8 +11067,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 198,
 						EndLine:   198,
-						StartPos:  4191,
-						EndPos:    4196,
+						StartPos:  3864,
+						EndPos:    3869,
 					},
 				},
 				Expr: &ast.ExprPostDec{
@@ -11451,8 +11076,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 198,
 							EndLine:   198,
-							StartPos:  4191,
-							EndPos:    4195,
+							StartPos:  3864,
+							EndPos:    3868,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -11460,8 +11085,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 198,
 								EndLine:   198,
-								StartPos:  4191,
-								EndPos:    4193,
+								StartPos:  3864,
+								EndPos:    3866,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11469,8 +11094,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 198,
 									EndLine:   198,
-									StartPos:  4191,
-									EndPos:    4193,
+									StartPos:  3864,
+									EndPos:    3866,
 								},
 							},
 							Value: []byte("$a"),
@@ -11483,8 +11108,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 199,
 						EndLine:   199,
-						StartPos:  4199,
-						EndPos:    4204,
+						StartPos:  3870,
+						EndPos:    3875,
 					},
 				},
 				Expr: &ast.ExprPostInc{
@@ -11492,8 +11117,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 199,
 							EndLine:   199,
-							StartPos:  4199,
-							EndPos:    4203,
+							StartPos:  3870,
+							EndPos:    3874,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -11501,8 +11126,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 199,
 								EndLine:   199,
-								StartPos:  4199,
-								EndPos:    4201,
+								StartPos:  3870,
+								EndPos:    3872,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11510,8 +11135,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 199,
 									EndLine:   199,
-									StartPos:  4199,
-									EndPos:    4201,
+									StartPos:  3870,
+									EndPos:    3872,
 								},
 							},
 							Value: []byte("$a"),
@@ -11524,8 +11149,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 200,
 						EndLine:   200,
-						StartPos:  4207,
-						EndPos:    4212,
+						StartPos:  3876,
+						EndPos:    3881,
 					},
 				},
 				Expr: &ast.ExprPreDec{
@@ -11533,8 +11158,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 200,
 							EndLine:   200,
-							StartPos:  4207,
-							EndPos:    4211,
+							StartPos:  3876,
+							EndPos:    3880,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -11542,8 +11167,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 200,
 								EndLine:   200,
-								StartPos:  4209,
-								EndPos:    4211,
+								StartPos:  3878,
+								EndPos:    3880,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11551,8 +11176,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 200,
 									EndLine:   200,
-									StartPos:  4209,
-									EndPos:    4211,
+									StartPos:  3878,
+									EndPos:    3880,
 								},
 							},
 							Value: []byte("$a"),
@@ -11565,8 +11190,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 201,
 						EndLine:   201,
-						StartPos:  4215,
-						EndPos:    4220,
+						StartPos:  3882,
+						EndPos:    3887,
 					},
 				},
 				Expr: &ast.ExprPreInc{
@@ -11574,8 +11199,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 201,
 							EndLine:   201,
-							StartPos:  4215,
-							EndPos:    4219,
+							StartPos:  3882,
+							EndPos:    3886,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -11583,8 +11208,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 201,
 								EndLine:   201,
-								StartPos:  4217,
-								EndPos:    4219,
+								StartPos:  3884,
+								EndPos:    3886,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11592,8 +11217,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 201,
 									EndLine:   201,
-									StartPos:  4217,
-									EndPos:    4219,
+									StartPos:  3884,
+									EndPos:    3886,
 								},
 							},
 							Value: []byte("$a"),
@@ -11606,8 +11231,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 203,
 						EndLine:   203,
-						StartPos:  4224,
-						EndPos:    4235,
+						StartPos:  3889,
+						EndPos:    3900,
 					},
 				},
 				Expr: &ast.ExprInclude{
@@ -11615,8 +11240,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 203,
 							EndLine:   203,
-							StartPos:  4224,
-							EndPos:    4234,
+							StartPos:  3889,
+							EndPos:    3899,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -11624,8 +11249,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 203,
 								EndLine:   203,
-								StartPos:  4232,
-								EndPos:    4234,
+								StartPos:  3897,
+								EndPos:    3899,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11633,8 +11258,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 203,
 									EndLine:   203,
-									StartPos:  4232,
-									EndPos:    4234,
+									StartPos:  3897,
+									EndPos:    3899,
 								},
 							},
 							Value: []byte("$a"),
@@ -11647,8 +11272,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 204,
 						EndLine:   204,
-						StartPos:  4238,
-						EndPos:    4254,
+						StartPos:  3901,
+						EndPos:    3917,
 					},
 				},
 				Expr: &ast.ExprIncludeOnce{
@@ -11656,8 +11281,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 204,
 							EndLine:   204,
-							StartPos:  4238,
-							EndPos:    4253,
+							StartPos:  3901,
+							EndPos:    3916,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -11665,8 +11290,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 204,
 								EndLine:   204,
-								StartPos:  4251,
-								EndPos:    4253,
+								StartPos:  3914,
+								EndPos:    3916,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11674,8 +11299,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 204,
 									EndLine:   204,
-									StartPos:  4251,
-									EndPos:    4253,
+									StartPos:  3914,
+									EndPos:    3916,
 								},
 							},
 							Value: []byte("$a"),
@@ -11688,8 +11313,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 205,
 						EndLine:   205,
-						StartPos:  4257,
-						EndPos:    4268,
+						StartPos:  3918,
+						EndPos:    3929,
 					},
 				},
 				Expr: &ast.ExprRequire{
@@ -11697,8 +11322,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 205,
 							EndLine:   205,
-							StartPos:  4257,
-							EndPos:    4267,
+							StartPos:  3918,
+							EndPos:    3928,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -11706,8 +11331,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 205,
 								EndLine:   205,
-								StartPos:  4265,
-								EndPos:    4267,
+								StartPos:  3926,
+								EndPos:    3928,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11715,8 +11340,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 205,
 									EndLine:   205,
-									StartPos:  4265,
-									EndPos:    4267,
+									StartPos:  3926,
+									EndPos:    3928,
 								},
 							},
 							Value: []byte("$a"),
@@ -11729,8 +11354,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 206,
 						EndLine:   206,
-						StartPos:  4271,
-						EndPos:    4287,
+						StartPos:  3930,
+						EndPos:    3946,
 					},
 				},
 				Expr: &ast.ExprRequireOnce{
@@ -11738,8 +11363,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 206,
 							EndLine:   206,
-							StartPos:  4271,
-							EndPos:    4286,
+							StartPos:  3930,
+							EndPos:    3945,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -11747,8 +11372,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 206,
 								EndLine:   206,
-								StartPos:  4284,
-								EndPos:    4286,
+								StartPos:  3943,
+								EndPos:    3945,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11756,8 +11381,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 206,
 									EndLine:   206,
-									StartPos:  4284,
-									EndPos:    4286,
+									StartPos:  3943,
+									EndPos:    3945,
 								},
 							},
 							Value: []byte("$a"),
@@ -11770,8 +11395,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 208,
 						EndLine:   208,
-						StartPos:  4291,
-						EndPos:    4309,
+						StartPos:  3948,
+						EndPos:    3966,
 					},
 				},
 				Expr: &ast.ExprInstanceOf{
@@ -11779,8 +11404,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 208,
 							EndLine:   208,
-							StartPos:  4291,
-							EndPos:    4308,
+							StartPos:  3948,
+							EndPos:    3965,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -11788,8 +11413,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 208,
 								EndLine:   208,
-								StartPos:  4291,
-								EndPos:    4293,
+								StartPos:  3948,
+								EndPos:    3950,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11797,8 +11422,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 208,
 									EndLine:   208,
-									StartPos:  4291,
-									EndPos:    4293,
+									StartPos:  3948,
+									EndPos:    3950,
 								},
 							},
 							Value: []byte("$a"),
@@ -11809,8 +11434,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 208,
 								EndLine:   208,
-								StartPos:  4305,
-								EndPos:    4308,
+								StartPos:  3962,
+								EndPos:    3965,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11819,8 +11444,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 208,
 										EndLine:   208,
-										StartPos:  4305,
-										EndPos:    4308,
+										StartPos:  3962,
+										EndPos:    3965,
 									},
 								},
 								Value: []byte("Foo"),
@@ -11834,8 +11459,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 209,
 						EndLine:   209,
-						StartPos:  4312,
-						EndPos:    4340,
+						StartPos:  3967,
+						EndPos:    3995,
 					},
 				},
 				Expr: &ast.ExprInstanceOf{
@@ -11843,8 +11468,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 209,
 							EndLine:   209,
-							StartPos:  4312,
-							EndPos:    4339,
+							StartPos:  3967,
+							EndPos:    3994,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -11852,8 +11477,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 209,
 								EndLine:   209,
-								StartPos:  4312,
-								EndPos:    4314,
+								StartPos:  3967,
+								EndPos:    3969,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11861,8 +11486,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 209,
 									EndLine:   209,
-									StartPos:  4312,
-									EndPos:    4314,
+									StartPos:  3967,
+									EndPos:    3969,
 								},
 							},
 							Value: []byte("$a"),
@@ -11873,8 +11498,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 209,
 								EndLine:   209,
-								StartPos:  4326,
-								EndPos:    4339,
+								StartPos:  3981,
+								EndPos:    3994,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11883,8 +11508,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 209,
 										EndLine:   209,
-										StartPos:  4336,
-										EndPos:    4339,
+										StartPos:  3991,
+										EndPos:    3994,
 									},
 								},
 								Value: []byte("Foo"),
@@ -11898,8 +11523,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 210,
 						EndLine:   210,
-						StartPos:  4343,
-						EndPos:    4362,
+						StartPos:  3996,
+						EndPos:    4015,
 					},
 				},
 				Expr: &ast.ExprInstanceOf{
@@ -11907,8 +11532,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 210,
 							EndLine:   210,
-							StartPos:  4343,
-							EndPos:    4361,
+							StartPos:  3996,
+							EndPos:    4014,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -11916,8 +11541,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 210,
 								EndLine:   210,
-								StartPos:  4343,
-								EndPos:    4345,
+								StartPos:  3996,
+								EndPos:    3998,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11925,8 +11550,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 210,
 									EndLine:   210,
-									StartPos:  4343,
-									EndPos:    4345,
+									StartPos:  3996,
+									EndPos:    3998,
 								},
 							},
 							Value: []byte("$a"),
@@ -11937,8 +11562,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 210,
 								EndLine:   210,
-								StartPos:  4357,
-								EndPos:    4361,
+								StartPos:  4010,
+								EndPos:    4014,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11947,8 +11572,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 210,
 										EndLine:   210,
-										StartPos:  4358,
-										EndPos:    4361,
+										StartPos:  4011,
+										EndPos:    4014,
 									},
 								},
 								Value: []byte("Foo"),
@@ -11962,8 +11587,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 212,
 						EndLine:   212,
-						StartPos:  4366,
-						EndPos:    4380,
+						StartPos:  4017,
+						EndPos:    4031,
 					},
 				},
 				Expr: &ast.ExprIsset{
@@ -11971,8 +11596,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 212,
 							EndLine:   212,
-							StartPos:  4366,
-							EndPos:    4379,
+							StartPos:  4017,
+							EndPos:    4030,
 						},
 					},
 					Vars: []ast.Vertex{
@@ -11981,8 +11606,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 212,
 									EndLine:   212,
-									StartPos:  4372,
-									EndPos:    4374,
+									StartPos:  4023,
+									EndPos:    4025,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -11990,8 +11615,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 212,
 										EndLine:   212,
-										StartPos:  4372,
-										EndPos:    4374,
+										StartPos:  4023,
+										EndPos:    4025,
 									},
 								},
 								Value: []byte("$a"),
@@ -12002,8 +11627,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 212,
 									EndLine:   212,
-									StartPos:  4376,
-									EndPos:    4378,
+									StartPos:  4027,
+									EndPos:    4029,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -12011,8 +11636,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 212,
 										EndLine:   212,
-										StartPos:  4376,
-										EndPos:    4378,
+										StartPos:  4027,
+										EndPos:    4029,
 									},
 								},
 								Value: []byte("$b"),
@@ -12026,8 +11651,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 213,
 						EndLine:   213,
-						StartPos:  4383,
-						EndPos:    4394,
+						StartPos:  4032,
+						EndPos:    4043,
 					},
 				},
 				Expr: &ast.ExprIsset{
@@ -12035,8 +11660,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 213,
 							EndLine:   213,
-							StartPos:  4383,
-							EndPos:    4393,
+							StartPos:  4032,
+							EndPos:    4042,
 						},
 					},
 					Vars: []ast.Vertex{
@@ -12045,8 +11670,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 213,
 									EndLine:   213,
-									StartPos:  4389,
-									EndPos:    4392,
+									StartPos:  4038,
+									EndPos:    4041,
 								},
 							},
 							Const: &ast.NameName{
@@ -12054,8 +11679,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 213,
 										EndLine:   213,
-										StartPos:  4389,
-										EndPos:    4392,
+										StartPos:  4038,
+										EndPos:    4041,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -12064,8 +11689,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 213,
 												EndLine:   213,
-												StartPos:  4389,
-												EndPos:    4392,
+												StartPos:  4038,
+												EndPos:    4041,
 											},
 										},
 										Value: []byte("Foo"),
@@ -12081,8 +11706,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 214,
 						EndLine:   214,
-						StartPos:  4397,
-						EndPos:    4409,
+						StartPos:  4044,
+						EndPos:    4056,
 					},
 				},
 				Expr: &ast.ExprAssign{
@@ -12090,8 +11715,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 214,
 							EndLine:   214,
-							StartPos:  4397,
-							EndPos:    4408,
+							StartPos:  4044,
+							EndPos:    4055,
 						},
 					},
 					Var: &ast.ExprList{
@@ -12099,8 +11724,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 214,
 								EndLine:   214,
-								StartPos:  4397,
-								EndPos:    4403,
+								StartPos:  4044,
+								EndPos:    4050,
 							},
 						},
 						Items: []ast.Vertex{},
@@ -12110,8 +11735,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 214,
 								EndLine:   214,
-								StartPos:  4406,
-								EndPos:    4408,
+								StartPos:  4053,
+								EndPos:    4055,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12119,8 +11744,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 214,
 									EndLine:   214,
-									StartPos:  4406,
-									EndPos:    4408,
+									StartPos:  4053,
+									EndPos:    4055,
 								},
 							},
 							Value: []byte("$b"),
@@ -12133,8 +11758,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 215,
 						EndLine:   215,
-						StartPos:  4412,
-						EndPos:    4430,
+						StartPos:  4057,
+						EndPos:    4075,
 					},
 				},
 				Expr: &ast.ExprAssign{
@@ -12142,8 +11767,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 215,
 							EndLine:   215,
-							StartPos:  4412,
-							EndPos:    4429,
+							StartPos:  4057,
+							EndPos:    4074,
 						},
 					},
 					Var: &ast.ExprList{
@@ -12151,8 +11776,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 215,
 								EndLine:   215,
-								StartPos:  4412,
-								EndPos:    4424,
+								StartPos:  4057,
+								EndPos:    4069,
 							},
 						},
 						Items: []ast.Vertex{
@@ -12161,8 +11786,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 215,
 										EndLine:   215,
-										StartPos:  4417,
-										EndPos:    4419,
+										StartPos:  4062,
+										EndPos:    4064,
 									},
 								},
 								Val: &ast.ExprVariable{
@@ -12170,8 +11795,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 215,
 											EndLine:   215,
-											StartPos:  4417,
-											EndPos:    4419,
+											StartPos:  4062,
+											EndPos:    4064,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -12179,8 +11804,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 215,
 												EndLine:   215,
-												StartPos:  4417,
-												EndPos:    4419,
+												StartPos:  4062,
+												EndPos:    4064,
 											},
 										},
 										Value: []byte("$a"),
@@ -12192,8 +11817,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 215,
 										EndLine:   215,
-										StartPos:  4421,
-										EndPos:    4423,
+										StartPos:  4066,
+										EndPos:    4068,
 									},
 								},
 								Val: &ast.ExprVariable{
@@ -12201,8 +11826,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 215,
 											EndLine:   215,
-											StartPos:  4421,
-											EndPos:    4423,
+											StartPos:  4066,
+											EndPos:    4068,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -12210,8 +11835,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 215,
 												EndLine:   215,
-												StartPos:  4421,
-												EndPos:    4423,
+												StartPos:  4066,
+												EndPos:    4068,
 											},
 										},
 										Value: []byte("$b"),
@@ -12225,8 +11850,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 215,
 								EndLine:   215,
-								StartPos:  4427,
-								EndPos:    4429,
+								StartPos:  4072,
+								EndPos:    4074,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12234,8 +11859,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 215,
 									EndLine:   215,
-									StartPos:  4427,
-									EndPos:    4429,
+									StartPos:  4072,
+									EndPos:    4074,
 								},
 							},
 							Value: []byte("$b"),
@@ -12248,8 +11873,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 216,
 						EndLine:   216,
-						StartPos:  4433,
-						EndPos:    4449,
+						StartPos:  4076,
+						EndPos:    4092,
 					},
 				},
 				Expr: &ast.ExprAssign{
@@ -12257,8 +11882,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 216,
 							EndLine:   216,
-							StartPos:  4433,
-							EndPos:    4448,
+							StartPos:  4076,
+							EndPos:    4091,
 						},
 					},
 					Var: &ast.ExprList{
@@ -12266,8 +11891,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 216,
 								EndLine:   216,
-								StartPos:  4433,
-								EndPos:    4443,
+								StartPos:  4076,
+								EndPos:    4086,
 							},
 						},
 						Items: []ast.Vertex{
@@ -12276,8 +11901,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 216,
 										EndLine:   216,
-										StartPos:  4438,
-										EndPos:    4442,
+										StartPos:  4081,
+										EndPos:    4085,
 									},
 								},
 								Val: &ast.ExprArrayDimFetch{
@@ -12285,8 +11910,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 216,
 											EndLine:   216,
-											StartPos:  4438,
-											EndPos:    4442,
+											StartPos:  4081,
+											EndPos:    4085,
 										},
 									},
 									Var: &ast.ExprVariable{
@@ -12294,8 +11919,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 216,
 												EndLine:   216,
-												StartPos:  4438,
-												EndPos:    4440,
+												StartPos:  4081,
+												EndPos:    4083,
 											},
 										},
 										VarName: &ast.Identifier{
@@ -12303,8 +11928,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 216,
 													EndLine:   216,
-													StartPos:  4438,
-													EndPos:    4440,
+													StartPos:  4081,
+													EndPos:    4083,
 												},
 											},
 											Value: []byte("$a"),
@@ -12319,8 +11944,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 216,
 								EndLine:   216,
-								StartPos:  4446,
-								EndPos:    4448,
+								StartPos:  4089,
+								EndPos:    4091,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12328,8 +11953,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 216,
 									EndLine:   216,
-									StartPos:  4446,
-									EndPos:    4448,
+									StartPos:  4089,
+									EndPos:    4091,
 								},
 							},
 							Value: []byte("$b"),
@@ -12342,8 +11967,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 217,
 						EndLine:   217,
-						StartPos:  4452,
-						EndPos:    4472,
+						StartPos:  4093,
+						EndPos:    4113,
 					},
 				},
 				Expr: &ast.ExprAssign{
@@ -12351,8 +11976,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 217,
 							EndLine:   217,
-							StartPos:  4452,
-							EndPos:    4471,
+							StartPos:  4093,
+							EndPos:    4112,
 						},
 					},
 					Var: &ast.ExprList{
@@ -12360,8 +11985,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 217,
 								EndLine:   217,
-								StartPos:  4452,
-								EndPos:    4466,
+								StartPos:  4093,
+								EndPos:    4107,
 							},
 						},
 						Items: []ast.Vertex{
@@ -12370,8 +11995,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 217,
 										EndLine:   217,
-										StartPos:  4457,
-										EndPos:    4465,
+										StartPos:  4098,
+										EndPos:    4106,
 									},
 								},
 								Val: &ast.ExprList{
@@ -12379,8 +12004,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 217,
 											EndLine:   217,
-											StartPos:  4457,
-											EndPos:    4465,
+											StartPos:  4098,
+											EndPos:    4106,
 										},
 									},
 									Items: []ast.Vertex{
@@ -12389,8 +12014,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 217,
 													EndLine:   217,
-													StartPos:  4462,
-													EndPos:    4464,
+													StartPos:  4103,
+													EndPos:    4105,
 												},
 											},
 											Val: &ast.ExprVariable{
@@ -12398,8 +12023,8 @@ func TestPhp5(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 217,
 														EndLine:   217,
-														StartPos:  4462,
-														EndPos:    4464,
+														StartPos:  4103,
+														EndPos:    4105,
 													},
 												},
 												VarName: &ast.Identifier{
@@ -12407,8 +12032,8 @@ func TestPhp5(t *testing.T) {
 														Position: &position.Position{
 															StartLine: 217,
 															EndLine:   217,
-															StartPos:  4462,
-															EndPos:    4464,
+															StartPos:  4103,
+															EndPos:    4105,
 														},
 													},
 													Value: []byte("$a"),
@@ -12425,8 +12050,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 217,
 								EndLine:   217,
-								StartPos:  4469,
-								EndPos:    4471,
+								StartPos:  4110,
+								EndPos:    4112,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12434,8 +12059,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 217,
 									EndLine:   217,
-									StartPos:  4469,
-									EndPos:    4471,
+									StartPos:  4110,
+									EndPos:    4112,
 								},
 							},
 							Value: []byte("$b"),
@@ -12448,8 +12073,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 219,
 						EndLine:   219,
-						StartPos:  4476,
-						EndPos:    4486,
+						StartPos:  4115,
+						EndPos:    4125,
 					},
 				},
 				Expr: &ast.ExprMethodCall{
@@ -12457,8 +12082,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 219,
 							EndLine:   219,
-							StartPos:  4476,
-							EndPos:    4485,
+							StartPos:  4115,
+							EndPos:    4124,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -12466,8 +12091,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 219,
 								EndLine:   219,
-								StartPos:  4476,
-								EndPos:    4478,
+								StartPos:  4115,
+								EndPos:    4117,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12475,8 +12100,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 219,
 									EndLine:   219,
-									StartPos:  4476,
-									EndPos:    4478,
+									StartPos:  4115,
+									EndPos:    4117,
 								},
 							},
 							Value: []byte("$a"),
@@ -12487,8 +12112,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 219,
 								EndLine:   219,
-								StartPos:  4480,
-								EndPos:    4483,
+								StartPos:  4119,
+								EndPos:    4122,
 							},
 						},
 						Value: []byte("foo"),
@@ -12498,8 +12123,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 219,
 								EndLine:   219,
-								StartPos:  4483,
-								EndPos:    4485,
+								StartPos:  4122,
+								EndPos:    4124,
 							},
 						},
 					},
@@ -12510,8 +12135,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 220,
 						EndLine:   220,
-						StartPos:  4489,
-						EndPos:    4497,
+						StartPos:  4126,
+						EndPos:    4134,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -12519,8 +12144,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 220,
 							EndLine:   220,
-							StartPos:  4489,
-							EndPos:    4496,
+							StartPos:  4126,
+							EndPos:    4133,
 						},
 					},
 					Class: &ast.NameName{
@@ -12528,8 +12153,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 220,
 								EndLine:   220,
-								StartPos:  4493,
-								EndPos:    4496,
+								StartPos:  4130,
+								EndPos:    4133,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -12538,8 +12163,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 220,
 										EndLine:   220,
-										StartPos:  4493,
-										EndPos:    4496,
+										StartPos:  4130,
+										EndPos:    4133,
 									},
 								},
 								Value: []byte("Foo"),
@@ -12553,8 +12178,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 221,
 						EndLine:   221,
-						StartPos:  4500,
-						EndPos:    4520,
+						StartPos:  4135,
+						EndPos:    4155,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -12562,8 +12187,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 221,
 							EndLine:   221,
-							StartPos:  4500,
-							EndPos:    4519,
+							StartPos:  4135,
+							EndPos:    4154,
 						},
 					},
 					Class: &ast.NameRelative{
@@ -12571,8 +12196,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 221,
 								EndLine:   221,
-								StartPos:  4504,
-								EndPos:    4517,
+								StartPos:  4139,
+								EndPos:    4152,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -12581,8 +12206,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 221,
 										EndLine:   221,
-										StartPos:  4514,
-										EndPos:    4517,
+										StartPos:  4149,
+										EndPos:    4152,
 									},
 								},
 								Value: []byte("Foo"),
@@ -12594,8 +12219,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 221,
 								EndLine:   221,
-								StartPos:  4517,
-								EndPos:    4519,
+								StartPos:  4152,
+								EndPos:    4154,
 							},
 						},
 					},
@@ -12606,8 +12231,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 222,
 						EndLine:   222,
-						StartPos:  4523,
-						EndPos:    4534,
+						StartPos:  4156,
+						EndPos:    4167,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -12615,8 +12240,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 222,
 							EndLine:   222,
-							StartPos:  4523,
-							EndPos:    4533,
+							StartPos:  4156,
+							EndPos:    4166,
 						},
 					},
 					Class: &ast.NameFullyQualified{
@@ -12624,8 +12249,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 222,
 								EndLine:   222,
-								StartPos:  4527,
-								EndPos:    4531,
+								StartPos:  4160,
+								EndPos:    4164,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -12634,8 +12259,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 222,
 										EndLine:   222,
-										StartPos:  4528,
-										EndPos:    4531,
+										StartPos:  4161,
+										EndPos:    4164,
 									},
 								},
 								Value: []byte("Foo"),
@@ -12647,8 +12272,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 222,
 								EndLine:   222,
-								StartPos:  4531,
-								EndPos:    4533,
+								StartPos:  4164,
+								EndPos:    4166,
 							},
 						},
 					},
@@ -12659,8 +12284,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 223,
 						EndLine:   223,
-						StartPos:  4537,
-						EndPos:    4547,
+						StartPos:  4168,
+						EndPos:    4178,
 					},
 				},
 				Expr: &ast.ExprPrint{
@@ -12668,8 +12293,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 223,
 							EndLine:   223,
-							StartPos:  4537,
-							EndPos:    4545,
+							StartPos:  4168,
+							EndPos:    4176,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -12677,8 +12302,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 223,
 								EndLine:   223,
-								StartPos:  4543,
-								EndPos:    4545,
+								StartPos:  4174,
+								EndPos:    4176,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12686,8 +12311,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 223,
 									EndLine:   223,
-									StartPos:  4543,
-									EndPos:    4545,
+									StartPos:  4174,
+									EndPos:    4176,
 								},
 							},
 							Value: []byte("$a"),
@@ -12700,8 +12325,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 224,
 						EndLine:   224,
-						StartPos:  4550,
-						EndPos:    4558,
+						StartPos:  4179,
+						EndPos:    4187,
 					},
 				},
 				Expr: &ast.ExprPropertyFetch{
@@ -12709,8 +12334,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 224,
 							EndLine:   224,
-							StartPos:  4550,
-							EndPos:    4557,
+							StartPos:  4179,
+							EndPos:    4186,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -12718,8 +12343,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 224,
 								EndLine:   224,
-								StartPos:  4550,
-								EndPos:    4552,
+								StartPos:  4179,
+								EndPos:    4181,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12727,8 +12352,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 224,
 									EndLine:   224,
-									StartPos:  4550,
-									EndPos:    4552,
+									StartPos:  4179,
+									EndPos:    4181,
 								},
 							},
 							Value: []byte("$a"),
@@ -12739,8 +12364,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 224,
 								EndLine:   224,
-								StartPos:  4554,
-								EndPos:    4557,
+								StartPos:  4183,
+								EndPos:    4186,
 							},
 						},
 						Value: []byte("foo"),
@@ -12752,8 +12377,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 225,
 						EndLine:   225,
-						StartPos:  4561,
-						EndPos:    4572,
+						StartPos:  4188,
+						EndPos:    4199,
 					},
 				},
 				Expr: &ast.ExprArrayDimFetch{
@@ -12761,8 +12386,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 225,
 							EndLine:   225,
-							StartPos:  4561,
-							EndPos:    4570,
+							StartPos:  4188,
+							EndPos:    4197,
 						},
 					},
 					Var: &ast.ExprPropertyFetch{
@@ -12770,8 +12395,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 225,
 								EndLine:   225,
-								StartPos:  4561,
-								EndPos:    4568,
+								StartPos:  4188,
+								EndPos:    4195,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -12779,8 +12404,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 225,
 									EndLine:   225,
-									StartPos:  4561,
-									EndPos:    4563,
+									StartPos:  4188,
+									EndPos:    4190,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -12788,8 +12413,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 225,
 										EndLine:   225,
-										StartPos:  4561,
-										EndPos:    4563,
+										StartPos:  4188,
+										EndPos:    4190,
 									},
 								},
 								Value: []byte("$a"),
@@ -12800,8 +12425,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 225,
 									EndLine:   225,
-									StartPos:  4565,
-									EndPos:    4568,
+									StartPos:  4192,
+									EndPos:    4195,
 								},
 							},
 							Value: []byte("foo"),
@@ -12812,8 +12437,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 225,
 								EndLine:   225,
-								StartPos:  4569,
-								EndPos:    4570,
+								StartPos:  4196,
+								EndPos:    4197,
 							},
 						},
 						Value: []byte("1"),
@@ -12825,8 +12450,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 226,
 						EndLine:   226,
-						StartPos:  4575,
-						EndPos:    4604,
+						StartPos:  4200,
+						EndPos:    4229,
 					},
 				},
 				Expr: &ast.ExprArrayDimFetch{
@@ -12834,8 +12459,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 226,
 							EndLine:   226,
-							StartPos:  4575,
-							EndPos:    4602,
+							StartPos:  4200,
+							EndPos:    4227,
 						},
 					},
 					Var: &ast.ExprPropertyFetch{
@@ -12843,8 +12468,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 226,
 								EndLine:   226,
-								StartPos:  4575,
-								EndPos:    4600,
+								StartPos:  4200,
+								EndPos:    4225,
 							},
 						},
 						Var: &ast.ExprMethodCall{
@@ -12852,8 +12477,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 226,
 									EndLine:   226,
-									StartPos:  4575,
-									EndPos:    4594,
+									StartPos:  4200,
+									EndPos:    4219,
 								},
 							},
 							Var: &ast.ExprPropertyFetch{
@@ -12861,8 +12486,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 226,
 										EndLine:   226,
-										StartPos:  4575,
-										EndPos:    4587,
+										StartPos:  4200,
+										EndPos:    4212,
 									},
 								},
 								Var: &ast.ExprPropertyFetch{
@@ -12870,8 +12495,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 226,
 											EndLine:   226,
-											StartPos:  4575,
-											EndPos:    4582,
+											StartPos:  4200,
+											EndPos:    4207,
 										},
 									},
 									Var: &ast.ExprVariable{
@@ -12879,8 +12504,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 226,
 												EndLine:   226,
-												StartPos:  4575,
-												EndPos:    4577,
+												StartPos:  4200,
+												EndPos:    4202,
 											},
 										},
 										VarName: &ast.Identifier{
@@ -12888,8 +12513,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 226,
 													EndLine:   226,
-													StartPos:  4575,
-													EndPos:    4577,
+													StartPos:  4200,
+													EndPos:    4202,
 												},
 											},
 											Value: []byte("$a"),
@@ -12900,8 +12525,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 226,
 												EndLine:   226,
-												StartPos:  4579,
-												EndPos:    4582,
+												StartPos:  4204,
+												EndPos:    4207,
 											},
 										},
 										Value: []byte("foo"),
@@ -12912,8 +12537,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 226,
 											EndLine:   226,
-											StartPos:  4584,
-											EndPos:    4587,
+											StartPos:  4209,
+											EndPos:    4212,
 										},
 									},
 									Value: []byte("bar"),
@@ -12924,8 +12549,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 226,
 										EndLine:   226,
-										StartPos:  4589,
-										EndPos:    4592,
+										StartPos:  4214,
+										EndPos:    4217,
 									},
 								},
 								Value: []byte("baz"),
@@ -12935,8 +12560,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 226,
 										EndLine:   226,
-										StartPos:  4592,
-										EndPos:    4594,
+										StartPos:  4217,
+										EndPos:    4219,
 									},
 								},
 							},
@@ -12946,8 +12571,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 226,
 									EndLine:   226,
-									StartPos:  4596,
-									EndPos:    4600,
+									StartPos:  4221,
+									EndPos:    4225,
 								},
 							},
 							Value: []byte("quux"),
@@ -12958,8 +12583,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 226,
 								EndLine:   226,
-								StartPos:  4601,
-								EndPos:    4602,
+								StartPos:  4226,
+								EndPos:    4227,
 							},
 						},
 						Value: []byte("0"),
@@ -12971,8 +12596,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 227,
 						EndLine:   227,
-						StartPos:  4607,
-						EndPos:    4623,
+						StartPos:  4230,
+						EndPos:    4246,
 					},
 				},
 				Expr: &ast.ExprArrayDimFetch{
@@ -12980,8 +12605,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 227,
 							EndLine:   227,
-							StartPos:  4607,
-							EndPos:    4621,
+							StartPos:  4230,
+							EndPos:    4244,
 						},
 					},
 					Var: &ast.ExprArrayDimFetch{
@@ -12989,8 +12614,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 227,
 								EndLine:   227,
-								StartPos:  4607,
-								EndPos:    4618,
+								StartPos:  4230,
+								EndPos:    4241,
 							},
 						},
 						Var: &ast.ExprMethodCall{
@@ -12998,8 +12623,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 227,
 									EndLine:   227,
-									StartPos:  4607,
-									EndPos:    4616,
+									StartPos:  4230,
+									EndPos:    4239,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -13007,8 +12632,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 227,
 										EndLine:   227,
-										StartPos:  4607,
-										EndPos:    4609,
+										StartPos:  4230,
+										EndPos:    4232,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -13016,8 +12641,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 227,
 											EndLine:   227,
-											StartPos:  4607,
-											EndPos:    4609,
+											StartPos:  4230,
+											EndPos:    4232,
 										},
 									},
 									Value: []byte("$a"),
@@ -13028,8 +12653,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 227,
 										EndLine:   227,
-										StartPos:  4611,
-										EndPos:    4614,
+										StartPos:  4234,
+										EndPos:    4237,
 									},
 								},
 								Value: []byte("foo"),
@@ -13039,8 +12664,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 227,
 										EndLine:   227,
-										StartPos:  4614,
-										EndPos:    4616,
+										StartPos:  4237,
+										EndPos:    4239,
 									},
 								},
 							},
@@ -13050,8 +12675,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 227,
 									EndLine:   227,
-									StartPos:  4617,
-									EndPos:    4618,
+									StartPos:  4240,
+									EndPos:    4241,
 								},
 							},
 							Value: []byte("1"),
@@ -13062,8 +12687,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 227,
 								EndLine:   227,
-								StartPos:  4620,
-								EndPos:    4621,
+								StartPos:  4243,
+								EndPos:    4244,
 							},
 						},
 						Value: []byte("1"),
@@ -13075,8 +12700,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 228,
 						EndLine:   228,
-						StartPos:  4626,
-						EndPos:    4635,
+						StartPos:  4247,
+						EndPos:    4256,
 					},
 				},
 				Expr: &ast.ExprShellExec{
@@ -13084,8 +12709,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 228,
 							EndLine:   228,
-							StartPos:  4626,
-							EndPos:    4634,
+							StartPos:  4247,
+							EndPos:    4255,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -13094,8 +12719,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 228,
 									EndLine:   228,
-									StartPos:  4627,
-									EndPos:    4631,
+									StartPos:  4248,
+									EndPos:    4252,
 								},
 							},
 							Value: []byte("cmd "),
@@ -13105,8 +12730,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 228,
 									EndLine:   228,
-									StartPos:  4631,
-									EndPos:    4633,
+									StartPos:  4252,
+									EndPos:    4254,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -13114,8 +12739,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 228,
 										EndLine:   228,
-										StartPos:  4631,
-										EndPos:    4633,
+										StartPos:  4252,
+										EndPos:    4254,
 									},
 								},
 								Value: []byte("$a"),
@@ -13129,8 +12754,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 229,
 						EndLine:   229,
-						StartPos:  4638,
-						EndPos:    4644,
+						StartPos:  4257,
+						EndPos:    4263,
 					},
 				},
 				Expr: &ast.ExprShellExec{
@@ -13138,8 +12763,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 229,
 							EndLine:   229,
-							StartPos:  4638,
-							EndPos:    4643,
+							StartPos:  4257,
+							EndPos:    4262,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -13148,8 +12773,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 229,
 									EndLine:   229,
-									StartPos:  4639,
-									EndPos:    4642,
+									StartPos:  4258,
+									EndPos:    4261,
 								},
 							},
 							Value: []byte("cmd"),
@@ -13162,8 +12787,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 230,
 						EndLine:   230,
-						StartPos:  4647,
-						EndPos:    4650,
+						StartPos:  4264,
+						EndPos:    4267,
 					},
 				},
 				Expr: &ast.ExprShellExec{
@@ -13171,8 +12796,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 230,
 							EndLine:   230,
-							StartPos:  4647,
-							EndPos:    4649,
+							StartPos:  4264,
+							EndPos:    4266,
 						},
 					},
 					Parts: []ast.Vertex{},
@@ -13183,8 +12808,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 231,
 						EndLine:   231,
-						StartPos:  4653,
-						EndPos:    4656,
+						StartPos:  4268,
+						EndPos:    4271,
 					},
 				},
 				Expr: &ast.ExprShortArray{
@@ -13192,8 +12817,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 231,
 							EndLine:   231,
-							StartPos:  4653,
-							EndPos:    4655,
+							StartPos:  4268,
+							EndPos:    4270,
 						},
 					},
 					Items: []ast.Vertex{},
@@ -13204,8 +12829,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 232,
 						EndLine:   232,
-						StartPos:  4659,
-						EndPos:    4663,
+						StartPos:  4272,
+						EndPos:    4276,
 					},
 				},
 				Expr: &ast.ExprShortArray{
@@ -13213,8 +12838,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 232,
 							EndLine:   232,
-							StartPos:  4659,
-							EndPos:    4662,
+							StartPos:  4272,
+							EndPos:    4275,
 						},
 					},
 					Items: []ast.Vertex{
@@ -13223,8 +12848,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 232,
 									EndLine:   232,
-									StartPos:  4660,
-									EndPos:    4661,
+									StartPos:  4273,
+									EndPos:    4274,
 								},
 							},
 							Val: &ast.ScalarLnumber{
@@ -13232,8 +12857,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 232,
 										EndLine:   232,
-										StartPos:  4660,
-										EndPos:    4661,
+										StartPos:  4273,
+										EndPos:    4274,
 									},
 								},
 								Value: []byte("1"),
@@ -13247,8 +12872,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 233,
 						EndLine:   233,
-						StartPos:  4666,
-						EndPos:    4679,
+						StartPos:  4277,
+						EndPos:    4290,
 					},
 				},
 				Expr: &ast.ExprShortArray{
@@ -13256,8 +12881,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 233,
 							EndLine:   233,
-							StartPos:  4666,
-							EndPos:    4678,
+							StartPos:  4277,
+							EndPos:    4289,
 						},
 					},
 					Items: []ast.Vertex{
@@ -13266,8 +12891,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 233,
 									EndLine:   233,
-									StartPos:  4667,
-									EndPos:    4671,
+									StartPos:  4278,
+									EndPos:    4282,
 								},
 							},
 							Key: &ast.ScalarLnumber{
@@ -13275,8 +12900,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 233,
 										EndLine:   233,
-										StartPos:  4667,
-										EndPos:    4668,
+										StartPos:  4278,
+										EndPos:    4279,
 									},
 								},
 								Value: []byte("1"),
@@ -13286,8 +12911,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 233,
 										EndLine:   233,
-										StartPos:  4670,
-										EndPos:    4671,
+										StartPos:  4281,
+										EndPos:    4282,
 									},
 								},
 								Value: []byte("1"),
@@ -13298,8 +12923,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 233,
 									EndLine:   233,
-									StartPos:  4673,
-									EndPos:    4676,
+									StartPos:  4284,
+									EndPos:    4287,
 								},
 							},
 							Val: &ast.ExprReference{
@@ -13307,8 +12932,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 233,
 										EndLine:   233,
-										StartPos:  4673,
-										EndPos:    4676,
+										StartPos:  4284,
+										EndPos:    4287,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -13316,8 +12941,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 233,
 											EndLine:   233,
-											StartPos:  4674,
-											EndPos:    4676,
+											StartPos:  4285,
+											EndPos:    4287,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -13325,8 +12950,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 233,
 												EndLine:   233,
-												StartPos:  4674,
-												EndPos:    4676,
+												StartPos:  4285,
+												EndPos:    4287,
 											},
 										},
 										Value: []byte("$b"),
@@ -13343,8 +12968,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 235,
 						EndLine:   235,
-						StartPos:  4683,
-						EndPos:    4694,
+						StartPos:  4292,
+						EndPos:    4303,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -13352,8 +12977,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 235,
 							EndLine:   235,
-							StartPos:  4683,
-							EndPos:    4693,
+							StartPos:  4292,
+							EndPos:    4302,
 						},
 					},
 					Class: &ast.NameName{
@@ -13361,8 +12986,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 235,
 								EndLine:   235,
-								StartPos:  4683,
-								EndPos:    4686,
+								StartPos:  4292,
+								EndPos:    4295,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -13371,8 +12996,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 235,
 										EndLine:   235,
-										StartPos:  4683,
-										EndPos:    4686,
+										StartPos:  4292,
+										EndPos:    4295,
 									},
 								},
 								Value: []byte("Foo"),
@@ -13384,8 +13009,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 235,
 								EndLine:   235,
-								StartPos:  4688,
-								EndPos:    4691,
+								StartPos:  4297,
+								EndPos:    4300,
 							},
 						},
 						Value: []byte("bar"),
@@ -13395,8 +13020,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 235,
 								EndLine:   235,
-								StartPos:  4691,
-								EndPos:    4693,
+								StartPos:  4300,
+								EndPos:    4302,
 							},
 						},
 					},
@@ -13407,8 +13032,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 236,
 						EndLine:   236,
-						StartPos:  4697,
-						EndPos:    4718,
+						StartPos:  4304,
+						EndPos:    4325,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -13416,8 +13041,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 236,
 							EndLine:   236,
-							StartPos:  4697,
-							EndPos:    4717,
+							StartPos:  4304,
+							EndPos:    4324,
 						},
 					},
 					Class: &ast.NameRelative{
@@ -13425,8 +13050,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 236,
 								EndLine:   236,
-								StartPos:  4697,
-								EndPos:    4710,
+								StartPos:  4304,
+								EndPos:    4317,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -13435,8 +13060,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 236,
 										EndLine:   236,
-										StartPos:  4707,
-										EndPos:    4710,
+										StartPos:  4314,
+										EndPos:    4317,
 									},
 								},
 								Value: []byte("Foo"),
@@ -13448,8 +13073,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 236,
 								EndLine:   236,
-								StartPos:  4712,
-								EndPos:    4715,
+								StartPos:  4319,
+								EndPos:    4322,
 							},
 						},
 						Value: []byte("bar"),
@@ -13459,8 +13084,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 236,
 								EndLine:   236,
-								StartPos:  4715,
-								EndPos:    4717,
+								StartPos:  4322,
+								EndPos:    4324,
 							},
 						},
 					},
@@ -13471,8 +13096,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 237,
 						EndLine:   237,
-						StartPos:  4721,
-						EndPos:    4733,
+						StartPos:  4326,
+						EndPos:    4338,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -13480,8 +13105,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 237,
 							EndLine:   237,
-							StartPos:  4721,
-							EndPos:    4732,
+							StartPos:  4326,
+							EndPos:    4337,
 						},
 					},
 					Class: &ast.NameFullyQualified{
@@ -13489,8 +13114,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 237,
 								EndLine:   237,
-								StartPos:  4721,
-								EndPos:    4725,
+								StartPos:  4326,
+								EndPos:    4330,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -13499,8 +13124,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 237,
 										EndLine:   237,
-										StartPos:  4722,
-										EndPos:    4725,
+										StartPos:  4327,
+										EndPos:    4330,
 									},
 								},
 								Value: []byte("Foo"),
@@ -13512,8 +13137,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 237,
 								EndLine:   237,
-								StartPos:  4727,
-								EndPos:    4730,
+								StartPos:  4332,
+								EndPos:    4335,
 							},
 						},
 						Value: []byte("bar"),
@@ -13523,8 +13148,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 237,
 								EndLine:   237,
-								StartPos:  4730,
-								EndPos:    4732,
+								StartPos:  4335,
+								EndPos:    4337,
 							},
 						},
 					},
@@ -13535,8 +13160,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 238,
 						EndLine:   238,
-						StartPos:  4736,
-						EndPos:    4748,
+						StartPos:  4339,
+						EndPos:    4351,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -13544,8 +13169,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 238,
 							EndLine:   238,
-							StartPos:  4736,
-							EndPos:    4747,
+							StartPos:  4339,
+							EndPos:    4350,
 						},
 					},
 					Class: &ast.NameName{
@@ -13553,8 +13178,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 238,
 								EndLine:   238,
-								StartPos:  4736,
-								EndPos:    4739,
+								StartPos:  4339,
+								EndPos:    4342,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -13563,8 +13188,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 238,
 										EndLine:   238,
-										StartPos:  4736,
-										EndPos:    4739,
+										StartPos:  4339,
+										EndPos:    4342,
 									},
 								},
 								Value: []byte("Foo"),
@@ -13576,8 +13201,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 238,
 								EndLine:   238,
-								StartPos:  4741,
-								EndPos:    4745,
+								StartPos:  4344,
+								EndPos:    4348,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13585,8 +13210,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 238,
 									EndLine:   238,
-									StartPos:  4741,
-									EndPos:    4745,
+									StartPos:  4344,
+									EndPos:    4348,
 								},
 							},
 							Value: []byte("$bar"),
@@ -13597,8 +13222,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 238,
 								EndLine:   238,
-								StartPos:  4745,
-								EndPos:    4747,
+								StartPos:  4348,
+								EndPos:    4350,
 							},
 						},
 					},
@@ -13609,8 +13234,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 239,
 						EndLine:   239,
-						StartPos:  4751,
-						EndPos:    4764,
+						StartPos:  4352,
+						EndPos:    4365,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -13618,8 +13243,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 239,
 							EndLine:   239,
-							StartPos:  4751,
-							EndPos:    4763,
+							StartPos:  4352,
+							EndPos:    4364,
 						},
 					},
 					Class: &ast.ExprVariable{
@@ -13627,8 +13252,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 239,
 								EndLine:   239,
-								StartPos:  4751,
-								EndPos:    4755,
+								StartPos:  4352,
+								EndPos:    4356,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13636,8 +13261,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 239,
 									EndLine:   239,
-									StartPos:  4751,
-									EndPos:    4755,
+									StartPos:  4352,
+									EndPos:    4356,
 								},
 							},
 							Value: []byte("$foo"),
@@ -13648,8 +13273,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 239,
 								EndLine:   239,
-								StartPos:  4757,
-								EndPos:    4761,
+								StartPos:  4358,
+								EndPos:    4362,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13657,8 +13282,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 239,
 									EndLine:   239,
-									StartPos:  4757,
-									EndPos:    4761,
+									StartPos:  4358,
+									EndPos:    4362,
 								},
 							},
 							Value: []byte("$bar"),
@@ -13669,8 +13294,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 239,
 								EndLine:   239,
-								StartPos:  4761,
-								EndPos:    4763,
+								StartPos:  4362,
+								EndPos:    4364,
 							},
 						},
 					},
@@ -13681,8 +13306,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 240,
 						EndLine:   240,
-						StartPos:  4767,
-						EndPos:    4777,
+						StartPos:  4366,
+						EndPos:    4376,
 					},
 				},
 				Expr: &ast.ExprStaticPropertyFetch{
@@ -13690,8 +13315,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 240,
 							EndLine:   240,
-							StartPos:  4767,
-							EndPos:    4776,
+							StartPos:  4366,
+							EndPos:    4375,
 						},
 					},
 					Class: &ast.NameName{
@@ -13699,8 +13324,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 240,
 								EndLine:   240,
-								StartPos:  4767,
-								EndPos:    4770,
+								StartPos:  4366,
+								EndPos:    4369,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -13709,8 +13334,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 240,
 										EndLine:   240,
-										StartPos:  4767,
-										EndPos:    4770,
+										StartPos:  4366,
+										EndPos:    4369,
 									},
 								},
 								Value: []byte("Foo"),
@@ -13722,8 +13347,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 240,
 								EndLine:   240,
-								StartPos:  4772,
-								EndPos:    4776,
+								StartPos:  4371,
+								EndPos:    4375,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13731,8 +13356,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 240,
 									EndLine:   240,
-									StartPos:  4772,
-									EndPos:    4776,
+									StartPos:  4371,
+									EndPos:    4375,
 								},
 							},
 							Value: []byte("$bar"),
@@ -13745,8 +13370,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 241,
 						EndLine:   241,
-						StartPos:  4780,
-						EndPos:    4800,
+						StartPos:  4377,
+						EndPos:    4397,
 					},
 				},
 				Expr: &ast.ExprStaticPropertyFetch{
@@ -13754,8 +13379,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 241,
 							EndLine:   241,
-							StartPos:  4780,
-							EndPos:    4799,
+							StartPos:  4377,
+							EndPos:    4396,
 						},
 					},
 					Class: &ast.NameRelative{
@@ -13763,8 +13388,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 241,
 								EndLine:   241,
-								StartPos:  4780,
-								EndPos:    4793,
+								StartPos:  4377,
+								EndPos:    4390,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -13773,8 +13398,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 241,
 										EndLine:   241,
-										StartPos:  4790,
-										EndPos:    4793,
+										StartPos:  4387,
+										EndPos:    4390,
 									},
 								},
 								Value: []byte("Foo"),
@@ -13786,8 +13411,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 241,
 								EndLine:   241,
-								StartPos:  4795,
-								EndPos:    4799,
+								StartPos:  4392,
+								EndPos:    4396,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13795,8 +13420,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 241,
 									EndLine:   241,
-									StartPos:  4795,
-									EndPos:    4799,
+									StartPos:  4392,
+									EndPos:    4396,
 								},
 							},
 							Value: []byte("$bar"),
@@ -13809,8 +13434,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 242,
 						EndLine:   242,
-						StartPos:  4803,
-						EndPos:    4814,
+						StartPos:  4398,
+						EndPos:    4409,
 					},
 				},
 				Expr: &ast.ExprStaticPropertyFetch{
@@ -13818,8 +13443,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 242,
 							EndLine:   242,
-							StartPos:  4803,
-							EndPos:    4813,
+							StartPos:  4398,
+							EndPos:    4408,
 						},
 					},
 					Class: &ast.NameFullyQualified{
@@ -13827,8 +13452,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 242,
 								EndLine:   242,
-								StartPos:  4803,
-								EndPos:    4807,
+								StartPos:  4398,
+								EndPos:    4402,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -13837,8 +13462,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 242,
 										EndLine:   242,
-										StartPos:  4804,
-										EndPos:    4807,
+										StartPos:  4399,
+										EndPos:    4402,
 									},
 								},
 								Value: []byte("Foo"),
@@ -13850,8 +13475,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 242,
 								EndLine:   242,
-								StartPos:  4809,
-								EndPos:    4813,
+								StartPos:  4404,
+								EndPos:    4408,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13859,8 +13484,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 242,
 									EndLine:   242,
-									StartPos:  4809,
-									EndPos:    4813,
+									StartPos:  4404,
+									EndPos:    4408,
 								},
 							},
 							Value: []byte("$bar"),
@@ -13873,8 +13498,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 243,
 						EndLine:   243,
-						StartPos:  4817,
-						EndPos:    4830,
+						StartPos:  4410,
+						EndPos:    4423,
 					},
 				},
 				Expr: &ast.ExprTernary{
@@ -13882,8 +13507,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 243,
 							EndLine:   243,
-							StartPos:  4817,
-							EndPos:    4829,
+							StartPos:  4410,
+							EndPos:    4422,
 						},
 					},
 					Condition: &ast.ExprVariable{
@@ -13891,8 +13516,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 243,
 								EndLine:   243,
-								StartPos:  4817,
-								EndPos:    4819,
+								StartPos:  4410,
+								EndPos:    4412,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13900,8 +13525,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 243,
 									EndLine:   243,
-									StartPos:  4817,
-									EndPos:    4819,
+									StartPos:  4410,
+									EndPos:    4412,
 								},
 							},
 							Value: []byte("$a"),
@@ -13912,8 +13537,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 243,
 								EndLine:   243,
-								StartPos:  4822,
-								EndPos:    4824,
+								StartPos:  4415,
+								EndPos:    4417,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13921,8 +13546,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 243,
 									EndLine:   243,
-									StartPos:  4822,
-									EndPos:    4824,
+									StartPos:  4415,
+									EndPos:    4417,
 								},
 							},
 							Value: []byte("$b"),
@@ -13933,8 +13558,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 243,
 								EndLine:   243,
-								StartPos:  4827,
-								EndPos:    4829,
+								StartPos:  4420,
+								EndPos:    4422,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13942,8 +13567,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 243,
 									EndLine:   243,
-									StartPos:  4827,
-									EndPos:    4829,
+									StartPos:  4420,
+									EndPos:    4422,
 								},
 							},
 							Value: []byte("$c"),
@@ -13956,8 +13581,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 244,
 						EndLine:   244,
-						StartPos:  4833,
-						EndPos:    4843,
+						StartPos:  4424,
+						EndPos:    4434,
 					},
 				},
 				Expr: &ast.ExprTernary{
@@ -13965,8 +13590,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 244,
 							EndLine:   244,
-							StartPos:  4833,
-							EndPos:    4842,
+							StartPos:  4424,
+							EndPos:    4433,
 						},
 					},
 					Condition: &ast.ExprVariable{
@@ -13974,8 +13599,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 244,
 								EndLine:   244,
-								StartPos:  4833,
-								EndPos:    4835,
+								StartPos:  4424,
+								EndPos:    4426,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13983,8 +13608,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 244,
 									EndLine:   244,
-									StartPos:  4833,
-									EndPos:    4835,
+									StartPos:  4424,
+									EndPos:    4426,
 								},
 							},
 							Value: []byte("$a"),
@@ -13995,8 +13620,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 244,
 								EndLine:   244,
-								StartPos:  4840,
-								EndPos:    4842,
+								StartPos:  4431,
+								EndPos:    4433,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14004,8 +13629,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 244,
 									EndLine:   244,
-									StartPos:  4840,
-									EndPos:    4842,
+									StartPos:  4431,
+									EndPos:    4433,
 								},
 							},
 							Value: []byte("$c"),
@@ -14018,8 +13643,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 245,
 						EndLine:   245,
-						StartPos:  4846,
-						EndPos:    4869,
+						StartPos:  4435,
+						EndPos:    4458,
 					},
 				},
 				Expr: &ast.ExprTernary{
@@ -14027,8 +13652,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 245,
 							EndLine:   245,
-							StartPos:  4846,
-							EndPos:    4868,
+							StartPos:  4435,
+							EndPos:    4457,
 						},
 					},
 					Condition: &ast.ExprVariable{
@@ -14036,8 +13661,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 245,
 								EndLine:   245,
-								StartPos:  4846,
-								EndPos:    4848,
+								StartPos:  4435,
+								EndPos:    4437,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14045,8 +13670,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 245,
 									EndLine:   245,
-									StartPos:  4846,
-									EndPos:    4848,
+									StartPos:  4435,
+									EndPos:    4437,
 								},
 							},
 							Value: []byte("$a"),
@@ -14057,8 +13682,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 245,
 								EndLine:   245,
-								StartPos:  4851,
-								EndPos:    4863,
+								StartPos:  4440,
+								EndPos:    4452,
 							},
 						},
 						Condition: &ast.ExprVariable{
@@ -14066,8 +13691,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 245,
 									EndLine:   245,
-									StartPos:  4851,
-									EndPos:    4853,
+									StartPos:  4440,
+									EndPos:    4442,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -14075,8 +13700,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 245,
 										EndLine:   245,
-										StartPos:  4851,
-										EndPos:    4853,
+										StartPos:  4440,
+										EndPos:    4442,
 									},
 								},
 								Value: []byte("$b"),
@@ -14087,8 +13712,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 245,
 									EndLine:   245,
-									StartPos:  4856,
-									EndPos:    4858,
+									StartPos:  4445,
+									EndPos:    4447,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -14096,8 +13721,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 245,
 										EndLine:   245,
-										StartPos:  4856,
-										EndPos:    4858,
+										StartPos:  4445,
+										EndPos:    4447,
 									},
 								},
 								Value: []byte("$c"),
@@ -14108,8 +13733,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 245,
 									EndLine:   245,
-									StartPos:  4861,
-									EndPos:    4863,
+									StartPos:  4450,
+									EndPos:    4452,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -14117,8 +13742,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 245,
 										EndLine:   245,
-										StartPos:  4861,
-										EndPos:    4863,
+										StartPos:  4450,
+										EndPos:    4452,
 									},
 								},
 								Value: []byte("$d"),
@@ -14130,8 +13755,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 245,
 								EndLine:   245,
-								StartPos:  4866,
-								EndPos:    4868,
+								StartPos:  4455,
+								EndPos:    4457,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14139,8 +13764,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 245,
 									EndLine:   245,
-									StartPos:  4866,
-									EndPos:    4868,
+									StartPos:  4455,
+									EndPos:    4457,
 								},
 							},
 							Value: []byte("$e"),
@@ -14153,8 +13778,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 246,
 						EndLine:   246,
-						StartPos:  4872,
-						EndPos:    4895,
+						StartPos:  4459,
+						EndPos:    4482,
 					},
 				},
 				Expr: &ast.ExprTernary{
@@ -14162,8 +13787,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 246,
 							EndLine:   246,
-							StartPos:  4872,
-							EndPos:    4894,
+							StartPos:  4459,
+							EndPos:    4481,
 						},
 					},
 					Condition: &ast.ExprTernary{
@@ -14171,8 +13796,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 246,
 								EndLine:   246,
-								StartPos:  4872,
-								EndPos:    4884,
+								StartPos:  4459,
+								EndPos:    4471,
 							},
 						},
 						Condition: &ast.ExprVariable{
@@ -14180,8 +13805,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 246,
 									EndLine:   246,
-									StartPos:  4872,
-									EndPos:    4874,
+									StartPos:  4459,
+									EndPos:    4461,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -14189,8 +13814,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 246,
 										EndLine:   246,
-										StartPos:  4872,
-										EndPos:    4874,
+										StartPos:  4459,
+										EndPos:    4461,
 									},
 								},
 								Value: []byte("$a"),
@@ -14201,8 +13826,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 246,
 									EndLine:   246,
-									StartPos:  4877,
-									EndPos:    4879,
+									StartPos:  4464,
+									EndPos:    4466,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -14210,8 +13835,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 246,
 										EndLine:   246,
-										StartPos:  4877,
-										EndPos:    4879,
+										StartPos:  4464,
+										EndPos:    4466,
 									},
 								},
 								Value: []byte("$b"),
@@ -14222,8 +13847,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 246,
 									EndLine:   246,
-									StartPos:  4882,
-									EndPos:    4884,
+									StartPos:  4469,
+									EndPos:    4471,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -14231,8 +13856,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 246,
 										EndLine:   246,
-										StartPos:  4882,
-										EndPos:    4884,
+										StartPos:  4469,
+										EndPos:    4471,
 									},
 								},
 								Value: []byte("$c"),
@@ -14244,8 +13869,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 246,
 								EndLine:   246,
-								StartPos:  4887,
-								EndPos:    4889,
+								StartPos:  4474,
+								EndPos:    4476,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14253,8 +13878,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 246,
 									EndLine:   246,
-									StartPos:  4887,
-									EndPos:    4889,
+									StartPos:  4474,
+									EndPos:    4476,
 								},
 							},
 							Value: []byte("$d"),
@@ -14265,8 +13890,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 246,
 								EndLine:   246,
-								StartPos:  4892,
-								EndPos:    4894,
+								StartPos:  4479,
+								EndPos:    4481,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14274,8 +13899,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 246,
 									EndLine:   246,
-									StartPos:  4892,
-									EndPos:    4894,
+									StartPos:  4479,
+									EndPos:    4481,
 								},
 							},
 							Value: []byte("$e"),
@@ -14288,8 +13913,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 247,
 						EndLine:   247,
-						StartPos:  4898,
-						EndPos:    4902,
+						StartPos:  4483,
+						EndPos:    4487,
 					},
 				},
 				Expr: &ast.ExprUnaryMinus{
@@ -14297,8 +13922,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 247,
 							EndLine:   247,
-							StartPos:  4898,
-							EndPos:    4901,
+							StartPos:  4483,
+							EndPos:    4486,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -14306,8 +13931,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 247,
 								EndLine:   247,
-								StartPos:  4899,
-								EndPos:    4901,
+								StartPos:  4484,
+								EndPos:    4486,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14315,8 +13940,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 247,
 									EndLine:   247,
-									StartPos:  4899,
-									EndPos:    4901,
+									StartPos:  4484,
+									EndPos:    4486,
 								},
 							},
 							Value: []byte("$a"),
@@ -14329,8 +13954,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 248,
 						EndLine:   248,
-						StartPos:  4905,
-						EndPos:    4909,
+						StartPos:  4488,
+						EndPos:    4492,
 					},
 				},
 				Expr: &ast.ExprUnaryPlus{
@@ -14338,8 +13963,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 248,
 							EndLine:   248,
-							StartPos:  4905,
-							EndPos:    4908,
+							StartPos:  4488,
+							EndPos:    4491,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -14347,8 +13972,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 248,
 								EndLine:   248,
-								StartPos:  4906,
-								EndPos:    4908,
+								StartPos:  4489,
+								EndPos:    4491,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14356,8 +13981,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 248,
 									EndLine:   248,
-									StartPos:  4906,
-									EndPos:    4908,
+									StartPos:  4489,
+									EndPos:    4491,
 								},
 							},
 							Value: []byte("$a"),
@@ -14370,8 +13995,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 249,
 						EndLine:   249,
-						StartPos:  4912,
-						EndPos:    4916,
+						StartPos:  4493,
+						EndPos:    4497,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -14379,8 +14004,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 249,
 							EndLine:   249,
-							StartPos:  4912,
-							EndPos:    4915,
+							StartPos:  4493,
+							EndPos:    4496,
 						},
 					},
 					VarName: &ast.ExprVariable{
@@ -14388,8 +14013,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 249,
 								EndLine:   249,
-								StartPos:  4913,
-								EndPos:    4915,
+								StartPos:  4494,
+								EndPos:    4496,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14397,8 +14022,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 249,
 									EndLine:   249,
-									StartPos:  4913,
-									EndPos:    4915,
+									StartPos:  4494,
+									EndPos:    4496,
 								},
 							},
 							Value: []byte("$a"),
@@ -14411,8 +14036,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 250,
 						EndLine:   250,
-						StartPos:  4919,
-						EndPos:    4924,
+						StartPos:  4498,
+						EndPos:    4503,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -14420,8 +14045,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 250,
 							EndLine:   250,
-							StartPos:  4919,
-							EndPos:    4923,
+							StartPos:  4498,
+							EndPos:    4502,
 						},
 					},
 					VarName: &ast.ExprVariable{
@@ -14429,8 +14054,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 250,
 								EndLine:   250,
-								StartPos:  4920,
-								EndPos:    4923,
+								StartPos:  4499,
+								EndPos:    4502,
 							},
 						},
 						VarName: &ast.ExprVariable{
@@ -14438,8 +14063,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 250,
 									EndLine:   250,
-									StartPos:  4921,
-									EndPos:    4923,
+									StartPos:  4500,
+									EndPos:    4502,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -14447,8 +14072,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 250,
 										EndLine:   250,
-										StartPos:  4921,
-										EndPos:    4923,
+										StartPos:  4500,
+										EndPos:    4502,
 									},
 								},
 								Value: []byte("$a"),
@@ -14462,8 +14087,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 251,
 						EndLine:   251,
-						StartPos:  4927,
-						EndPos:    4933,
+						StartPos:  4504,
+						EndPos:    4510,
 					},
 				},
 				Expr: &ast.ExprYield{
@@ -14471,8 +14096,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 251,
 							EndLine:   251,
-							StartPos:  4927,
-							EndPos:    4932,
+							StartPos:  4504,
+							EndPos:    4509,
 						},
 					},
 				},
@@ -14482,8 +14107,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 252,
 						EndLine:   252,
-						StartPos:  4936,
-						EndPos:    4945,
+						StartPos:  4511,
+						EndPos:    4520,
 					},
 				},
 				Expr: &ast.ExprYield{
@@ -14491,8 +14116,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 252,
 							EndLine:   252,
-							StartPos:  4936,
-							EndPos:    4944,
+							StartPos:  4511,
+							EndPos:    4519,
 						},
 					},
 					Value: &ast.ExprVariable{
@@ -14500,8 +14125,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 252,
 								EndLine:   252,
-								StartPos:  4942,
-								EndPos:    4944,
+								StartPos:  4517,
+								EndPos:    4519,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14509,8 +14134,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 252,
 									EndLine:   252,
-									StartPos:  4942,
-									EndPos:    4944,
+									StartPos:  4517,
+									EndPos:    4519,
 								},
 							},
 							Value: []byte("$a"),
@@ -14523,8 +14148,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 253,
 						EndLine:   253,
-						StartPos:  4948,
-						EndPos:    4963,
+						StartPos:  4521,
+						EndPos:    4536,
 					},
 				},
 				Expr: &ast.ExprYield{
@@ -14532,8 +14157,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 253,
 							EndLine:   253,
-							StartPos:  4948,
-							EndPos:    4962,
+							StartPos:  4521,
+							EndPos:    4535,
 						},
 					},
 					Key: &ast.ExprVariable{
@@ -14541,8 +14166,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 253,
 								EndLine:   253,
-								StartPos:  4954,
-								EndPos:    4956,
+								StartPos:  4527,
+								EndPos:    4529,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14550,8 +14175,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 253,
 									EndLine:   253,
-									StartPos:  4954,
-									EndPos:    4956,
+									StartPos:  4527,
+									EndPos:    4529,
 								},
 							},
 							Value: []byte("$a"),
@@ -14562,8 +14187,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 253,
 								EndLine:   253,
-								StartPos:  4960,
-								EndPos:    4962,
+								StartPos:  4533,
+								EndPos:    4535,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14571,8 +14196,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 253,
 									EndLine:   253,
-									StartPos:  4960,
-									EndPos:    4962,
+									StartPos:  4533,
+									EndPos:    4535,
 								},
 							},
 							Value: []byte("$b"),
@@ -14585,8 +14210,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 254,
 						EndLine:   254,
-						StartPos:  4966,
-						EndPos:    4983,
+						StartPos:  4537,
+						EndPos:    4554,
 					},
 				},
 				Expr: &ast.ExprYield{
@@ -14594,8 +14219,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 254,
 							EndLine:   254,
-							StartPos:  4966,
-							EndPos:    4982,
+							StartPos:  4537,
+							EndPos:    4553,
 						},
 					},
 					Value: &ast.ExprClassConstFetch{
@@ -14603,8 +14228,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 254,
 								EndLine:   254,
-								StartPos:  4972,
-								EndPos:    4982,
+								StartPos:  4543,
+								EndPos:    4553,
 							},
 						},
 						Class: &ast.NameName{
@@ -14612,8 +14237,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 254,
 									EndLine:   254,
-									StartPos:  4972,
-									EndPos:    4975,
+									StartPos:  4543,
+									EndPos:    4546,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -14622,8 +14247,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 254,
 											EndLine:   254,
-											StartPos:  4972,
-											EndPos:    4975,
+											StartPos:  4543,
+											EndPos:    4546,
 										},
 									},
 									Value: []byte("Foo"),
@@ -14635,8 +14260,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 254,
 									EndLine:   254,
-									StartPos:  4977,
-									EndPos:    4982,
+									StartPos:  4548,
+									EndPos:    4553,
 								},
 							},
 							Value: []byte("class"),
@@ -14649,8 +14274,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 255,
 						EndLine:   255,
-						StartPos:  4986,
-						EndPos:    5009,
+						StartPos:  4555,
+						EndPos:    4578,
 					},
 				},
 				Expr: &ast.ExprYield{
@@ -14658,8 +14283,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 255,
 							EndLine:   255,
-							StartPos:  4986,
-							EndPos:    5008,
+							StartPos:  4555,
+							EndPos:    4577,
 						},
 					},
 					Key: &ast.ExprVariable{
@@ -14667,8 +14292,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 255,
 								EndLine:   255,
-								StartPos:  4992,
-								EndPos:    4994,
+								StartPos:  4561,
+								EndPos:    4563,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14676,8 +14301,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 255,
 									EndLine:   255,
-									StartPos:  4992,
-									EndPos:    4994,
+									StartPos:  4561,
+									EndPos:    4563,
 								},
 							},
 							Value: []byte("$a"),
@@ -14688,8 +14313,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 255,
 								EndLine:   255,
-								StartPos:  4998,
-								EndPos:    5008,
+								StartPos:  4567,
+								EndPos:    4577,
 							},
 						},
 						Class: &ast.NameName{
@@ -14697,8 +14322,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 255,
 									EndLine:   255,
-									StartPos:  4998,
-									EndPos:    5001,
+									StartPos:  4567,
+									EndPos:    4570,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -14707,8 +14332,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 255,
 											EndLine:   255,
-											StartPos:  4998,
-											EndPos:    5001,
+											StartPos:  4567,
+											EndPos:    4570,
 										},
 									},
 									Value: []byte("Foo"),
@@ -14720,8 +14345,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 255,
 									EndLine:   255,
-									StartPos:  5003,
-									EndPos:    5008,
+									StartPos:  4572,
+									EndPos:    4577,
 								},
 							},
 							Value: []byte("class"),
@@ -14734,8 +14359,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 257,
 						EndLine:   257,
-						StartPos:  5015,
-						EndPos:    5025,
+						StartPos:  4580,
+						EndPos:    4590,
 					},
 				},
 				Expr: &ast.ExprCastArray{
@@ -14743,8 +14368,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 257,
 							EndLine:   257,
-							StartPos:  5015,
-							EndPos:    5024,
+							StartPos:  4580,
+							EndPos:    4589,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -14752,8 +14377,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 257,
 								EndLine:   257,
-								StartPos:  5022,
-								EndPos:    5024,
+								StartPos:  4587,
+								EndPos:    4589,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14761,8 +14386,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 257,
 									EndLine:   257,
-									StartPos:  5022,
-									EndPos:    5024,
+									StartPos:  4587,
+									EndPos:    4589,
 								},
 							},
 							Value: []byte("$a"),
@@ -14775,8 +14400,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 258,
 						EndLine:   258,
-						StartPos:  5028,
-						EndPos:    5040,
+						StartPos:  4591,
+						EndPos:    4603,
 					},
 				},
 				Expr: &ast.ExprCastBool{
@@ -14784,8 +14409,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 258,
 							EndLine:   258,
-							StartPos:  5028,
-							EndPos:    5039,
+							StartPos:  4591,
+							EndPos:    4602,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -14793,8 +14418,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 258,
 								EndLine:   258,
-								StartPos:  5037,
-								EndPos:    5039,
+								StartPos:  4600,
+								EndPos:    4602,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14802,8 +14427,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 258,
 									EndLine:   258,
-									StartPos:  5037,
-									EndPos:    5039,
+									StartPos:  4600,
+									EndPos:    4602,
 								},
 							},
 							Value: []byte("$a"),
@@ -14816,8 +14441,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 259,
 						EndLine:   259,
-						StartPos:  5043,
-						EndPos:    5052,
+						StartPos:  4604,
+						EndPos:    4613,
 					},
 				},
 				Expr: &ast.ExprCastBool{
@@ -14825,8 +14450,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 259,
 							EndLine:   259,
-							StartPos:  5043,
-							EndPos:    5051,
+							StartPos:  4604,
+							EndPos:    4612,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -14834,8 +14459,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 259,
 								EndLine:   259,
-								StartPos:  5049,
-								EndPos:    5051,
+								StartPos:  4610,
+								EndPos:    4612,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14843,8 +14468,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 259,
 									EndLine:   259,
-									StartPos:  5049,
-									EndPos:    5051,
+									StartPos:  4610,
+									EndPos:    4612,
 								},
 							},
 							Value: []byte("$a"),
@@ -14857,8 +14482,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 260,
 						EndLine:   260,
-						StartPos:  5055,
-						EndPos:    5066,
+						StartPos:  4614,
+						EndPos:    4625,
 					},
 				},
 				Expr: &ast.ExprCastDouble{
@@ -14866,8 +14491,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 260,
 							EndLine:   260,
-							StartPos:  5055,
-							EndPos:    5065,
+							StartPos:  4614,
+							EndPos:    4624,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -14875,8 +14500,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 260,
 								EndLine:   260,
-								StartPos:  5063,
-								EndPos:    5065,
+								StartPos:  4622,
+								EndPos:    4624,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14884,8 +14509,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 260,
 									EndLine:   260,
-									StartPos:  5063,
-									EndPos:    5065,
+									StartPos:  4622,
+									EndPos:    4624,
 								},
 							},
 							Value: []byte("$a"),
@@ -14898,8 +14523,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 261,
 						EndLine:   261,
-						StartPos:  5069,
-						EndPos:    5079,
+						StartPos:  4626,
+						EndPos:    4636,
 					},
 				},
 				Expr: &ast.ExprCastDouble{
@@ -14907,8 +14532,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 261,
 							EndLine:   261,
-							StartPos:  5069,
-							EndPos:    5078,
+							StartPos:  4626,
+							EndPos:    4635,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -14916,8 +14541,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 261,
 								EndLine:   261,
-								StartPos:  5076,
-								EndPos:    5078,
+								StartPos:  4633,
+								EndPos:    4635,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14925,8 +14550,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 261,
 									EndLine:   261,
-									StartPos:  5076,
-									EndPos:    5078,
+									StartPos:  4633,
+									EndPos:    4635,
 								},
 							},
 							Value: []byte("$a"),
@@ -14939,8 +14564,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 262,
 						EndLine:   262,
-						StartPos:  5082,
-						EndPos:    5094,
+						StartPos:  4637,
+						EndPos:    4649,
 					},
 				},
 				Expr: &ast.ExprCastInt{
@@ -14948,8 +14573,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 262,
 							EndLine:   262,
-							StartPos:  5082,
-							EndPos:    5093,
+							StartPos:  4637,
+							EndPos:    4648,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -14957,8 +14582,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 262,
 								EndLine:   262,
-								StartPos:  5091,
-								EndPos:    5093,
+								StartPos:  4646,
+								EndPos:    4648,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14966,8 +14591,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 262,
 									EndLine:   262,
-									StartPos:  5091,
-									EndPos:    5093,
+									StartPos:  4646,
+									EndPos:    4648,
 								},
 							},
 							Value: []byte("$a"),
@@ -14980,8 +14605,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 263,
 						EndLine:   263,
-						StartPos:  5097,
-						EndPos:    5105,
+						StartPos:  4650,
+						EndPos:    4658,
 					},
 				},
 				Expr: &ast.ExprCastInt{
@@ -14989,8 +14614,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 263,
 							EndLine:   263,
-							StartPos:  5097,
-							EndPos:    5104,
+							StartPos:  4650,
+							EndPos:    4657,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -14998,8 +14623,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 263,
 								EndLine:   263,
-								StartPos:  5102,
-								EndPos:    5104,
+								StartPos:  4655,
+								EndPos:    4657,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15007,8 +14632,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 263,
 									EndLine:   263,
-									StartPos:  5102,
-									EndPos:    5104,
+									StartPos:  4655,
+									EndPos:    4657,
 								},
 							},
 							Value: []byte("$a"),
@@ -15021,8 +14646,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 264,
 						EndLine:   264,
-						StartPos:  5108,
-						EndPos:    5119,
+						StartPos:  4659,
+						EndPos:    4670,
 					},
 				},
 				Expr: &ast.ExprCastObject{
@@ -15030,8 +14655,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 264,
 							EndLine:   264,
-							StartPos:  5108,
-							EndPos:    5118,
+							StartPos:  4659,
+							EndPos:    4669,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -15039,8 +14664,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 264,
 								EndLine:   264,
-								StartPos:  5116,
-								EndPos:    5118,
+								StartPos:  4667,
+								EndPos:    4669,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15048,8 +14673,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 264,
 									EndLine:   264,
-									StartPos:  5116,
-									EndPos:    5118,
+									StartPos:  4667,
+									EndPos:    4669,
 								},
 							},
 							Value: []byte("$a"),
@@ -15062,8 +14687,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 265,
 						EndLine:   265,
-						StartPos:  5122,
-						EndPos:    5133,
+						StartPos:  4671,
+						EndPos:    4682,
 					},
 				},
 				Expr: &ast.ExprCastString{
@@ -15071,8 +14696,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 265,
 							EndLine:   265,
-							StartPos:  5122,
-							EndPos:    5132,
+							StartPos:  4671,
+							EndPos:    4681,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -15080,8 +14705,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 265,
 								EndLine:   265,
-								StartPos:  5130,
-								EndPos:    5132,
+								StartPos:  4679,
+								EndPos:    4681,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15089,8 +14714,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 265,
 									EndLine:   265,
-									StartPos:  5130,
-									EndPos:    5132,
+									StartPos:  4679,
+									EndPos:    4681,
 								},
 							},
 							Value: []byte("$a"),
@@ -15103,8 +14728,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 266,
 						EndLine:   266,
-						StartPos:  5136,
-						EndPos:    5146,
+						StartPos:  4683,
+						EndPos:    4693,
 					},
 				},
 				Expr: &ast.ExprCastUnset{
@@ -15112,8 +14737,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 266,
 							EndLine:   266,
-							StartPos:  5136,
-							EndPos:    5145,
+							StartPos:  4683,
+							EndPos:    4692,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -15121,8 +14746,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 266,
 								EndLine:   266,
-								StartPos:  5143,
-								EndPos:    5145,
+								StartPos:  4690,
+								EndPos:    4692,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15130,8 +14755,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 266,
 									EndLine:   266,
-									StartPos:  5143,
-									EndPos:    5145,
+									StartPos:  4690,
+									EndPos:    4692,
 								},
 							},
 							Value: []byte("$a"),
@@ -15144,8 +14769,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 268,
 						EndLine:   268,
-						StartPos:  5150,
-						EndPos:    5158,
+						StartPos:  4695,
+						EndPos:    4703,
 					},
 				},
 				Expr: &ast.ExprBinaryBitwiseAnd{
@@ -15153,8 +14778,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 268,
 							EndLine:   268,
-							StartPos:  5150,
-							EndPos:    5157,
+							StartPos:  4695,
+							EndPos:    4702,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15162,8 +14787,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 268,
 								EndLine:   268,
-								StartPos:  5150,
-								EndPos:    5152,
+								StartPos:  4695,
+								EndPos:    4697,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15171,8 +14796,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 268,
 									EndLine:   268,
-									StartPos:  5150,
-									EndPos:    5152,
+									StartPos:  4695,
+									EndPos:    4697,
 								},
 							},
 							Value: []byte("$a"),
@@ -15183,8 +14808,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 268,
 								EndLine:   268,
-								StartPos:  5155,
-								EndPos:    5157,
+								StartPos:  4700,
+								EndPos:    4702,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15192,8 +14817,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 268,
 									EndLine:   268,
-									StartPos:  5155,
-									EndPos:    5157,
+									StartPos:  4700,
+									EndPos:    4702,
 								},
 							},
 							Value: []byte("$b"),
@@ -15206,8 +14831,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 269,
 						EndLine:   269,
-						StartPos:  5161,
-						EndPos:    5169,
+						StartPos:  4704,
+						EndPos:    4712,
 					},
 				},
 				Expr: &ast.ExprBinaryBitwiseOr{
@@ -15215,8 +14840,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 269,
 							EndLine:   269,
-							StartPos:  5161,
-							EndPos:    5168,
+							StartPos:  4704,
+							EndPos:    4711,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15224,8 +14849,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 269,
 								EndLine:   269,
-								StartPos:  5161,
-								EndPos:    5163,
+								StartPos:  4704,
+								EndPos:    4706,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15233,8 +14858,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 269,
 									EndLine:   269,
-									StartPos:  5161,
-									EndPos:    5163,
+									StartPos:  4704,
+									EndPos:    4706,
 								},
 							},
 							Value: []byte("$a"),
@@ -15245,8 +14870,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 269,
 								EndLine:   269,
-								StartPos:  5166,
-								EndPos:    5168,
+								StartPos:  4709,
+								EndPos:    4711,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15254,8 +14879,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 269,
 									EndLine:   269,
-									StartPos:  5166,
-									EndPos:    5168,
+									StartPos:  4709,
+									EndPos:    4711,
 								},
 							},
 							Value: []byte("$b"),
@@ -15268,8 +14893,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 270,
 						EndLine:   270,
-						StartPos:  5172,
-						EndPos:    5180,
+						StartPos:  4713,
+						EndPos:    4721,
 					},
 				},
 				Expr: &ast.ExprBinaryBitwiseXor{
@@ -15277,8 +14902,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 270,
 							EndLine:   270,
-							StartPos:  5172,
-							EndPos:    5179,
+							StartPos:  4713,
+							EndPos:    4720,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15286,8 +14911,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 270,
 								EndLine:   270,
-								StartPos:  5172,
-								EndPos:    5174,
+								StartPos:  4713,
+								EndPos:    4715,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15295,8 +14920,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 270,
 									EndLine:   270,
-									StartPos:  5172,
-									EndPos:    5174,
+									StartPos:  4713,
+									EndPos:    4715,
 								},
 							},
 							Value: []byte("$a"),
@@ -15307,8 +14932,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 270,
 								EndLine:   270,
-								StartPos:  5177,
-								EndPos:    5179,
+								StartPos:  4718,
+								EndPos:    4720,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15316,8 +14941,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 270,
 									EndLine:   270,
-									StartPos:  5177,
-									EndPos:    5179,
+									StartPos:  4718,
+									EndPos:    4720,
 								},
 							},
 							Value: []byte("$b"),
@@ -15330,8 +14955,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 271,
 						EndLine:   271,
-						StartPos:  5183,
-						EndPos:    5192,
+						StartPos:  4722,
+						EndPos:    4731,
 					},
 				},
 				Expr: &ast.ExprBinaryBooleanAnd{
@@ -15339,8 +14964,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 271,
 							EndLine:   271,
-							StartPos:  5183,
-							EndPos:    5191,
+							StartPos:  4722,
+							EndPos:    4730,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15348,8 +14973,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 271,
 								EndLine:   271,
-								StartPos:  5183,
-								EndPos:    5185,
+								StartPos:  4722,
+								EndPos:    4724,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15357,8 +14982,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 271,
 									EndLine:   271,
-									StartPos:  5183,
-									EndPos:    5185,
+									StartPos:  4722,
+									EndPos:    4724,
 								},
 							},
 							Value: []byte("$a"),
@@ -15369,8 +14994,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 271,
 								EndLine:   271,
-								StartPos:  5189,
-								EndPos:    5191,
+								StartPos:  4728,
+								EndPos:    4730,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15378,8 +15003,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 271,
 									EndLine:   271,
-									StartPos:  5189,
-									EndPos:    5191,
+									StartPos:  4728,
+									EndPos:    4730,
 								},
 							},
 							Value: []byte("$b"),
@@ -15392,8 +15017,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 272,
 						EndLine:   272,
-						StartPos:  5195,
-						EndPos:    5204,
+						StartPos:  4732,
+						EndPos:    4741,
 					},
 				},
 				Expr: &ast.ExprBinaryBooleanOr{
@@ -15401,8 +15026,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 272,
 							EndLine:   272,
-							StartPos:  5195,
-							EndPos:    5203,
+							StartPos:  4732,
+							EndPos:    4740,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15410,8 +15035,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 272,
 								EndLine:   272,
-								StartPos:  5195,
-								EndPos:    5197,
+								StartPos:  4732,
+								EndPos:    4734,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15419,8 +15044,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 272,
 									EndLine:   272,
-									StartPos:  5195,
-									EndPos:    5197,
+									StartPos:  4732,
+									EndPos:    4734,
 								},
 							},
 							Value: []byte("$a"),
@@ -15431,8 +15056,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 272,
 								EndLine:   272,
-								StartPos:  5201,
-								EndPos:    5203,
+								StartPos:  4738,
+								EndPos:    4740,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15440,8 +15065,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 272,
 									EndLine:   272,
-									StartPos:  5201,
-									EndPos:    5203,
+									StartPos:  4738,
+									EndPos:    4740,
 								},
 							},
 							Value: []byte("$b"),
@@ -15454,8 +15079,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 273,
 						EndLine:   273,
-						StartPos:  5207,
-						EndPos:    5215,
+						StartPos:  4742,
+						EndPos:    4750,
 					},
 				},
 				Expr: &ast.ExprBinaryConcat{
@@ -15463,8 +15088,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 273,
 							EndLine:   273,
-							StartPos:  5207,
-							EndPos:    5214,
+							StartPos:  4742,
+							EndPos:    4749,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15472,8 +15097,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 273,
 								EndLine:   273,
-								StartPos:  5207,
-								EndPos:    5209,
+								StartPos:  4742,
+								EndPos:    4744,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15481,8 +15106,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 273,
 									EndLine:   273,
-									StartPos:  5207,
-									EndPos:    5209,
+									StartPos:  4742,
+									EndPos:    4744,
 								},
 							},
 							Value: []byte("$a"),
@@ -15493,8 +15118,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 273,
 								EndLine:   273,
-								StartPos:  5212,
-								EndPos:    5214,
+								StartPos:  4747,
+								EndPos:    4749,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15502,8 +15127,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 273,
 									EndLine:   273,
-									StartPos:  5212,
-									EndPos:    5214,
+									StartPos:  4747,
+									EndPos:    4749,
 								},
 							},
 							Value: []byte("$b"),
@@ -15516,8 +15141,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 274,
 						EndLine:   274,
-						StartPos:  5218,
-						EndPos:    5226,
+						StartPos:  4751,
+						EndPos:    4759,
 					},
 				},
 				Expr: &ast.ExprBinaryDiv{
@@ -15525,8 +15150,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 274,
 							EndLine:   274,
-							StartPos:  5218,
-							EndPos:    5225,
+							StartPos:  4751,
+							EndPos:    4758,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15534,8 +15159,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 274,
 								EndLine:   274,
-								StartPos:  5218,
-								EndPos:    5220,
+								StartPos:  4751,
+								EndPos:    4753,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15543,8 +15168,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 274,
 									EndLine:   274,
-									StartPos:  5218,
-									EndPos:    5220,
+									StartPos:  4751,
+									EndPos:    4753,
 								},
 							},
 							Value: []byte("$a"),
@@ -15555,8 +15180,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 274,
 								EndLine:   274,
-								StartPos:  5223,
-								EndPos:    5225,
+								StartPos:  4756,
+								EndPos:    4758,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15564,8 +15189,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 274,
 									EndLine:   274,
-									StartPos:  5223,
-									EndPos:    5225,
+									StartPos:  4756,
+									EndPos:    4758,
 								},
 							},
 							Value: []byte("$b"),
@@ -15578,8 +15203,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 275,
 						EndLine:   275,
-						StartPos:  5229,
-						EndPos:    5238,
+						StartPos:  4760,
+						EndPos:    4769,
 					},
 				},
 				Expr: &ast.ExprBinaryEqual{
@@ -15587,8 +15212,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 275,
 							EndLine:   275,
-							StartPos:  5229,
-							EndPos:    5237,
+							StartPos:  4760,
+							EndPos:    4768,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15596,8 +15221,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 275,
 								EndLine:   275,
-								StartPos:  5229,
-								EndPos:    5231,
+								StartPos:  4760,
+								EndPos:    4762,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15605,8 +15230,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 275,
 									EndLine:   275,
-									StartPos:  5229,
-									EndPos:    5231,
+									StartPos:  4760,
+									EndPos:    4762,
 								},
 							},
 							Value: []byte("$a"),
@@ -15617,8 +15242,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 275,
 								EndLine:   275,
-								StartPos:  5235,
-								EndPos:    5237,
+								StartPos:  4766,
+								EndPos:    4768,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15626,8 +15251,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 275,
 									EndLine:   275,
-									StartPos:  5235,
-									EndPos:    5237,
+									StartPos:  4766,
+									EndPos:    4768,
 								},
 							},
 							Value: []byte("$b"),
@@ -15640,8 +15265,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 276,
 						EndLine:   276,
-						StartPos:  5241,
-						EndPos:    5250,
+						StartPos:  4770,
+						EndPos:    4779,
 					},
 				},
 				Expr: &ast.ExprBinaryGreaterOrEqual{
@@ -15649,8 +15274,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 276,
 							EndLine:   276,
-							StartPos:  5241,
-							EndPos:    5249,
+							StartPos:  4770,
+							EndPos:    4778,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15658,8 +15283,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 276,
 								EndLine:   276,
-								StartPos:  5241,
-								EndPos:    5243,
+								StartPos:  4770,
+								EndPos:    4772,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15667,8 +15292,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 276,
 									EndLine:   276,
-									StartPos:  5241,
-									EndPos:    5243,
+									StartPos:  4770,
+									EndPos:    4772,
 								},
 							},
 							Value: []byte("$a"),
@@ -15679,8 +15304,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 276,
 								EndLine:   276,
-								StartPos:  5247,
-								EndPos:    5249,
+								StartPos:  4776,
+								EndPos:    4778,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15688,8 +15313,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 276,
 									EndLine:   276,
-									StartPos:  5247,
-									EndPos:    5249,
+									StartPos:  4776,
+									EndPos:    4778,
 								},
 							},
 							Value: []byte("$b"),
@@ -15702,8 +15327,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 277,
 						EndLine:   277,
-						StartPos:  5253,
-						EndPos:    5261,
+						StartPos:  4780,
+						EndPos:    4788,
 					},
 				},
 				Expr: &ast.ExprBinaryGreater{
@@ -15711,8 +15336,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 277,
 							EndLine:   277,
-							StartPos:  5253,
-							EndPos:    5260,
+							StartPos:  4780,
+							EndPos:    4787,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15720,8 +15345,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 277,
 								EndLine:   277,
-								StartPos:  5253,
-								EndPos:    5255,
+								StartPos:  4780,
+								EndPos:    4782,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15729,8 +15354,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 277,
 									EndLine:   277,
-									StartPos:  5253,
-									EndPos:    5255,
+									StartPos:  4780,
+									EndPos:    4782,
 								},
 							},
 							Value: []byte("$a"),
@@ -15741,8 +15366,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 277,
 								EndLine:   277,
-								StartPos:  5258,
-								EndPos:    5260,
+								StartPos:  4785,
+								EndPos:    4787,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15750,8 +15375,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 277,
 									EndLine:   277,
-									StartPos:  5258,
-									EndPos:    5260,
+									StartPos:  4785,
+									EndPos:    4787,
 								},
 							},
 							Value: []byte("$b"),
@@ -15764,8 +15389,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 278,
 						EndLine:   278,
-						StartPos:  5264,
-						EndPos:    5274,
+						StartPos:  4789,
+						EndPos:    4799,
 					},
 				},
 				Expr: &ast.ExprBinaryIdentical{
@@ -15773,8 +15398,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 278,
 							EndLine:   278,
-							StartPos:  5264,
-							EndPos:    5273,
+							StartPos:  4789,
+							EndPos:    4798,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15782,8 +15407,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 278,
 								EndLine:   278,
-								StartPos:  5264,
-								EndPos:    5266,
+								StartPos:  4789,
+								EndPos:    4791,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15791,8 +15416,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 278,
 									EndLine:   278,
-									StartPos:  5264,
-									EndPos:    5266,
+									StartPos:  4789,
+									EndPos:    4791,
 								},
 							},
 							Value: []byte("$a"),
@@ -15803,8 +15428,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 278,
 								EndLine:   278,
-								StartPos:  5271,
-								EndPos:    5273,
+								StartPos:  4796,
+								EndPos:    4798,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15812,8 +15437,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 278,
 									EndLine:   278,
-									StartPos:  5271,
-									EndPos:    5273,
+									StartPos:  4796,
+									EndPos:    4798,
 								},
 							},
 							Value: []byte("$b"),
@@ -15826,8 +15451,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 279,
 						EndLine:   279,
-						StartPos:  5277,
-						EndPos:    5287,
+						StartPos:  4800,
+						EndPos:    4810,
 					},
 				},
 				Expr: &ast.ExprBinaryLogicalAnd{
@@ -15835,8 +15460,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 279,
 							EndLine:   279,
-							StartPos:  5277,
-							EndPos:    5286,
+							StartPos:  4800,
+							EndPos:    4809,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15844,8 +15469,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 279,
 								EndLine:   279,
-								StartPos:  5277,
-								EndPos:    5279,
+								StartPos:  4800,
+								EndPos:    4802,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15853,8 +15478,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 279,
 									EndLine:   279,
-									StartPos:  5277,
-									EndPos:    5279,
+									StartPos:  4800,
+									EndPos:    4802,
 								},
 							},
 							Value: []byte("$a"),
@@ -15865,8 +15490,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 279,
 								EndLine:   279,
-								StartPos:  5284,
-								EndPos:    5286,
+								StartPos:  4807,
+								EndPos:    4809,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15874,8 +15499,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 279,
 									EndLine:   279,
-									StartPos:  5284,
-									EndPos:    5286,
+									StartPos:  4807,
+									EndPos:    4809,
 								},
 							},
 							Value: []byte("$b"),
@@ -15888,8 +15513,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 280,
 						EndLine:   280,
-						StartPos:  5290,
-						EndPos:    5299,
+						StartPos:  4811,
+						EndPos:    4820,
 					},
 				},
 				Expr: &ast.ExprBinaryLogicalOr{
@@ -15897,8 +15522,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 280,
 							EndLine:   280,
-							StartPos:  5290,
-							EndPos:    5298,
+							StartPos:  4811,
+							EndPos:    4819,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15906,8 +15531,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 280,
 								EndLine:   280,
-								StartPos:  5290,
-								EndPos:    5292,
+								StartPos:  4811,
+								EndPos:    4813,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15915,8 +15540,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 280,
 									EndLine:   280,
-									StartPos:  5290,
-									EndPos:    5292,
+									StartPos:  4811,
+									EndPos:    4813,
 								},
 							},
 							Value: []byte("$a"),
@@ -15927,8 +15552,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 280,
 								EndLine:   280,
-								StartPos:  5296,
-								EndPos:    5298,
+								StartPos:  4817,
+								EndPos:    4819,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15936,8 +15561,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 280,
 									EndLine:   280,
-									StartPos:  5296,
-									EndPos:    5298,
+									StartPos:  4817,
+									EndPos:    4819,
 								},
 							},
 							Value: []byte("$b"),
@@ -15950,8 +15575,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 281,
 						EndLine:   281,
-						StartPos:  5302,
-						EndPos:    5312,
+						StartPos:  4821,
+						EndPos:    4831,
 					},
 				},
 				Expr: &ast.ExprBinaryLogicalXor{
@@ -15959,8 +15584,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 281,
 							EndLine:   281,
-							StartPos:  5302,
-							EndPos:    5311,
+							StartPos:  4821,
+							EndPos:    4830,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15968,8 +15593,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 281,
 								EndLine:   281,
-								StartPos:  5302,
-								EndPos:    5304,
+								StartPos:  4821,
+								EndPos:    4823,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15977,8 +15602,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 281,
 									EndLine:   281,
-									StartPos:  5302,
-									EndPos:    5304,
+									StartPos:  4821,
+									EndPos:    4823,
 								},
 							},
 							Value: []byte("$a"),
@@ -15989,8 +15614,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 281,
 								EndLine:   281,
-								StartPos:  5309,
-								EndPos:    5311,
+								StartPos:  4828,
+								EndPos:    4830,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15998,8 +15623,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 281,
 									EndLine:   281,
-									StartPos:  5309,
-									EndPos:    5311,
+									StartPos:  4828,
+									EndPos:    4830,
 								},
 							},
 							Value: []byte("$b"),
@@ -16012,8 +15637,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 282,
 						EndLine:   282,
-						StartPos:  5315,
-						EndPos:    5323,
+						StartPos:  4832,
+						EndPos:    4840,
 					},
 				},
 				Expr: &ast.ExprBinaryMinus{
@@ -16021,8 +15646,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 282,
 							EndLine:   282,
-							StartPos:  5315,
-							EndPos:    5322,
+							StartPos:  4832,
+							EndPos:    4839,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16030,8 +15655,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 282,
 								EndLine:   282,
-								StartPos:  5315,
-								EndPos:    5317,
+								StartPos:  4832,
+								EndPos:    4834,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16039,8 +15664,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 282,
 									EndLine:   282,
-									StartPos:  5315,
-									EndPos:    5317,
+									StartPos:  4832,
+									EndPos:    4834,
 								},
 							},
 							Value: []byte("$a"),
@@ -16051,8 +15676,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 282,
 								EndLine:   282,
-								StartPos:  5320,
-								EndPos:    5322,
+								StartPos:  4837,
+								EndPos:    4839,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16060,8 +15685,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 282,
 									EndLine:   282,
-									StartPos:  5320,
-									EndPos:    5322,
+									StartPos:  4837,
+									EndPos:    4839,
 								},
 							},
 							Value: []byte("$b"),
@@ -16074,8 +15699,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 283,
 						EndLine:   283,
-						StartPos:  5326,
-						EndPos:    5334,
+						StartPos:  4841,
+						EndPos:    4849,
 					},
 				},
 				Expr: &ast.ExprBinaryMod{
@@ -16083,8 +15708,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 283,
 							EndLine:   283,
-							StartPos:  5326,
-							EndPos:    5333,
+							StartPos:  4841,
+							EndPos:    4848,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16092,8 +15717,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 283,
 								EndLine:   283,
-								StartPos:  5326,
-								EndPos:    5328,
+								StartPos:  4841,
+								EndPos:    4843,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16101,8 +15726,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 283,
 									EndLine:   283,
-									StartPos:  5326,
-									EndPos:    5328,
+									StartPos:  4841,
+									EndPos:    4843,
 								},
 							},
 							Value: []byte("$a"),
@@ -16113,8 +15738,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 283,
 								EndLine:   283,
-								StartPos:  5331,
-								EndPos:    5333,
+								StartPos:  4846,
+								EndPos:    4848,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16122,8 +15747,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 283,
 									EndLine:   283,
-									StartPos:  5331,
-									EndPos:    5333,
+									StartPos:  4846,
+									EndPos:    4848,
 								},
 							},
 							Value: []byte("$b"),
@@ -16136,8 +15761,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 284,
 						EndLine:   284,
-						StartPos:  5337,
-						EndPos:    5345,
+						StartPos:  4850,
+						EndPos:    4858,
 					},
 				},
 				Expr: &ast.ExprBinaryMul{
@@ -16145,8 +15770,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 284,
 							EndLine:   284,
-							StartPos:  5337,
-							EndPos:    5344,
+							StartPos:  4850,
+							EndPos:    4857,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16154,8 +15779,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 284,
 								EndLine:   284,
-								StartPos:  5337,
-								EndPos:    5339,
+								StartPos:  4850,
+								EndPos:    4852,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16163,8 +15788,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 284,
 									EndLine:   284,
-									StartPos:  5337,
-									EndPos:    5339,
+									StartPos:  4850,
+									EndPos:    4852,
 								},
 							},
 							Value: []byte("$a"),
@@ -16175,8 +15800,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 284,
 								EndLine:   284,
-								StartPos:  5342,
-								EndPos:    5344,
+								StartPos:  4855,
+								EndPos:    4857,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16184,8 +15809,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 284,
 									EndLine:   284,
-									StartPos:  5342,
-									EndPos:    5344,
+									StartPos:  4855,
+									EndPos:    4857,
 								},
 							},
 							Value: []byte("$b"),
@@ -16198,8 +15823,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 285,
 						EndLine:   285,
-						StartPos:  5348,
-						EndPos:    5357,
+						StartPos:  4859,
+						EndPos:    4868,
 					},
 				},
 				Expr: &ast.ExprBinaryNotEqual{
@@ -16207,8 +15832,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 285,
 							EndLine:   285,
-							StartPos:  5348,
-							EndPos:    5356,
+							StartPos:  4859,
+							EndPos:    4867,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16216,8 +15841,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 285,
 								EndLine:   285,
-								StartPos:  5348,
-								EndPos:    5350,
+								StartPos:  4859,
+								EndPos:    4861,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16225,8 +15850,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 285,
 									EndLine:   285,
-									StartPos:  5348,
-									EndPos:    5350,
+									StartPos:  4859,
+									EndPos:    4861,
 								},
 							},
 							Value: []byte("$a"),
@@ -16237,8 +15862,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 285,
 								EndLine:   285,
-								StartPos:  5354,
-								EndPos:    5356,
+								StartPos:  4865,
+								EndPos:    4867,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16246,8 +15871,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 285,
 									EndLine:   285,
-									StartPos:  5354,
-									EndPos:    5356,
+									StartPos:  4865,
+									EndPos:    4867,
 								},
 							},
 							Value: []byte("$b"),
@@ -16260,8 +15885,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 286,
 						EndLine:   286,
-						StartPos:  5360,
-						EndPos:    5370,
+						StartPos:  4869,
+						EndPos:    4879,
 					},
 				},
 				Expr: &ast.ExprBinaryNotIdentical{
@@ -16269,8 +15894,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 286,
 							EndLine:   286,
-							StartPos:  5360,
-							EndPos:    5369,
+							StartPos:  4869,
+							EndPos:    4878,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16278,8 +15903,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 286,
 								EndLine:   286,
-								StartPos:  5360,
-								EndPos:    5362,
+								StartPos:  4869,
+								EndPos:    4871,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16287,8 +15912,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 286,
 									EndLine:   286,
-									StartPos:  5360,
-									EndPos:    5362,
+									StartPos:  4869,
+									EndPos:    4871,
 								},
 							},
 							Value: []byte("$a"),
@@ -16299,8 +15924,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 286,
 								EndLine:   286,
-								StartPos:  5367,
-								EndPos:    5369,
+								StartPos:  4876,
+								EndPos:    4878,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16308,8 +15933,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 286,
 									EndLine:   286,
-									StartPos:  5367,
-									EndPos:    5369,
+									StartPos:  4876,
+									EndPos:    4878,
 								},
 							},
 							Value: []byte("$b"),
@@ -16322,8 +15947,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 287,
 						EndLine:   287,
-						StartPos:  5373,
-						EndPos:    5381,
+						StartPos:  4880,
+						EndPos:    4888,
 					},
 				},
 				Expr: &ast.ExprBinaryPlus{
@@ -16331,8 +15956,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 287,
 							EndLine:   287,
-							StartPos:  5373,
-							EndPos:    5380,
+							StartPos:  4880,
+							EndPos:    4887,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16340,8 +15965,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 287,
 								EndLine:   287,
-								StartPos:  5373,
-								EndPos:    5375,
+								StartPos:  4880,
+								EndPos:    4882,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16349,8 +15974,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 287,
 									EndLine:   287,
-									StartPos:  5373,
-									EndPos:    5375,
+									StartPos:  4880,
+									EndPos:    4882,
 								},
 							},
 							Value: []byte("$a"),
@@ -16361,8 +15986,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 287,
 								EndLine:   287,
-								StartPos:  5378,
-								EndPos:    5380,
+								StartPos:  4885,
+								EndPos:    4887,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16370,8 +15995,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 287,
 									EndLine:   287,
-									StartPos:  5378,
-									EndPos:    5380,
+									StartPos:  4885,
+									EndPos:    4887,
 								},
 							},
 							Value: []byte("$b"),
@@ -16384,8 +16009,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 288,
 						EndLine:   288,
-						StartPos:  5384,
-						EndPos:    5393,
+						StartPos:  4889,
+						EndPos:    4898,
 					},
 				},
 				Expr: &ast.ExprBinaryPow{
@@ -16393,8 +16018,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 288,
 							EndLine:   288,
-							StartPos:  5384,
-							EndPos:    5392,
+							StartPos:  4889,
+							EndPos:    4897,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16402,8 +16027,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 288,
 								EndLine:   288,
-								StartPos:  5384,
-								EndPos:    5386,
+								StartPos:  4889,
+								EndPos:    4891,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16411,8 +16036,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 288,
 									EndLine:   288,
-									StartPos:  5384,
-									EndPos:    5386,
+									StartPos:  4889,
+									EndPos:    4891,
 								},
 							},
 							Value: []byte("$a"),
@@ -16423,8 +16048,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 288,
 								EndLine:   288,
-								StartPos:  5390,
-								EndPos:    5392,
+								StartPos:  4895,
+								EndPos:    4897,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16432,8 +16057,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 288,
 									EndLine:   288,
-									StartPos:  5390,
-									EndPos:    5392,
+									StartPos:  4895,
+									EndPos:    4897,
 								},
 							},
 							Value: []byte("$b"),
@@ -16446,8 +16071,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 289,
 						EndLine:   289,
-						StartPos:  5396,
-						EndPos:    5405,
+						StartPos:  4899,
+						EndPos:    4908,
 					},
 				},
 				Expr: &ast.ExprBinaryShiftLeft{
@@ -16455,8 +16080,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 289,
 							EndLine:   289,
-							StartPos:  5396,
-							EndPos:    5404,
+							StartPos:  4899,
+							EndPos:    4907,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16464,8 +16089,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 289,
 								EndLine:   289,
-								StartPos:  5396,
-								EndPos:    5398,
+								StartPos:  4899,
+								EndPos:    4901,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16473,8 +16098,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 289,
 									EndLine:   289,
-									StartPos:  5396,
-									EndPos:    5398,
+									StartPos:  4899,
+									EndPos:    4901,
 								},
 							},
 							Value: []byte("$a"),
@@ -16485,8 +16110,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 289,
 								EndLine:   289,
-								StartPos:  5402,
-								EndPos:    5404,
+								StartPos:  4905,
+								EndPos:    4907,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16494,8 +16119,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 289,
 									EndLine:   289,
-									StartPos:  5402,
-									EndPos:    5404,
+									StartPos:  4905,
+									EndPos:    4907,
 								},
 							},
 							Value: []byte("$b"),
@@ -16508,8 +16133,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 290,
 						EndLine:   290,
-						StartPos:  5408,
-						EndPos:    5417,
+						StartPos:  4909,
+						EndPos:    4918,
 					},
 				},
 				Expr: &ast.ExprBinaryShiftRight{
@@ -16517,8 +16142,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 290,
 							EndLine:   290,
-							StartPos:  5408,
-							EndPos:    5416,
+							StartPos:  4909,
+							EndPos:    4917,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16526,8 +16151,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 290,
 								EndLine:   290,
-								StartPos:  5408,
-								EndPos:    5410,
+								StartPos:  4909,
+								EndPos:    4911,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16535,8 +16160,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 290,
 									EndLine:   290,
-									StartPos:  5408,
-									EndPos:    5410,
+									StartPos:  4909,
+									EndPos:    4911,
 								},
 							},
 							Value: []byte("$a"),
@@ -16547,8 +16172,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 290,
 								EndLine:   290,
-								StartPos:  5414,
-								EndPos:    5416,
+								StartPos:  4915,
+								EndPos:    4917,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16556,8 +16181,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 290,
 									EndLine:   290,
-									StartPos:  5414,
-									EndPos:    5416,
+									StartPos:  4915,
+									EndPos:    4917,
 								},
 							},
 							Value: []byte("$b"),
@@ -16570,8 +16195,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 291,
 						EndLine:   291,
-						StartPos:  5420,
-						EndPos:    5429,
+						StartPos:  4919,
+						EndPos:    4928,
 					},
 				},
 				Expr: &ast.ExprBinarySmallerOrEqual{
@@ -16579,8 +16204,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 291,
 							EndLine:   291,
-							StartPos:  5420,
-							EndPos:    5428,
+							StartPos:  4919,
+							EndPos:    4927,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16588,8 +16213,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 291,
 								EndLine:   291,
-								StartPos:  5420,
-								EndPos:    5422,
+								StartPos:  4919,
+								EndPos:    4921,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16597,8 +16222,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 291,
 									EndLine:   291,
-									StartPos:  5420,
-									EndPos:    5422,
+									StartPos:  4919,
+									EndPos:    4921,
 								},
 							},
 							Value: []byte("$a"),
@@ -16609,8 +16234,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 291,
 								EndLine:   291,
-								StartPos:  5426,
-								EndPos:    5428,
+								StartPos:  4925,
+								EndPos:    4927,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16618,8 +16243,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 291,
 									EndLine:   291,
-									StartPos:  5426,
-									EndPos:    5428,
+									StartPos:  4925,
+									EndPos:    4927,
 								},
 							},
 							Value: []byte("$b"),
@@ -16632,8 +16257,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 292,
 						EndLine:   292,
-						StartPos:  5432,
-						EndPos:    5440,
+						StartPos:  4929,
+						EndPos:    4937,
 					},
 				},
 				Expr: &ast.ExprBinarySmaller{
@@ -16641,8 +16266,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 292,
 							EndLine:   292,
-							StartPos:  5432,
-							EndPos:    5439,
+							StartPos:  4929,
+							EndPos:    4936,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16650,8 +16275,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 292,
 								EndLine:   292,
-								StartPos:  5432,
-								EndPos:    5434,
+								StartPos:  4929,
+								EndPos:    4931,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16659,8 +16284,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 292,
 									EndLine:   292,
-									StartPos:  5432,
-									EndPos:    5434,
+									StartPos:  4929,
+									EndPos:    4931,
 								},
 							},
 							Value: []byte("$a"),
@@ -16671,8 +16296,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 292,
 								EndLine:   292,
-								StartPos:  5437,
-								EndPos:    5439,
+								StartPos:  4934,
+								EndPos:    4936,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16680,8 +16305,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 292,
 									EndLine:   292,
-									StartPos:  5437,
-									EndPos:    5439,
+									StartPos:  4934,
+									EndPos:    4936,
 								},
 							},
 							Value: []byte("$b"),
@@ -16694,8 +16319,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 294,
 						EndLine:   294,
-						StartPos:  5444,
-						EndPos:    5453,
+						StartPos:  4939,
+						EndPos:    4948,
 					},
 				},
 				Expr: &ast.ExprAssignReference{
@@ -16703,8 +16328,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 294,
 							EndLine:   294,
-							StartPos:  5444,
-							EndPos:    5452,
+							StartPos:  4939,
+							EndPos:    4947,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -16712,8 +16337,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 294,
 								EndLine:   294,
-								StartPos:  5444,
-								EndPos:    5446,
+								StartPos:  4939,
+								EndPos:    4941,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16721,8 +16346,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 294,
 									EndLine:   294,
-									StartPos:  5444,
-									EndPos:    5446,
+									StartPos:  4939,
+									EndPos:    4941,
 								},
 							},
 							Value: []byte("$a"),
@@ -16733,8 +16358,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 294,
 								EndLine:   294,
-								StartPos:  5450,
-								EndPos:    5452,
+								StartPos:  4945,
+								EndPos:    4947,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16742,8 +16367,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 294,
 									EndLine:   294,
-									StartPos:  5450,
-									EndPos:    5452,
+									StartPos:  4945,
+									EndPos:    4947,
 								},
 							},
 							Value: []byte("$b"),
@@ -16756,8 +16381,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 295,
 						EndLine:   295,
-						StartPos:  5456,
-						EndPos:    5470,
+						StartPos:  4949,
+						EndPos:    4963,
 					},
 				},
 				Expr: &ast.ExprAssignReference{
@@ -16765,8 +16390,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 295,
 							EndLine:   295,
-							StartPos:  5456,
-							EndPos:    5469,
+							StartPos:  4949,
+							EndPos:    4962,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -16774,8 +16399,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 295,
 								EndLine:   295,
-								StartPos:  5456,
-								EndPos:    5458,
+								StartPos:  4949,
+								EndPos:    4951,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16783,8 +16408,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 295,
 									EndLine:   295,
-									StartPos:  5456,
-									EndPos:    5458,
+									StartPos:  4949,
+									EndPos:    4951,
 								},
 							},
 							Value: []byte("$a"),
@@ -16795,8 +16420,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 295,
 								EndLine:   295,
-								StartPos:  5462,
-								EndPos:    5469,
+								StartPos:  4955,
+								EndPos:    4962,
 							},
 						},
 						Class: &ast.NameName{
@@ -16804,8 +16429,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 295,
 									EndLine:   295,
-									StartPos:  5466,
-									EndPos:    5469,
+									StartPos:  4959,
+									EndPos:    4962,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -16814,8 +16439,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 295,
 											EndLine:   295,
-											StartPos:  5466,
-											EndPos:    5469,
+											StartPos:  4959,
+											EndPos:    4962,
 										},
 									},
 									Value: []byte("Foo"),
@@ -16830,8 +16455,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 296,
 						EndLine:   296,
-						StartPos:  5473,
-						EndPos:    5491,
+						StartPos:  4964,
+						EndPos:    4982,
 					},
 				},
 				Expr: &ast.ExprAssignReference{
@@ -16839,8 +16464,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 296,
 							EndLine:   296,
-							StartPos:  5473,
-							EndPos:    5490,
+							StartPos:  4964,
+							EndPos:    4981,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -16848,8 +16473,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 296,
 								EndLine:   296,
-								StartPos:  5473,
-								EndPos:    5475,
+								StartPos:  4964,
+								EndPos:    4966,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16857,8 +16482,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 296,
 									EndLine:   296,
-									StartPos:  5473,
-									EndPos:    5475,
+									StartPos:  4964,
+									EndPos:    4966,
 								},
 							},
 							Value: []byte("$a"),
@@ -16869,8 +16494,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 296,
 								EndLine:   296,
-								StartPos:  5479,
-								EndPos:    5490,
+								StartPos:  4970,
+								EndPos:    4981,
 							},
 						},
 						Class: &ast.NameName{
@@ -16878,8 +16503,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 296,
 									EndLine:   296,
-									StartPos:  5483,
-									EndPos:    5486,
+									StartPos:  4974,
+									EndPos:    4977,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -16888,8 +16513,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 296,
 											EndLine:   296,
-											StartPos:  5483,
-											EndPos:    5486,
+											StartPos:  4974,
+											EndPos:    4977,
 										},
 									},
 									Value: []byte("Foo"),
@@ -16901,8 +16526,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 296,
 									EndLine:   296,
-									StartPos:  5486,
-									EndPos:    5490,
+									StartPos:  4977,
+									EndPos:    4981,
 								},
 							},
 							Arguments: []ast.Vertex{
@@ -16911,19 +16536,17 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 296,
 											EndLine:   296,
-											StartPos:  5487,
-											EndPos:    5489,
+											StartPos:  4978,
+											EndPos:    4980,
 										},
 									},
-									IsReference: false,
-									Variadic:    false,
 									Expr: &ast.ExprVariable{
 										Node: ast.Node{
 											Position: &position.Position{
 												StartLine: 296,
 												EndLine:   296,
-												StartPos:  5487,
-												EndPos:    5489,
+												StartPos:  4978,
+												EndPos:    4980,
 											},
 										},
 										VarName: &ast.Identifier{
@@ -16931,8 +16554,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 296,
 													EndLine:   296,
-													StartPos:  5487,
-													EndPos:    5489,
+													StartPos:  4978,
+													EndPos:    4980,
 												},
 											},
 											Value: []byte("$b"),
@@ -16949,8 +16572,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 297,
 						EndLine:   297,
-						StartPos:  5494,
-						EndPos:    5502,
+						StartPos:  4983,
+						EndPos:    4991,
 					},
 				},
 				Expr: &ast.ExprAssign{
@@ -16958,8 +16581,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 297,
 							EndLine:   297,
-							StartPos:  5494,
-							EndPos:    5501,
+							StartPos:  4983,
+							EndPos:    4990,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -16967,8 +16590,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 297,
 								EndLine:   297,
-								StartPos:  5494,
-								EndPos:    5496,
+								StartPos:  4983,
+								EndPos:    4985,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16976,8 +16599,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 297,
 									EndLine:   297,
-									StartPos:  5494,
-									EndPos:    5496,
+									StartPos:  4983,
+									EndPos:    4985,
 								},
 							},
 							Value: []byte("$a"),
@@ -16988,8 +16611,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 297,
 								EndLine:   297,
-								StartPos:  5499,
-								EndPos:    5501,
+								StartPos:  4988,
+								EndPos:    4990,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16997,8 +16620,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 297,
 									EndLine:   297,
-									StartPos:  5499,
-									EndPos:    5501,
+									StartPos:  4988,
+									EndPos:    4990,
 								},
 							},
 							Value: []byte("$b"),
@@ -17011,8 +16634,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 298,
 						EndLine:   298,
-						StartPos:  5505,
-						EndPos:    5514,
+						StartPos:  4992,
+						EndPos:    5001,
 					},
 				},
 				Expr: &ast.ExprAssignBitwiseAnd{
@@ -17020,8 +16643,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 298,
 							EndLine:   298,
-							StartPos:  5505,
-							EndPos:    5513,
+							StartPos:  4992,
+							EndPos:    5000,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17029,8 +16652,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 298,
 								EndLine:   298,
-								StartPos:  5505,
-								EndPos:    5507,
+								StartPos:  4992,
+								EndPos:    4994,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17038,8 +16661,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 298,
 									EndLine:   298,
-									StartPos:  5505,
-									EndPos:    5507,
+									StartPos:  4992,
+									EndPos:    4994,
 								},
 							},
 							Value: []byte("$a"),
@@ -17050,8 +16673,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 298,
 								EndLine:   298,
-								StartPos:  5511,
-								EndPos:    5513,
+								StartPos:  4998,
+								EndPos:    5000,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17059,8 +16682,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 298,
 									EndLine:   298,
-									StartPos:  5511,
-									EndPos:    5513,
+									StartPos:  4998,
+									EndPos:    5000,
 								},
 							},
 							Value: []byte("$b"),
@@ -17073,8 +16696,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 299,
 						EndLine:   299,
-						StartPos:  5517,
-						EndPos:    5526,
+						StartPos:  5002,
+						EndPos:    5011,
 					},
 				},
 				Expr: &ast.ExprAssignBitwiseOr{
@@ -17082,8 +16705,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 299,
 							EndLine:   299,
-							StartPos:  5517,
-							EndPos:    5525,
+							StartPos:  5002,
+							EndPos:    5010,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17091,8 +16714,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 299,
 								EndLine:   299,
-								StartPos:  5517,
-								EndPos:    5519,
+								StartPos:  5002,
+								EndPos:    5004,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17100,8 +16723,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 299,
 									EndLine:   299,
-									StartPos:  5517,
-									EndPos:    5519,
+									StartPos:  5002,
+									EndPos:    5004,
 								},
 							},
 							Value: []byte("$a"),
@@ -17112,8 +16735,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 299,
 								EndLine:   299,
-								StartPos:  5523,
-								EndPos:    5525,
+								StartPos:  5008,
+								EndPos:    5010,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17121,8 +16744,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 299,
 									EndLine:   299,
-									StartPos:  5523,
-									EndPos:    5525,
+									StartPos:  5008,
+									EndPos:    5010,
 								},
 							},
 							Value: []byte("$b"),
@@ -17135,8 +16758,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 300,
 						EndLine:   300,
-						StartPos:  5529,
-						EndPos:    5538,
+						StartPos:  5012,
+						EndPos:    5021,
 					},
 				},
 				Expr: &ast.ExprAssignBitwiseXor{
@@ -17144,8 +16767,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 300,
 							EndLine:   300,
-							StartPos:  5529,
-							EndPos:    5537,
+							StartPos:  5012,
+							EndPos:    5020,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17153,8 +16776,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 300,
 								EndLine:   300,
-								StartPos:  5529,
-								EndPos:    5531,
+								StartPos:  5012,
+								EndPos:    5014,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17162,8 +16785,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 300,
 									EndLine:   300,
-									StartPos:  5529,
-									EndPos:    5531,
+									StartPos:  5012,
+									EndPos:    5014,
 								},
 							},
 							Value: []byte("$a"),
@@ -17174,8 +16797,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 300,
 								EndLine:   300,
-								StartPos:  5535,
-								EndPos:    5537,
+								StartPos:  5018,
+								EndPos:    5020,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17183,8 +16806,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 300,
 									EndLine:   300,
-									StartPos:  5535,
-									EndPos:    5537,
+									StartPos:  5018,
+									EndPos:    5020,
 								},
 							},
 							Value: []byte("$b"),
@@ -17197,8 +16820,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 301,
 						EndLine:   301,
-						StartPos:  5541,
-						EndPos:    5550,
+						StartPos:  5022,
+						EndPos:    5031,
 					},
 				},
 				Expr: &ast.ExprAssignConcat{
@@ -17206,8 +16829,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 301,
 							EndLine:   301,
-							StartPos:  5541,
-							EndPos:    5549,
+							StartPos:  5022,
+							EndPos:    5030,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17215,8 +16838,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 301,
 								EndLine:   301,
-								StartPos:  5541,
-								EndPos:    5543,
+								StartPos:  5022,
+								EndPos:    5024,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17224,8 +16847,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 301,
 									EndLine:   301,
-									StartPos:  5541,
-									EndPos:    5543,
+									StartPos:  5022,
+									EndPos:    5024,
 								},
 							},
 							Value: []byte("$a"),
@@ -17236,8 +16859,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 301,
 								EndLine:   301,
-								StartPos:  5547,
-								EndPos:    5549,
+								StartPos:  5028,
+								EndPos:    5030,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17245,8 +16868,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 301,
 									EndLine:   301,
-									StartPos:  5547,
-									EndPos:    5549,
+									StartPos:  5028,
+									EndPos:    5030,
 								},
 							},
 							Value: []byte("$b"),
@@ -17259,8 +16882,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 302,
 						EndLine:   302,
-						StartPos:  5553,
-						EndPos:    5562,
+						StartPos:  5032,
+						EndPos:    5041,
 					},
 				},
 				Expr: &ast.ExprAssignDiv{
@@ -17268,8 +16891,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 302,
 							EndLine:   302,
-							StartPos:  5553,
-							EndPos:    5561,
+							StartPos:  5032,
+							EndPos:    5040,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17277,8 +16900,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 302,
 								EndLine:   302,
-								StartPos:  5553,
-								EndPos:    5555,
+								StartPos:  5032,
+								EndPos:    5034,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17286,8 +16909,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 302,
 									EndLine:   302,
-									StartPos:  5553,
-									EndPos:    5555,
+									StartPos:  5032,
+									EndPos:    5034,
 								},
 							},
 							Value: []byte("$a"),
@@ -17298,8 +16921,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 302,
 								EndLine:   302,
-								StartPos:  5559,
-								EndPos:    5561,
+								StartPos:  5038,
+								EndPos:    5040,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17307,8 +16930,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 302,
 									EndLine:   302,
-									StartPos:  5559,
-									EndPos:    5561,
+									StartPos:  5038,
+									EndPos:    5040,
 								},
 							},
 							Value: []byte("$b"),
@@ -17321,8 +16944,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 303,
 						EndLine:   303,
-						StartPos:  5565,
-						EndPos:    5574,
+						StartPos:  5042,
+						EndPos:    5051,
 					},
 				},
 				Expr: &ast.ExprAssignMinus{
@@ -17330,8 +16953,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 303,
 							EndLine:   303,
-							StartPos:  5565,
-							EndPos:    5573,
+							StartPos:  5042,
+							EndPos:    5050,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17339,8 +16962,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 303,
 								EndLine:   303,
-								StartPos:  5565,
-								EndPos:    5567,
+								StartPos:  5042,
+								EndPos:    5044,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17348,8 +16971,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 303,
 									EndLine:   303,
-									StartPos:  5565,
-									EndPos:    5567,
+									StartPos:  5042,
+									EndPos:    5044,
 								},
 							},
 							Value: []byte("$a"),
@@ -17360,8 +16983,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 303,
 								EndLine:   303,
-								StartPos:  5571,
-								EndPos:    5573,
+								StartPos:  5048,
+								EndPos:    5050,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17369,8 +16992,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 303,
 									EndLine:   303,
-									StartPos:  5571,
-									EndPos:    5573,
+									StartPos:  5048,
+									EndPos:    5050,
 								},
 							},
 							Value: []byte("$b"),
@@ -17383,8 +17006,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 304,
 						EndLine:   304,
-						StartPos:  5577,
-						EndPos:    5586,
+						StartPos:  5052,
+						EndPos:    5061,
 					},
 				},
 				Expr: &ast.ExprAssignMod{
@@ -17392,8 +17015,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 304,
 							EndLine:   304,
-							StartPos:  5577,
-							EndPos:    5585,
+							StartPos:  5052,
+							EndPos:    5060,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17401,8 +17024,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 304,
 								EndLine:   304,
-								StartPos:  5577,
-								EndPos:    5579,
+								StartPos:  5052,
+								EndPos:    5054,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17410,8 +17033,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 304,
 									EndLine:   304,
-									StartPos:  5577,
-									EndPos:    5579,
+									StartPos:  5052,
+									EndPos:    5054,
 								},
 							},
 							Value: []byte("$a"),
@@ -17422,8 +17045,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 304,
 								EndLine:   304,
-								StartPos:  5583,
-								EndPos:    5585,
+								StartPos:  5058,
+								EndPos:    5060,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17431,8 +17054,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 304,
 									EndLine:   304,
-									StartPos:  5583,
-									EndPos:    5585,
+									StartPos:  5058,
+									EndPos:    5060,
 								},
 							},
 							Value: []byte("$b"),
@@ -17445,8 +17068,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 305,
 						EndLine:   305,
-						StartPos:  5589,
-						EndPos:    5598,
+						StartPos:  5062,
+						EndPos:    5071,
 					},
 				},
 				Expr: &ast.ExprAssignMul{
@@ -17454,8 +17077,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 305,
 							EndLine:   305,
-							StartPos:  5589,
-							EndPos:    5597,
+							StartPos:  5062,
+							EndPos:    5070,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17463,8 +17086,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 305,
 								EndLine:   305,
-								StartPos:  5589,
-								EndPos:    5591,
+								StartPos:  5062,
+								EndPos:    5064,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17472,8 +17095,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 305,
 									EndLine:   305,
-									StartPos:  5589,
-									EndPos:    5591,
+									StartPos:  5062,
+									EndPos:    5064,
 								},
 							},
 							Value: []byte("$a"),
@@ -17484,8 +17107,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 305,
 								EndLine:   305,
-								StartPos:  5595,
-								EndPos:    5597,
+								StartPos:  5068,
+								EndPos:    5070,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17493,8 +17116,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 305,
 									EndLine:   305,
-									StartPos:  5595,
-									EndPos:    5597,
+									StartPos:  5068,
+									EndPos:    5070,
 								},
 							},
 							Value: []byte("$b"),
@@ -17507,8 +17130,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 306,
 						EndLine:   306,
-						StartPos:  5601,
-						EndPos:    5610,
+						StartPos:  5072,
+						EndPos:    5081,
 					},
 				},
 				Expr: &ast.ExprAssignPlus{
@@ -17516,8 +17139,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 306,
 							EndLine:   306,
-							StartPos:  5601,
-							EndPos:    5609,
+							StartPos:  5072,
+							EndPos:    5080,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17525,8 +17148,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 306,
 								EndLine:   306,
-								StartPos:  5601,
-								EndPos:    5603,
+								StartPos:  5072,
+								EndPos:    5074,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17534,8 +17157,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 306,
 									EndLine:   306,
-									StartPos:  5601,
-									EndPos:    5603,
+									StartPos:  5072,
+									EndPos:    5074,
 								},
 							},
 							Value: []byte("$a"),
@@ -17546,8 +17169,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 306,
 								EndLine:   306,
-								StartPos:  5607,
-								EndPos:    5609,
+								StartPos:  5078,
+								EndPos:    5080,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17555,8 +17178,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 306,
 									EndLine:   306,
-									StartPos:  5607,
-									EndPos:    5609,
+									StartPos:  5078,
+									EndPos:    5080,
 								},
 							},
 							Value: []byte("$b"),
@@ -17569,8 +17192,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 307,
 						EndLine:   307,
-						StartPos:  5613,
-						EndPos:    5623,
+						StartPos:  5082,
+						EndPos:    5092,
 					},
 				},
 				Expr: &ast.ExprAssignPow{
@@ -17578,8 +17201,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 307,
 							EndLine:   307,
-							StartPos:  5613,
-							EndPos:    5622,
+							StartPos:  5082,
+							EndPos:    5091,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17587,8 +17210,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 307,
 								EndLine:   307,
-								StartPos:  5613,
-								EndPos:    5615,
+								StartPos:  5082,
+								EndPos:    5084,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17596,8 +17219,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 307,
 									EndLine:   307,
-									StartPos:  5613,
-									EndPos:    5615,
+									StartPos:  5082,
+									EndPos:    5084,
 								},
 							},
 							Value: []byte("$a"),
@@ -17608,8 +17231,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 307,
 								EndLine:   307,
-								StartPos:  5620,
-								EndPos:    5622,
+								StartPos:  5089,
+								EndPos:    5091,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17617,8 +17240,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 307,
 									EndLine:   307,
-									StartPos:  5620,
-									EndPos:    5622,
+									StartPos:  5089,
+									EndPos:    5091,
 								},
 							},
 							Value: []byte("$b"),
@@ -17631,8 +17254,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 308,
 						EndLine:   308,
-						StartPos:  5626,
-						EndPos:    5636,
+						StartPos:  5093,
+						EndPos:    5103,
 					},
 				},
 				Expr: &ast.ExprAssignShiftLeft{
@@ -17640,8 +17263,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 308,
 							EndLine:   308,
-							StartPos:  5626,
-							EndPos:    5635,
+							StartPos:  5093,
+							EndPos:    5102,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17649,8 +17272,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 308,
 								EndLine:   308,
-								StartPos:  5626,
-								EndPos:    5628,
+								StartPos:  5093,
+								EndPos:    5095,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17658,8 +17281,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 308,
 									EndLine:   308,
-									StartPos:  5626,
-									EndPos:    5628,
+									StartPos:  5093,
+									EndPos:    5095,
 								},
 							},
 							Value: []byte("$a"),
@@ -17670,8 +17293,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 308,
 								EndLine:   308,
-								StartPos:  5633,
-								EndPos:    5635,
+								StartPos:  5100,
+								EndPos:    5102,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17679,8 +17302,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 308,
 									EndLine:   308,
-									StartPos:  5633,
-									EndPos:    5635,
+									StartPos:  5100,
+									EndPos:    5102,
 								},
 							},
 							Value: []byte("$b"),
@@ -17693,8 +17316,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 309,
 						EndLine:   309,
-						StartPos:  5639,
-						EndPos:    5649,
+						StartPos:  5104,
+						EndPos:    5114,
 					},
 				},
 				Expr: &ast.ExprAssignShiftRight{
@@ -17702,8 +17325,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 309,
 							EndLine:   309,
-							StartPos:  5639,
-							EndPos:    5648,
+							StartPos:  5104,
+							EndPos:    5113,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17711,8 +17334,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 309,
 								EndLine:   309,
-								StartPos:  5639,
-								EndPos:    5641,
+								StartPos:  5104,
+								EndPos:    5106,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17720,8 +17343,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 309,
 									EndLine:   309,
-									StartPos:  5639,
-									EndPos:    5641,
+									StartPos:  5104,
+									EndPos:    5106,
 								},
 							},
 							Value: []byte("$a"),
@@ -17732,8 +17355,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 309,
 								EndLine:   309,
-								StartPos:  5646,
-								EndPos:    5648,
+								StartPos:  5111,
+								EndPos:    5113,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17741,8 +17364,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 309,
 									EndLine:   309,
-									StartPos:  5646,
-									EndPos:    5648,
+									StartPos:  5111,
+									EndPos:    5113,
 								},
 							},
 							Value: []byte("$b"),
@@ -17755,8 +17378,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 312,
 						EndLine:   312,
-						StartPos:  5655,
-						EndPos:    5667,
+						StartPos:  5118,
+						EndPos:    5130,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -17764,8 +17387,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 312,
 							EndLine:   312,
-							StartPos:  5655,
-							EndPos:    5665,
+							StartPos:  5118,
+							EndPos:    5128,
 						},
 					},
 					Class: &ast.NameFullyQualified{
@@ -17773,8 +17396,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 312,
 								EndLine:   312,
-								StartPos:  5659,
-								EndPos:    5663,
+								StartPos:  5122,
+								EndPos:    5126,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -17783,8 +17406,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 312,
 										EndLine:   312,
-										StartPos:  5660,
-										EndPos:    5663,
+										StartPos:  5123,
+										EndPos:    5126,
 									},
 								},
 								Value: []byte("Foo"),
@@ -17796,8 +17419,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 312,
 								EndLine:   312,
-								StartPos:  5663,
-								EndPos:    5665,
+								StartPos:  5126,
+								EndPos:    5128,
 							},
 						},
 					},
@@ -17808,8 +17431,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 313,
 						EndLine:   313,
-						StartPos:  5691,
-						EndPos:    5695,
+						StartPos:  5152,
+						EndPos:    5156,
 					},
 				},
 				Expr: &ast.ExprPropertyFetch{
@@ -17817,8 +17440,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 313,
 							EndLine:   313,
-							StartPos:  5691,
-							EndPos:    5694,
+							StartPos:  5152,
+							EndPos:    5155,
 						},
 					},
 					Var: &ast.ExprMethodCall{
@@ -17826,8 +17449,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 313,
 								EndLine:   313,
-								StartPos:  5687,
-								EndPos:    5689,
+								StartPos:  5148,
+								EndPos:    5150,
 							},
 						},
 						Var: &ast.ExprNew{
@@ -17835,8 +17458,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 313,
 									EndLine:   313,
-									StartPos:  5671,
-									EndPos:    5681,
+									StartPos:  5132,
+									EndPos:    5142,
 								},
 							},
 							Class: &ast.NameFullyQualified{
@@ -17844,8 +17467,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 313,
 										EndLine:   313,
-										StartPos:  5675,
-										EndPos:    5679,
+										StartPos:  5136,
+										EndPos:    5140,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -17854,8 +17477,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 313,
 												EndLine:   313,
-												StartPos:  5676,
-												EndPos:    5679,
+												StartPos:  5137,
+												EndPos:    5140,
 											},
 										},
 										Value: []byte("Foo"),
@@ -17867,8 +17490,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 313,
 										EndLine:   313,
-										StartPos:  5679,
-										EndPos:    5681,
+										StartPos:  5140,
+										EndPos:    5142,
 									},
 								},
 							},
@@ -17878,8 +17501,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 313,
 									EndLine:   313,
-									StartPos:  5684,
-									EndPos:    5687,
+									StartPos:  5145,
+									EndPos:    5148,
 								},
 							},
 							Value: []byte("bar"),
@@ -17889,8 +17512,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 313,
 									EndLine:   313,
-									StartPos:  5687,
-									EndPos:    5689,
+									StartPos:  5148,
+									EndPos:    5150,
 								},
 							},
 						},
@@ -17900,8 +17523,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 313,
 								EndLine:   313,
-								StartPos:  5691,
-								EndPos:    5694,
+								StartPos:  5152,
+								EndPos:    5155,
 							},
 						},
 						Value: []byte("baz"),
@@ -17913,8 +17536,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 314,
 						EndLine:   314,
-						StartPos:  5714,
-						EndPos:    5717,
+						StartPos:  5173,
+						EndPos:    5176,
 					},
 				},
 				Expr: &ast.ExprArrayDimFetch{
@@ -17922,8 +17545,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 314,
 							EndLine:   314,
-							StartPos:  5714,
-							EndPos:    5715,
+							StartPos:  5173,
+							EndPos:    5174,
 						},
 					},
 					Var: &ast.ExprArrayDimFetch{
@@ -17931,8 +17554,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 314,
 								EndLine:   314,
-								StartPos:  5711,
-								EndPos:    5712,
+								StartPos:  5170,
+								EndPos:    5171,
 							},
 						},
 						Var: &ast.ExprNew{
@@ -17940,8 +17563,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 314,
 									EndLine:   314,
-									StartPos:  5699,
-									EndPos:    5709,
+									StartPos:  5158,
+									EndPos:    5168,
 								},
 							},
 							Class: &ast.NameFullyQualified{
@@ -17949,8 +17572,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 314,
 										EndLine:   314,
-										StartPos:  5703,
-										EndPos:    5707,
+										StartPos:  5162,
+										EndPos:    5166,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -17959,8 +17582,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 314,
 												EndLine:   314,
-												StartPos:  5704,
-												EndPos:    5707,
+												StartPos:  5163,
+												EndPos:    5166,
 											},
 										},
 										Value: []byte("Foo"),
@@ -17972,8 +17595,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 314,
 										EndLine:   314,
-										StartPos:  5707,
-										EndPos:    5709,
+										StartPos:  5166,
+										EndPos:    5168,
 									},
 								},
 							},
@@ -17983,8 +17606,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 314,
 									EndLine:   314,
-									StartPos:  5711,
-									EndPos:    5712,
+									StartPos:  5170,
+									EndPos:    5171,
 								},
 							},
 							Value: []byte("0"),
@@ -17995,8 +17618,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 314,
 								EndLine:   314,
-								StartPos:  5714,
-								EndPos:    5715,
+								StartPos:  5173,
+								EndPos:    5174,
 							},
 						},
 						Value: []byte("0"),
@@ -18008,8 +17631,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 315,
 						EndLine:   315,
-						StartPos:  5740,
-						EndPos:    5743,
+						StartPos:  5197,
+						EndPos:    5200,
 					},
 				},
 				Expr: &ast.ExprMethodCall{
@@ -18017,8 +17640,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 315,
 							EndLine:   315,
-							StartPos:  5740,
-							EndPos:    5742,
+							StartPos:  5197,
+							EndPos:    5199,
 						},
 					},
 					Var: &ast.ExprArrayDimFetch{
@@ -18026,8 +17649,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 315,
 								EndLine:   315,
-								StartPos:  5733,
-								EndPos:    5734,
+								StartPos:  5190,
+								EndPos:    5191,
 							},
 						},
 						Var: &ast.ExprNew{
@@ -18035,8 +17658,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 315,
 									EndLine:   315,
-									StartPos:  5721,
-									EndPos:    5731,
+									StartPos:  5178,
+									EndPos:    5188,
 								},
 							},
 							Class: &ast.NameFullyQualified{
@@ -18044,8 +17667,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 315,
 										EndLine:   315,
-										StartPos:  5725,
-										EndPos:    5729,
+										StartPos:  5182,
+										EndPos:    5186,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -18054,8 +17677,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 315,
 												EndLine:   315,
-												StartPos:  5726,
-												EndPos:    5729,
+												StartPos:  5183,
+												EndPos:    5186,
 											},
 										},
 										Value: []byte("Foo"),
@@ -18067,8 +17690,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 315,
 										EndLine:   315,
-										StartPos:  5729,
-										EndPos:    5731,
+										StartPos:  5186,
+										EndPos:    5188,
 									},
 								},
 							},
@@ -18078,8 +17701,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 315,
 									EndLine:   315,
-									StartPos:  5733,
-									EndPos:    5734,
+									StartPos:  5190,
+									EndPos:    5191,
 								},
 							},
 							Value: []byte("0"),
@@ -18090,8 +17713,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 315,
 								EndLine:   315,
-								StartPos:  5737,
-								EndPos:    5740,
+								StartPos:  5194,
+								EndPos:    5197,
 							},
 						},
 						Value: []byte("bar"),
@@ -18101,8 +17724,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 315,
 								EndLine:   315,
-								StartPos:  5740,
-								EndPos:    5742,
+								StartPos:  5197,
+								EndPos:    5199,
 							},
 						},
 					},
@@ -18113,8 +17736,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 317,
 						EndLine:   317,
-						StartPos:  5747,
-						EndPos:    5764,
+						StartPos:  5202,
+						EndPos:    5219,
 					},
 				},
 				Expr: &ast.ExprArrayDimFetch{
@@ -18122,8 +17745,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 317,
 							EndLine:   317,
-							StartPos:  5747,
-							EndPos:    5763,
+							StartPos:  5202,
+							EndPos:    5218,
 						},
 					},
 					Var: &ast.ExprArrayDimFetch{
@@ -18131,8 +17754,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 317,
 								EndLine:   317,
-								StartPos:  5747,
-								EndPos:    5760,
+								StartPos:  5202,
+								EndPos:    5215,
 							},
 						},
 						Var: &ast.ExprArray{
@@ -18140,8 +17763,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 317,
 									EndLine:   317,
-									StartPos:  5747,
-									EndPos:    5757,
+									StartPos:  5202,
+									EndPos:    5212,
 								},
 							},
 							Items: []ast.Vertex{
@@ -18150,8 +17773,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 317,
 											EndLine:   317,
-											StartPos:  5753,
-											EndPos:    5756,
+											StartPos:  5208,
+											EndPos:    5211,
 										},
 									},
 									Val: &ast.ExprShortArray{
@@ -18159,8 +17782,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 317,
 												EndLine:   317,
-												StartPos:  5753,
-												EndPos:    5756,
+												StartPos:  5208,
+												EndPos:    5211,
 											},
 										},
 										Items: []ast.Vertex{
@@ -18169,8 +17792,8 @@ func TestPhp5(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 317,
 														EndLine:   317,
-														StartPos:  5754,
-														EndPos:    5755,
+														StartPos:  5209,
+														EndPos:    5210,
 													},
 												},
 												Val: &ast.ScalarLnumber{
@@ -18178,8 +17801,8 @@ func TestPhp5(t *testing.T) {
 														Position: &position.Position{
 															StartLine: 317,
 															EndLine:   317,
-															StartPos:  5754,
-															EndPos:    5755,
+															StartPos:  5209,
+															EndPos:    5210,
 														},
 													},
 													Value: []byte("0"),
@@ -18195,8 +17818,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 317,
 									EndLine:   317,
-									StartPos:  5758,
-									EndPos:    5759,
+									StartPos:  5213,
+									EndPos:    5214,
 								},
 							},
 							Value: []byte("0"),
@@ -18207,8 +17830,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 317,
 								EndLine:   317,
-								StartPos:  5761,
-								EndPos:    5762,
+								StartPos:  5216,
+								EndPos:    5217,
 							},
 						},
 						Value: []byte("0"),
@@ -18220,8 +17843,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 318,
 						EndLine:   318,
-						StartPos:  5767,
-						EndPos:    5776,
+						StartPos:  5220,
+						EndPos:    5229,
 					},
 				},
 				Expr: &ast.ExprArrayDimFetch{
@@ -18229,8 +17852,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 318,
 							EndLine:   318,
-							StartPos:  5767,
-							EndPos:    5775,
+							StartPos:  5220,
+							EndPos:    5228,
 						},
 					},
 					Var: &ast.ScalarString{
@@ -18238,8 +17861,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 318,
 								EndLine:   318,
-								StartPos:  5767,
-								EndPos:    5772,
+								StartPos:  5220,
+								EndPos:    5225,
 							},
 						},
 						Value: []byte("\"foo\""),
@@ -18249,8 +17872,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 318,
 								EndLine:   318,
-								StartPos:  5773,
-								EndPos:    5774,
+								StartPos:  5226,
+								EndPos:    5227,
 							},
 						},
 						Value: []byte("0"),
@@ -18262,8 +17885,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 319,
 						EndLine:   319,
-						StartPos:  5779,
-						EndPos:    5786,
+						StartPos:  5230,
+						EndPos:    5237,
 					},
 				},
 				Expr: &ast.ExprArrayDimFetch{
@@ -18271,8 +17894,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 319,
 							EndLine:   319,
-							StartPos:  5779,
-							EndPos:    5785,
+							StartPos:  5230,
+							EndPos:    5236,
 						},
 					},
 					Var: &ast.ExprConstFetch{
@@ -18280,8 +17903,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 319,
 								EndLine:   319,
-								StartPos:  5779,
-								EndPos:    5782,
+								StartPos:  5230,
+								EndPos:    5233,
 							},
 						},
 						Const: &ast.NameName{
@@ -18289,8 +17912,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 319,
 									EndLine:   319,
-									StartPos:  5779,
-									EndPos:    5782,
+									StartPos:  5230,
+									EndPos:    5233,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -18299,8 +17922,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 319,
 											EndLine:   319,
-											StartPos:  5779,
-											EndPos:    5782,
+											StartPos:  5230,
+											EndPos:    5233,
 										},
 									},
 									Value: []byte("foo"),
@@ -18313,8 +17936,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 319,
 								EndLine:   319,
-								StartPos:  5783,
-								EndPos:    5784,
+								StartPos:  5234,
+								EndPos:    5235,
 							},
 						},
 						Value: []byte("0"),
@@ -18326,8 +17949,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 320,
 						EndLine:   320,
-						StartPos:  5789,
-						EndPos:    5801,
+						StartPos:  5238,
+						EndPos:    5250,
 					},
 				},
 				Expr: &ast.ExprClassConstFetch{
@@ -18335,8 +17958,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 320,
 							EndLine:   320,
-							StartPos:  5789,
-							EndPos:    5800,
+							StartPos:  5238,
+							EndPos:    5249,
 						},
 					},
 					Class: &ast.Identifier{
@@ -18344,8 +17967,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 320,
 								EndLine:   320,
-								StartPos:  5789,
-								EndPos:    5795,
+								StartPos:  5238,
+								EndPos:    5244,
 							},
 						},
 						Value: []byte("static"),
@@ -18355,8 +17978,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 320,
 								EndLine:   320,
-								StartPos:  5797,
-								EndPos:    5800,
+								StartPos:  5246,
+								EndPos:    5249,
 							},
 						},
 						Value: []byte("foo"),
@@ -18368,8 +17991,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 322,
 						EndLine:   322,
-						StartPos:  5805,
-						EndPos:    5814,
+						StartPos:  5252,
+						EndPos:    5261,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -18377,8 +18000,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 322,
 							EndLine:   322,
-							StartPos:  5805,
-							EndPos:    5813,
+							StartPos:  5252,
+							EndPos:    5260,
 						},
 					},
 					Class: &ast.ExprVariable{
@@ -18386,8 +18009,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 322,
 								EndLine:   322,
-								StartPos:  5809,
-								EndPos:    5813,
+								StartPos:  5256,
+								EndPos:    5260,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -18395,8 +18018,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 322,
 									EndLine:   322,
-									StartPos:  5809,
-									EndPos:    5813,
+									StartPos:  5256,
+									EndPos:    5260,
 								},
 							},
 							Value: []byte("$foo"),
@@ -18409,8 +18032,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 323,
 						EndLine:   323,
-						StartPos:  5817,
-						EndPos:    5832,
+						StartPos:  5262,
+						EndPos:    5277,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -18418,8 +18041,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 323,
 							EndLine:   323,
-							StartPos:  5817,
-							EndPos:    5831,
+							StartPos:  5262,
+							EndPos:    5276,
 						},
 					},
 					Class: &ast.ExprStaticPropertyFetch{
@@ -18427,8 +18050,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 323,
 								EndLine:   323,
-								StartPos:  5821,
-								EndPos:    5831,
+								StartPos:  5266,
+								EndPos:    5276,
 							},
 						},
 						Class: &ast.ExprVariable{
@@ -18436,8 +18059,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 323,
 									EndLine:   323,
-									StartPos:  5821,
-									EndPos:    5825,
+									StartPos:  5266,
+									EndPos:    5270,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -18445,8 +18068,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 323,
 										EndLine:   323,
-										StartPos:  5821,
-										EndPos:    5825,
+										StartPos:  5266,
+										EndPos:    5270,
 									},
 								},
 								Value: []byte("$foo"),
@@ -18457,8 +18080,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 323,
 									EndLine:   323,
-									StartPos:  5827,
-									EndPos:    5831,
+									StartPos:  5272,
+									EndPos:    5276,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -18466,8 +18089,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 323,
 										EndLine:   323,
-										StartPos:  5827,
-										EndPos:    5831,
+										StartPos:  5272,
+										EndPos:    5276,
 									},
 								},
 								Value: []byte("$bar"),
@@ -18481,8 +18104,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 324,
 						EndLine:   324,
-						StartPos:  5835,
-						EndPos:    5848,
+						StartPos:  5278,
+						EndPos:    5291,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -18490,8 +18113,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 324,
 							EndLine:   324,
-							StartPos:  5835,
-							EndPos:    5846,
+							StartPos:  5278,
+							EndPos:    5289,
 						},
 					},
 					Class: &ast.ExprArrayDimFetch{
@@ -18499,8 +18122,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 324,
 								EndLine:   324,
-								StartPos:  5845,
-								EndPos:    5846,
+								StartPos:  5288,
+								EndPos:    5289,
 							},
 						},
 						Var: &ast.ExprPropertyFetch{
@@ -18508,8 +18131,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 324,
 									EndLine:   324,
-									StartPos:  5843,
-									EndPos:    5846,
+									StartPos:  5286,
+									EndPos:    5289,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -18517,8 +18140,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 324,
 										EndLine:   324,
-										StartPos:  5839,
-										EndPos:    5844,
+										StartPos:  5282,
+										EndPos:    5287,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -18526,8 +18149,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 324,
 											EndLine:   324,
-											StartPos:  5839,
-											EndPos:    5841,
+											StartPos:  5282,
+											EndPos:    5284,
 										},
 									},
 									Value: []byte("$a"),
@@ -18538,8 +18161,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 324,
 										EndLine:   324,
-										StartPos:  5843,
-										EndPos:    5844,
+										StartPos:  5286,
+										EndPos:    5287,
 									},
 								},
 								Value: []byte("b"),
@@ -18550,8 +18173,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 324,
 									EndLine:   324,
-									StartPos:  5845,
-									EndPos:    5846,
+									StartPos:  5288,
+									EndPos:    5289,
 								},
 							},
 							Value: []byte("0"),
@@ -18564,8 +18187,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 325,
 						EndLine:   325,
-						StartPos:  5851,
-						EndPos:    5883,
+						StartPos:  5292,
+						EndPos:    5324,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -18573,8 +18196,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 325,
 							EndLine:   325,
-							StartPos:  5851,
-							EndPos:    5881,
+							StartPos:  5292,
+							EndPos:    5322,
 						},
 					},
 					Class: &ast.ExprArrayDimFetch{
@@ -18582,8 +18205,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 325,
 								EndLine:   325,
-								StartPos:  5880,
-								EndPos:    5881,
+								StartPos:  5321,
+								EndPos:    5322,
 							},
 						},
 						Var: &ast.ExprPropertyFetch{
@@ -18591,8 +18214,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 325,
 									EndLine:   325,
-									StartPos:  5878,
-									EndPos:    5881,
+									StartPos:  5319,
+									EndPos:    5322,
 								},
 							},
 							Var: &ast.ExprPropertyFetch{
@@ -18600,8 +18223,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 325,
 										EndLine:   325,
-										StartPos:  5874,
-										EndPos:    5879,
+										StartPos:  5315,
+										EndPos:    5320,
 									},
 								},
 								Var: &ast.ExprArrayDimFetch{
@@ -18609,8 +18232,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 325,
 											EndLine:   325,
-											StartPos:  5861,
-											EndPos:    5876,
+											StartPos:  5302,
+											EndPos:    5317,
 										},
 									},
 									Var: &ast.ExprPropertyFetch{
@@ -18618,8 +18241,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 325,
 												EndLine:   325,
-												StartPos:  5859,
-												EndPos:    5871,
+												StartPos:  5300,
+												EndPos:    5312,
 											},
 										},
 										Var: &ast.ExprVariable{
@@ -18627,8 +18250,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 325,
 													EndLine:   325,
-													StartPos:  5855,
-													EndPos:    5860,
+													StartPos:  5296,
+													EndPos:    5301,
 												},
 											},
 											VarName: &ast.Identifier{
@@ -18636,8 +18259,8 @@ func TestPhp5(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 325,
 														EndLine:   325,
-														StartPos:  5855,
-														EndPos:    5857,
+														StartPos:  5296,
+														EndPos:    5298,
 													},
 												},
 												Value: []byte("$a"),
@@ -18648,8 +18271,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 325,
 													EndLine:   325,
-													StartPos:  5859,
-													EndPos:    5860,
+													StartPos:  5300,
+													EndPos:    5301,
 												},
 											},
 											Value: []byte("b"),
@@ -18660,8 +18283,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 325,
 												EndLine:   325,
-												StartPos:  5861,
-												EndPos:    5871,
+												StartPos:  5302,
+												EndPos:    5312,
 											},
 										},
 										Condition: &ast.ExprVariable{
@@ -18669,8 +18292,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 325,
 													EndLine:   325,
-													StartPos:  5861,
-													EndPos:    5863,
+													StartPos:  5302,
+													EndPos:    5304,
 												},
 											},
 											VarName: &ast.Identifier{
@@ -18678,8 +18301,8 @@ func TestPhp5(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 325,
 														EndLine:   325,
-														StartPos:  5861,
-														EndPos:    5863,
+														StartPos:  5302,
+														EndPos:    5304,
 													},
 												},
 												Value: []byte("$b"),
@@ -18690,8 +18313,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 325,
 													EndLine:   325,
-													StartPos:  5867,
-													EndPos:    5871,
+													StartPos:  5308,
+													EndPos:    5312,
 												},
 											},
 											Const: &ast.NameName{
@@ -18699,8 +18322,8 @@ func TestPhp5(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 325,
 														EndLine:   325,
-														StartPos:  5867,
-														EndPos:    5871,
+														StartPos:  5308,
+														EndPos:    5312,
 													},
 												},
 												Parts: []ast.Vertex{
@@ -18709,8 +18332,8 @@ func TestPhp5(t *testing.T) {
 															Position: &position.Position{
 																StartLine: 325,
 																EndLine:   325,
-																StartPos:  5867,
-																EndPos:    5871,
+																StartPos:  5308,
+																EndPos:    5312,
 															},
 														},
 														Value: []byte("null"),
@@ -18725,8 +18348,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 325,
 											EndLine:   325,
-											StartPos:  5874,
-											EndPos:    5876,
+											StartPos:  5315,
+											EndPos:    5317,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -18734,8 +18357,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 325,
 												EndLine:   325,
-												StartPos:  5874,
-												EndPos:    5876,
+												StartPos:  5315,
+												EndPos:    5317,
 											},
 										},
 										Value: []byte("$c"),
@@ -18747,8 +18370,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 325,
 										EndLine:   325,
-										StartPos:  5878,
-										EndPos:    5879,
+										StartPos:  5319,
+										EndPos:    5320,
 									},
 								},
 								Value: []byte("d"),
@@ -18759,8 +18382,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 325,
 									EndLine:   325,
-									StartPos:  5880,
-									EndPos:    5881,
+									StartPos:  5321,
+									EndPos:    5322,
 								},
 							},
 							Value: []byte("0"),
@@ -18773,8 +18396,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 325,
 						EndLine:   325,
-						StartPos:  5883,
-						EndPos:    5902,
+						StartPos:  5324,
+						EndPos:    5343,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -18783,8 +18406,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 325,
 								EndLine:   325,
-								StartPos:  5890,
-								EndPos:    5901,
+								StartPos:  5331,
+								EndPos:    5342,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -18792,8 +18415,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 325,
 									EndLine:   325,
-									StartPos:  5890,
-									EndPos:    5892,
+									StartPos:  5331,
+									EndPos:    5333,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -18801,8 +18424,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 325,
 										EndLine:   325,
-										StartPos:  5890,
-										EndPos:    5892,
+										StartPos:  5331,
+										EndPos:    5333,
 									},
 								},
 								Value: []byte("$a"),
@@ -18813,8 +18436,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 325,
 									EndLine:   325,
-									StartPos:  5895,
-									EndPos:    5901,
+									StartPos:  5336,
+									EndPos:    5342,
 								},
 							},
 							Var: &ast.ExprShortArray{
@@ -18822,8 +18445,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 325,
 										EndLine:   325,
-										StartPos:  5895,
-										EndPos:    5898,
+										StartPos:  5336,
+										EndPos:    5339,
 									},
 								},
 								Items: []ast.Vertex{
@@ -18832,8 +18455,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 325,
 												EndLine:   325,
-												StartPos:  5896,
-												EndPos:    5897,
+												StartPos:  5337,
+												EndPos:    5338,
 											},
 										},
 										Val: &ast.ScalarLnumber{
@@ -18841,8 +18464,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 325,
 													EndLine:   325,
-													StartPos:  5896,
-													EndPos:    5897,
+													StartPos:  5337,
+													EndPos:    5338,
 												},
 											},
 											Value: []byte("1"),
@@ -18855,8 +18478,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 325,
 										EndLine:   325,
-										StartPos:  5899,
-										EndPos:    5900,
+										StartPos:  5340,
+										EndPos:    5341,
 									},
 								},
 								Value: []byte("0"),
@@ -18870,8 +18493,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 327,
 						EndLine:   327,
-						StartPos:  5906,
-						EndPos:    5921,
+						StartPos:  5345,
+						EndPos:    5360,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -18880,8 +18503,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 327,
 								EndLine:   327,
-								StartPos:  5913,
-								EndPos:    5920,
+								StartPos:  5352,
+								EndPos:    5359,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -18889,8 +18512,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 327,
 									EndLine:   327,
-									StartPos:  5913,
-									EndPos:    5915,
+									StartPos:  5352,
+									EndPos:    5354,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -18898,8 +18521,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 327,
 										EndLine:   327,
-										StartPos:  5913,
-										EndPos:    5915,
+										StartPos:  5352,
+										EndPos:    5354,
 									},
 								},
 								Value: []byte("$a"),
@@ -18910,8 +18533,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 327,
 									EndLine:   327,
-									StartPos:  5918,
-									EndPos:    5920,
+									StartPos:  5357,
+									EndPos:    5359,
 								},
 							},
 							Expr: &ast.ScalarLnumber{
@@ -18919,8 +18542,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 327,
 										EndLine:   327,
-										StartPos:  5919,
-										EndPos:    5920,
+										StartPos:  5358,
+										EndPos:    5359,
 									},
 								},
 								Value: []byte("1"),
@@ -18934,8 +18557,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 328,
 						EndLine:   328,
-						StartPos:  5924,
-						EndPos:    5939,
+						StartPos:  5361,
+						EndPos:    5376,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -18944,8 +18567,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 328,
 								EndLine:   328,
-								StartPos:  5931,
-								EndPos:    5938,
+								StartPos:  5368,
+								EndPos:    5375,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -18953,8 +18576,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 328,
 									EndLine:   328,
-									StartPos:  5931,
-									EndPos:    5933,
+									StartPos:  5368,
+									EndPos:    5370,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -18962,8 +18585,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 328,
 										EndLine:   328,
-										StartPos:  5931,
-										EndPos:    5933,
+										StartPos:  5368,
+										EndPos:    5370,
 									},
 								},
 								Value: []byte("$a"),
@@ -18974,8 +18597,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 328,
 									EndLine:   328,
-									StartPos:  5936,
-									EndPos:    5938,
+									StartPos:  5373,
+									EndPos:    5375,
 								},
 							},
 							Expr: &ast.ScalarLnumber{
@@ -18983,8 +18606,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 328,
 										EndLine:   328,
-										StartPos:  5937,
-										EndPos:    5938,
+										StartPos:  5374,
+										EndPos:    5375,
 									},
 								},
 								Value: []byte("1"),
@@ -18998,8 +18621,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 329,
 						EndLine:   329,
-						StartPos:  5942,
-						EndPos:    5957,
+						StartPos:  5377,
+						EndPos:    5392,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19008,8 +18631,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 329,
 								EndLine:   329,
-								StartPos:  5949,
-								EndPos:    5956,
+								StartPos:  5384,
+								EndPos:    5391,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19017,8 +18640,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 329,
 									EndLine:   329,
-									StartPos:  5949,
-									EndPos:    5951,
+									StartPos:  5384,
+									EndPos:    5386,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19026,8 +18649,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 329,
 										EndLine:   329,
-										StartPos:  5949,
-										EndPos:    5951,
+										StartPos:  5384,
+										EndPos:    5386,
 									},
 								},
 								Value: []byte("$a"),
@@ -19038,8 +18661,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 329,
 									EndLine:   329,
-									StartPos:  5954,
-									EndPos:    5956,
+									StartPos:  5389,
+									EndPos:    5391,
 								},
 							},
 							Expr: &ast.ScalarLnumber{
@@ -19047,8 +18670,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 329,
 										EndLine:   329,
-										StartPos:  5955,
-										EndPos:    5956,
+										StartPos:  5390,
+										EndPos:    5391,
 									},
 								},
 								Value: []byte("1"),
@@ -19062,8 +18685,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 330,
 						EndLine:   330,
-						StartPos:  5960,
-						EndPos:    5975,
+						StartPos:  5393,
+						EndPos:    5408,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19072,8 +18695,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 330,
 								EndLine:   330,
-								StartPos:  5967,
-								EndPos:    5974,
+								StartPos:  5400,
+								EndPos:    5407,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19081,8 +18704,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 330,
 									EndLine:   330,
-									StartPos:  5967,
-									EndPos:    5969,
+									StartPos:  5400,
+									EndPos:    5402,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19090,8 +18713,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 330,
 										EndLine:   330,
-										StartPos:  5967,
-										EndPos:    5969,
+										StartPos:  5400,
+										EndPos:    5402,
 									},
 								},
 								Value: []byte("$a"),
@@ -19102,8 +18725,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 330,
 									EndLine:   330,
-									StartPos:  5972,
-									EndPos:    5974,
+									StartPos:  5405,
+									EndPos:    5407,
 								},
 							},
 							Expr: &ast.ScalarLnumber{
@@ -19111,8 +18734,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 330,
 										EndLine:   330,
-										StartPos:  5973,
-										EndPos:    5974,
+										StartPos:  5406,
+										EndPos:    5407,
 									},
 								},
 								Value: []byte("1"),
@@ -19126,8 +18749,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 331,
 						EndLine:   331,
-						StartPos:  5978,
-						EndPos:    5994,
+						StartPos:  5409,
+						EndPos:    5425,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19136,8 +18759,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 331,
 								EndLine:   331,
-								StartPos:  5985,
-								EndPos:    5992,
+								StartPos:  5416,
+								EndPos:    5423,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19145,8 +18768,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 331,
 									EndLine:   331,
-									StartPos:  5985,
-									EndPos:    5987,
+									StartPos:  5416,
+									EndPos:    5418,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19154,8 +18777,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 331,
 										EndLine:   331,
-										StartPos:  5985,
-										EndPos:    5987,
+										StartPos:  5416,
+										EndPos:    5418,
 									},
 								},
 								Value: []byte("$a"),
@@ -19166,8 +18789,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 331,
 									EndLine:   331,
-									StartPos:  5991,
-									EndPos:    5992,
+									StartPos:  5422,
+									EndPos:    5423,
 								},
 							},
 							Value: []byte("1"),
@@ -19180,8 +18803,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 332,
 						EndLine:   332,
-						StartPos:  5997,
-						EndPos:    6016,
+						StartPos:  5426,
+						EndPos:    5445,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19190,8 +18813,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 332,
 								EndLine:   332,
-								StartPos:  6004,
-								EndPos:    6015,
+								StartPos:  5433,
+								EndPos:    5444,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19199,8 +18822,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 332,
 									EndLine:   332,
-									StartPos:  6004,
-									EndPos:    6006,
+									StartPos:  5433,
+									EndPos:    5435,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19208,8 +18831,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 332,
 										EndLine:   332,
-										StartPos:  6004,
-										EndPos:    6006,
+										StartPos:  5433,
+										EndPos:    5435,
 									},
 								},
 								Value: []byte("$a"),
@@ -19220,8 +18843,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 332,
 									EndLine:   332,
-									StartPos:  6009,
-									EndPos:    6015,
+									StartPos:  5438,
+									EndPos:    5444,
 								},
 							},
 							Condition: &ast.ScalarLnumber{
@@ -19229,8 +18852,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 332,
 										EndLine:   332,
-										StartPos:  6009,
-										EndPos:    6010,
+										StartPos:  5438,
+										EndPos:    5439,
 									},
 								},
 								Value: []byte("1"),
@@ -19240,8 +18863,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 332,
 										EndLine:   332,
-										StartPos:  6014,
-										EndPos:    6015,
+										StartPos:  5443,
+										EndPos:    5444,
 									},
 								},
 								Value: []byte("2"),
@@ -19255,8 +18878,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 333,
 						EndLine:   333,
-						StartPos:  6019,
-						EndPos:    6041,
+						StartPos:  5446,
+						EndPos:    5468,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19265,8 +18888,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 333,
 								EndLine:   333,
-								StartPos:  6026,
-								EndPos:    6040,
+								StartPos:  5453,
+								EndPos:    5467,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19274,8 +18897,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 333,
 									EndLine:   333,
-									StartPos:  6026,
-									EndPos:    6028,
+									StartPos:  5453,
+									EndPos:    5455,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19283,8 +18906,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 333,
 										EndLine:   333,
-										StartPos:  6026,
-										EndPos:    6028,
+										StartPos:  5453,
+										EndPos:    5455,
 									},
 								},
 								Value: []byte("$a"),
@@ -19295,8 +18918,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 333,
 									EndLine:   333,
-									StartPos:  6031,
-									EndPos:    6040,
+									StartPos:  5458,
+									EndPos:    5467,
 								},
 							},
 							Condition: &ast.ScalarLnumber{
@@ -19304,8 +18927,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 333,
 										EndLine:   333,
-										StartPos:  6031,
-										EndPos:    6032,
+										StartPos:  5458,
+										EndPos:    5459,
 									},
 								},
 								Value: []byte("1"),
@@ -19315,8 +18938,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 333,
 										EndLine:   333,
-										StartPos:  6035,
-										EndPos:    6036,
+										StartPos:  5462,
+										EndPos:    5463,
 									},
 								},
 								Value: []byte("2"),
@@ -19326,8 +18949,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 333,
 										EndLine:   333,
-										StartPos:  6039,
-										EndPos:    6040,
+										StartPos:  5466,
+										EndPos:    5467,
 									},
 								},
 								Value: []byte("3"),
@@ -19341,8 +18964,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 334,
 						EndLine:   334,
-						StartPos:  6044,
-						EndPos:    6062,
+						StartPos:  5469,
+						EndPos:    5487,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19351,8 +18974,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 334,
 								EndLine:   334,
-								StartPos:  6051,
-								EndPos:    6061,
+								StartPos:  5476,
+								EndPos:    5486,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19360,8 +18983,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 334,
 									EndLine:   334,
-									StartPos:  6051,
-									EndPos:    6053,
+									StartPos:  5476,
+									EndPos:    5478,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19369,8 +18992,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 334,
 										EndLine:   334,
-										StartPos:  6051,
-										EndPos:    6053,
+										StartPos:  5476,
+										EndPos:    5478,
 									},
 								},
 								Value: []byte("$a"),
@@ -19381,8 +19004,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 334,
 									EndLine:   334,
-									StartPos:  6056,
-									EndPos:    6061,
+									StartPos:  5481,
+									EndPos:    5486,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -19390,8 +19013,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 334,
 										EndLine:   334,
-										StartPos:  6056,
-										EndPos:    6057,
+										StartPos:  5481,
+										EndPos:    5482,
 									},
 								},
 								Value: []byte("1"),
@@ -19401,8 +19024,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 334,
 										EndLine:   334,
-										StartPos:  6060,
-										EndPos:    6061,
+										StartPos:  5485,
+										EndPos:    5486,
 									},
 								},
 								Value: []byte("2"),
@@ -19416,8 +19039,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 335,
 						EndLine:   335,
-						StartPos:  6065,
-						EndPos:    6083,
+						StartPos:  5488,
+						EndPos:    5506,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19426,8 +19049,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 335,
 								EndLine:   335,
-								StartPos:  6072,
-								EndPos:    6082,
+								StartPos:  5495,
+								EndPos:    5505,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19435,8 +19058,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 335,
 									EndLine:   335,
-									StartPos:  6072,
-									EndPos:    6074,
+									StartPos:  5495,
+									EndPos:    5497,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19444,8 +19067,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 335,
 										EndLine:   335,
-										StartPos:  6072,
-										EndPos:    6074,
+										StartPos:  5495,
+										EndPos:    5497,
 									},
 								},
 								Value: []byte("$a"),
@@ -19456,8 +19079,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 335,
 									EndLine:   335,
-									StartPos:  6077,
-									EndPos:    6082,
+									StartPos:  5500,
+									EndPos:    5505,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -19465,8 +19088,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 335,
 										EndLine:   335,
-										StartPos:  6077,
-										EndPos:    6078,
+										StartPos:  5500,
+										EndPos:    5501,
 									},
 								},
 								Value: []byte("1"),
@@ -19476,8 +19099,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 335,
 										EndLine:   335,
-										StartPos:  6081,
-										EndPos:    6082,
+										StartPos:  5504,
+										EndPos:    5505,
 									},
 								},
 								Value: []byte("2"),
@@ -19491,8 +19114,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 336,
 						EndLine:   336,
-						StartPos:  6086,
-						EndPos:    6104,
+						StartPos:  5507,
+						EndPos:    5525,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19501,8 +19124,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 336,
 								EndLine:   336,
-								StartPos:  6093,
-								EndPos:    6103,
+								StartPos:  5514,
+								EndPos:    5524,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19510,8 +19133,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 336,
 									EndLine:   336,
-									StartPos:  6093,
-									EndPos:    6095,
+									StartPos:  5514,
+									EndPos:    5516,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19519,8 +19142,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 336,
 										EndLine:   336,
-										StartPos:  6093,
-										EndPos:    6095,
+										StartPos:  5514,
+										EndPos:    5516,
 									},
 								},
 								Value: []byte("$a"),
@@ -19531,8 +19154,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 336,
 									EndLine:   336,
-									StartPos:  6098,
-									EndPos:    6103,
+									StartPos:  5519,
+									EndPos:    5524,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -19540,8 +19163,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 336,
 										EndLine:   336,
-										StartPos:  6098,
-										EndPos:    6099,
+										StartPos:  5519,
+										EndPos:    5520,
 									},
 								},
 								Value: []byte("1"),
@@ -19551,8 +19174,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 336,
 										EndLine:   336,
-										StartPos:  6102,
-										EndPos:    6103,
+										StartPos:  5523,
+										EndPos:    5524,
 									},
 								},
 								Value: []byte("2"),
@@ -19566,8 +19189,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 337,
 						EndLine:   337,
-						StartPos:  6107,
-						EndPos:    6126,
+						StartPos:  5526,
+						EndPos:    5545,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19576,8 +19199,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 337,
 								EndLine:   337,
-								StartPos:  6114,
-								EndPos:    6125,
+								StartPos:  5533,
+								EndPos:    5544,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19585,8 +19208,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 337,
 									EndLine:   337,
-									StartPos:  6114,
-									EndPos:    6116,
+									StartPos:  5533,
+									EndPos:    5535,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19594,8 +19217,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 337,
 										EndLine:   337,
-										StartPos:  6114,
-										EndPos:    6116,
+										StartPos:  5533,
+										EndPos:    5535,
 									},
 								},
 								Value: []byte("$a"),
@@ -19606,8 +19229,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 337,
 									EndLine:   337,
-									StartPos:  6119,
-									EndPos:    6125,
+									StartPos:  5538,
+									EndPos:    5544,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -19615,8 +19238,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 337,
 										EndLine:   337,
-										StartPos:  6119,
-										EndPos:    6120,
+										StartPos:  5538,
+										EndPos:    5539,
 									},
 								},
 								Value: []byte("1"),
@@ -19626,8 +19249,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 337,
 										EndLine:   337,
-										StartPos:  6124,
-										EndPos:    6125,
+										StartPos:  5543,
+										EndPos:    5544,
 									},
 								},
 								Value: []byte("2"),
@@ -19641,8 +19264,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 338,
 						EndLine:   338,
-						StartPos:  6129,
-						EndPos:    6148,
+						StartPos:  5546,
+						EndPos:    5565,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19651,8 +19274,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 338,
 								EndLine:   338,
-								StartPos:  6136,
-								EndPos:    6147,
+								StartPos:  5553,
+								EndPos:    5564,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19660,8 +19283,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 338,
 									EndLine:   338,
-									StartPos:  6136,
-									EndPos:    6138,
+									StartPos:  5553,
+									EndPos:    5555,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19669,8 +19292,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 338,
 										EndLine:   338,
-										StartPos:  6136,
-										EndPos:    6138,
+										StartPos:  5553,
+										EndPos:    5555,
 									},
 								},
 								Value: []byte("$a"),
@@ -19681,8 +19304,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 338,
 									EndLine:   338,
-									StartPos:  6141,
-									EndPos:    6147,
+									StartPos:  5558,
+									EndPos:    5564,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -19690,8 +19313,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 338,
 										EndLine:   338,
-										StartPos:  6141,
-										EndPos:    6142,
+										StartPos:  5558,
+										EndPos:    5559,
 									},
 								},
 								Value: []byte("1"),
@@ -19701,8 +19324,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 338,
 										EndLine:   338,
-										StartPos:  6146,
-										EndPos:    6147,
+										StartPos:  5563,
+										EndPos:    5564,
 									},
 								},
 								Value: []byte("2"),
@@ -19716,8 +19339,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 339,
 						EndLine:   339,
-						StartPos:  6151,
-						EndPos:    6169,
+						StartPos:  5566,
+						EndPos:    5584,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19726,8 +19349,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 339,
 								EndLine:   339,
-								StartPos:  6158,
-								EndPos:    6168,
+								StartPos:  5573,
+								EndPos:    5583,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19735,8 +19358,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 339,
 									EndLine:   339,
-									StartPos:  6158,
-									EndPos:    6160,
+									StartPos:  5573,
+									EndPos:    5575,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19744,8 +19367,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 339,
 										EndLine:   339,
-										StartPos:  6158,
-										EndPos:    6160,
+										StartPos:  5573,
+										EndPos:    5575,
 									},
 								},
 								Value: []byte("$a"),
@@ -19756,8 +19379,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 339,
 									EndLine:   339,
-									StartPos:  6163,
-									EndPos:    6168,
+									StartPos:  5578,
+									EndPos:    5583,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -19765,8 +19388,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 339,
 										EndLine:   339,
-										StartPos:  6163,
-										EndPos:    6164,
+										StartPos:  5578,
+										EndPos:    5579,
 									},
 								},
 								Value: []byte("1"),
@@ -19776,8 +19399,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 339,
 										EndLine:   339,
-										StartPos:  6167,
-										EndPos:    6168,
+										StartPos:  5582,
+										EndPos:    5583,
 									},
 								},
 								Value: []byte("2"),
@@ -19791,8 +19414,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 340,
 						EndLine:   340,
-						StartPos:  6172,
-						EndPos:    6190,
+						StartPos:  5585,
+						EndPos:    5603,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19801,8 +19424,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 340,
 								EndLine:   340,
-								StartPos:  6179,
-								EndPos:    6189,
+								StartPos:  5592,
+								EndPos:    5602,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19810,8 +19433,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 340,
 									EndLine:   340,
-									StartPos:  6179,
-									EndPos:    6181,
+									StartPos:  5592,
+									EndPos:    5594,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19819,8 +19442,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 340,
 										EndLine:   340,
-										StartPos:  6179,
-										EndPos:    6181,
+										StartPos:  5592,
+										EndPos:    5594,
 									},
 								},
 								Value: []byte("$a"),
@@ -19831,8 +19454,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 340,
 									EndLine:   340,
-									StartPos:  6184,
-									EndPos:    6189,
+									StartPos:  5597,
+									EndPos:    5602,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -19840,8 +19463,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 340,
 										EndLine:   340,
-										StartPos:  6184,
-										EndPos:    6185,
+										StartPos:  5597,
+										EndPos:    5598,
 									},
 								},
 								Value: []byte("1"),
@@ -19851,8 +19474,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 340,
 										EndLine:   340,
-										StartPos:  6188,
-										EndPos:    6189,
+										StartPos:  5601,
+										EndPos:    5602,
 									},
 								},
 								Value: []byte("2"),
@@ -19866,8 +19489,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 341,
 						EndLine:   341,
-						StartPos:  6193,
-						EndPos:    6212,
+						StartPos:  5604,
+						EndPos:    5623,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19876,8 +19499,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 341,
 								EndLine:   341,
-								StartPos:  6200,
-								EndPos:    6211,
+								StartPos:  5611,
+								EndPos:    5622,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19885,8 +19508,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 341,
 									EndLine:   341,
-									StartPos:  6200,
-									EndPos:    6202,
+									StartPos:  5611,
+									EndPos:    5613,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19894,8 +19517,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 341,
 										EndLine:   341,
-										StartPos:  6200,
-										EndPos:    6202,
+										StartPos:  5611,
+										EndPos:    5613,
 									},
 								},
 								Value: []byte("$a"),
@@ -19906,8 +19529,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 341,
 									EndLine:   341,
-									StartPos:  6205,
-									EndPos:    6211,
+									StartPos:  5616,
+									EndPos:    5622,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -19915,8 +19538,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 341,
 										EndLine:   341,
-										StartPos:  6205,
-										EndPos:    6206,
+										StartPos:  5616,
+										EndPos:    5617,
 									},
 								},
 								Value: []byte("1"),
@@ -19926,8 +19549,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 341,
 										EndLine:   341,
-										StartPos:  6210,
-										EndPos:    6211,
+										StartPos:  5621,
+										EndPos:    5622,
 									},
 								},
 								Value: []byte("2"),
@@ -19941,8 +19564,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 342,
 						EndLine:   342,
-						StartPos:  6215,
-						EndPos:    6234,
+						StartPos:  5624,
+						EndPos:    5643,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -19951,8 +19574,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 342,
 								EndLine:   342,
-								StartPos:  6222,
-								EndPos:    6233,
+								StartPos:  5631,
+								EndPos:    5642,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19960,8 +19583,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 342,
 									EndLine:   342,
-									StartPos:  6222,
-									EndPos:    6224,
+									StartPos:  5631,
+									EndPos:    5633,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19969,8 +19592,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 342,
 										EndLine:   342,
-										StartPos:  6222,
-										EndPos:    6224,
+										StartPos:  5631,
+										EndPos:    5633,
 									},
 								},
 								Value: []byte("$a"),
@@ -19981,8 +19604,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 342,
 									EndLine:   342,
-									StartPos:  6227,
-									EndPos:    6233,
+									StartPos:  5636,
+									EndPos:    5642,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -19990,8 +19613,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 342,
 										EndLine:   342,
-										StartPos:  6227,
-										EndPos:    6228,
+										StartPos:  5636,
+										EndPos:    5637,
 									},
 								},
 								Value: []byte("1"),
@@ -20001,8 +19624,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 342,
 										EndLine:   342,
-										StartPos:  6232,
-										EndPos:    6233,
+										StartPos:  5641,
+										EndPos:    5642,
 									},
 								},
 								Value: []byte("2"),
@@ -20016,8 +19639,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 343,
 						EndLine:   343,
-						StartPos:  6237,
-						EndPos:    6255,
+						StartPos:  5644,
+						EndPos:    5662,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -20026,8 +19649,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 343,
 								EndLine:   343,
-								StartPos:  6244,
-								EndPos:    6254,
+								StartPos:  5651,
+								EndPos:    5661,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -20035,8 +19658,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 343,
 									EndLine:   343,
-									StartPos:  6244,
-									EndPos:    6246,
+									StartPos:  5651,
+									EndPos:    5653,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -20044,8 +19667,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 343,
 										EndLine:   343,
-										StartPos:  6244,
-										EndPos:    6246,
+										StartPos:  5651,
+										EndPos:    5653,
 									},
 								},
 								Value: []byte("$a"),
@@ -20056,8 +19679,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 343,
 									EndLine:   343,
-									StartPos:  6249,
-									EndPos:    6254,
+									StartPos:  5656,
+									EndPos:    5661,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -20065,8 +19688,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 343,
 										EndLine:   343,
-										StartPos:  6249,
-										EndPos:    6250,
+										StartPos:  5656,
+										EndPos:    5657,
 									},
 								},
 								Value: []byte("1"),
@@ -20076,8 +19699,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 343,
 										EndLine:   343,
-										StartPos:  6253,
-										EndPos:    6254,
+										StartPos:  5660,
+										EndPos:    5661,
 									},
 								},
 								Value: []byte("2"),
@@ -20091,8 +19714,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 344,
 						EndLine:   344,
-						StartPos:  6258,
-						EndPos:    6278,
+						StartPos:  5663,
+						EndPos:    5683,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -20101,8 +19724,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 344,
 								EndLine:   344,
-								StartPos:  6265,
-								EndPos:    6277,
+								StartPos:  5670,
+								EndPos:    5682,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -20110,8 +19733,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 344,
 									EndLine:   344,
-									StartPos:  6265,
-									EndPos:    6267,
+									StartPos:  5670,
+									EndPos:    5672,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -20119,8 +19742,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 344,
 										EndLine:   344,
-										StartPos:  6265,
-										EndPos:    6267,
+										StartPos:  5670,
+										EndPos:    5672,
 									},
 								},
 								Value: []byte("$a"),
@@ -20131,8 +19754,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 344,
 									EndLine:   344,
-									StartPos:  6270,
-									EndPos:    6277,
+									StartPos:  5675,
+									EndPos:    5682,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -20140,8 +19763,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 344,
 										EndLine:   344,
-										StartPos:  6270,
-										EndPos:    6271,
+										StartPos:  5675,
+										EndPos:    5676,
 									},
 								},
 								Value: []byte("1"),
@@ -20151,8 +19774,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 344,
 										EndLine:   344,
-										StartPos:  6276,
-										EndPos:    6277,
+										StartPos:  5681,
+										EndPos:    5682,
 									},
 								},
 								Value: []byte("2"),
@@ -20166,8 +19789,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 345,
 						EndLine:   345,
-						StartPos:  6281,
-						EndPos:    6301,
+						StartPos:  5684,
+						EndPos:    5704,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -20176,8 +19799,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 345,
 								EndLine:   345,
-								StartPos:  6288,
-								EndPos:    6300,
+								StartPos:  5691,
+								EndPos:    5703,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -20185,8 +19808,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 345,
 									EndLine:   345,
-									StartPos:  6288,
-									EndPos:    6290,
+									StartPos:  5691,
+									EndPos:    5693,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -20194,8 +19817,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 345,
 										EndLine:   345,
-										StartPos:  6288,
-										EndPos:    6290,
+										StartPos:  5691,
+										EndPos:    5693,
 									},
 								},
 								Value: []byte("$a"),
@@ -20206,8 +19829,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 345,
 									EndLine:   345,
-									StartPos:  6293,
-									EndPos:    6300,
+									StartPos:  5696,
+									EndPos:    5703,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -20215,8 +19838,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 345,
 										EndLine:   345,
-										StartPos:  6293,
-										EndPos:    6294,
+										StartPos:  5696,
+										EndPos:    5697,
 									},
 								},
 								Value: []byte("1"),
@@ -20226,8 +19849,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 345,
 										EndLine:   345,
-										StartPos:  6299,
-										EndPos:    6300,
+										StartPos:  5702,
+										EndPos:    5703,
 									},
 								},
 								Value: []byte("2"),
@@ -20241,8 +19864,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 346,
 						EndLine:   346,
-						StartPos:  6304,
-						EndPos:    6323,
+						StartPos:  5705,
+						EndPos:    5724,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -20251,8 +19874,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 346,
 								EndLine:   346,
-								StartPos:  6311,
-								EndPos:    6322,
+								StartPos:  5712,
+								EndPos:    5723,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -20260,8 +19883,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 346,
 									EndLine:   346,
-									StartPos:  6311,
-									EndPos:    6313,
+									StartPos:  5712,
+									EndPos:    5714,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -20269,8 +19892,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 346,
 										EndLine:   346,
-										StartPos:  6311,
-										EndPos:    6313,
+										StartPos:  5712,
+										EndPos:    5714,
 									},
 								},
 								Value: []byte("$a"),
@@ -20281,8 +19904,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 346,
 									EndLine:   346,
-									StartPos:  6316,
-									EndPos:    6322,
+									StartPos:  5717,
+									EndPos:    5723,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -20290,8 +19913,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 346,
 										EndLine:   346,
-										StartPos:  6316,
-										EndPos:    6317,
+										StartPos:  5717,
+										EndPos:    5718,
 									},
 								},
 								Value: []byte("1"),
@@ -20301,8 +19924,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 346,
 										EndLine:   346,
-										StartPos:  6321,
-										EndPos:    6322,
+										StartPos:  5722,
+										EndPos:    5723,
 									},
 								},
 								Value: []byte("2"),
@@ -20316,8 +19939,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 347,
 						EndLine:   347,
-						StartPos:  6326,
-						EndPos:    6346,
+						StartPos:  5725,
+						EndPos:    5745,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -20326,8 +19949,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 347,
 								EndLine:   347,
-								StartPos:  6333,
-								EndPos:    6345,
+								StartPos:  5732,
+								EndPos:    5744,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -20335,8 +19958,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 347,
 									EndLine:   347,
-									StartPos:  6333,
-									EndPos:    6335,
+									StartPos:  5732,
+									EndPos:    5734,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -20344,8 +19967,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 347,
 										EndLine:   347,
-										StartPos:  6333,
-										EndPos:    6335,
+										StartPos:  5732,
+										EndPos:    5734,
 									},
 								},
 								Value: []byte("$a"),
@@ -20356,8 +19979,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 347,
 									EndLine:   347,
-									StartPos:  6338,
-									EndPos:    6345,
+									StartPos:  5737,
+									EndPos:    5744,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -20365,8 +19988,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 347,
 										EndLine:   347,
-										StartPos:  6338,
-										EndPos:    6339,
+										StartPos:  5737,
+										EndPos:    5738,
 									},
 								},
 								Value: []byte("1"),
@@ -20376,8 +19999,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 347,
 										EndLine:   347,
-										StartPos:  6344,
-										EndPos:    6345,
+										StartPos:  5743,
+										EndPos:    5744,
 									},
 								},
 								Value: []byte("2"),
@@ -20391,8 +20014,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 348,
 						EndLine:   348,
-						StartPos:  6349,
-						EndPos:    6367,
+						StartPos:  5746,
+						EndPos:    5764,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -20401,8 +20024,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 348,
 								EndLine:   348,
-								StartPos:  6356,
-								EndPos:    6366,
+								StartPos:  5753,
+								EndPos:    5763,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -20410,8 +20033,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 348,
 									EndLine:   348,
-									StartPos:  6356,
-									EndPos:    6358,
+									StartPos:  5753,
+									EndPos:    5755,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -20419,8 +20042,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 348,
 										EndLine:   348,
-										StartPos:  6356,
-										EndPos:    6358,
+										StartPos:  5753,
+										EndPos:    5755,
 									},
 								},
 								Value: []byte("$a"),
@@ -20431,8 +20054,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 348,
 									EndLine:   348,
-									StartPos:  6361,
-									EndPos:    6366,
+									StartPos:  5758,
+									EndPos:    5763,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -20440,8 +20063,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 348,
 										EndLine:   348,
-										StartPos:  6361,
-										EndPos:    6362,
+										StartPos:  5758,
+										EndPos:    5759,
 									},
 								},
 								Value: []byte("1"),
@@ -20451,8 +20074,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 348,
 										EndLine:   348,
-										StartPos:  6365,
-										EndPos:    6366,
+										StartPos:  5762,
+										EndPos:    5763,
 									},
 								},
 								Value: []byte("2"),
@@ -20466,8 +20089,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 349,
 						EndLine:   349,
-						StartPos:  6370,
-						EndPos:    6388,
+						StartPos:  5765,
+						EndPos:    5783,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -20476,8 +20099,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 349,
 								EndLine:   349,
-								StartPos:  6377,
-								EndPos:    6387,
+								StartPos:  5772,
+								EndPos:    5782,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -20485,8 +20108,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 349,
 									EndLine:   349,
-									StartPos:  6377,
-									EndPos:    6379,
+									StartPos:  5772,
+									EndPos:    5774,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -20494,8 +20117,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 349,
 										EndLine:   349,
-										StartPos:  6377,
-										EndPos:    6379,
+										StartPos:  5772,
+										EndPos:    5774,
 									},
 								},
 								Value: []byte("$a"),
@@ -20506,8 +20129,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 349,
 									EndLine:   349,
-									StartPos:  6382,
-									EndPos:    6387,
+									StartPos:  5777,
+									EndPos:    5782,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -20515,8 +20138,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 349,
 										EndLine:   349,
-										StartPos:  6382,
-										EndPos:    6383,
+										StartPos:  5777,
+										EndPos:    5778,
 									},
 								},
 								Value: []byte("1"),
@@ -20526,8 +20149,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 349,
 										EndLine:   349,
-										StartPos:  6386,
-										EndPos:    6387,
+										StartPos:  5781,
+										EndPos:    5782,
 									},
 								},
 								Value: []byte("2"),
@@ -20541,8 +20164,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 350,
 						EndLine:   350,
-						StartPos:  6391,
-						EndPos:    6409,
+						StartPos:  5784,
+						EndPos:    5802,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -20551,8 +20174,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 350,
 								EndLine:   350,
-								StartPos:  6398,
-								EndPos:    6408,
+								StartPos:  5791,
+								EndPos:    5801,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -20560,8 +20183,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 350,
 									EndLine:   350,
-									StartPos:  6398,
-									EndPos:    6400,
+									StartPos:  5791,
+									EndPos:    5793,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -20569,8 +20192,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 350,
 										EndLine:   350,
-										StartPos:  6398,
-										EndPos:    6400,
+										StartPos:  5791,
+										EndPos:    5793,
 									},
 								},
 								Value: []byte("$a"),
@@ -20581,8 +20204,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 350,
 									EndLine:   350,
-									StartPos:  6403,
-									EndPos:    6408,
+									StartPos:  5796,
+									EndPos:    5801,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -20590,8 +20213,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 350,
 										EndLine:   350,
-										StartPos:  6403,
-										EndPos:    6404,
+										StartPos:  5796,
+										EndPos:    5797,
 									},
 								},
 								Value: []byte("1"),
@@ -20601,8 +20224,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 350,
 										EndLine:   350,
-										StartPos:  6407,
-										EndPos:    6408,
+										StartPos:  5800,
+										EndPos:    5801,
 									},
 								},
 								Value: []byte("2"),
@@ -20616,8 +20239,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 351,
 						EndLine:   351,
-						StartPos:  6412,
-						EndPos:    6431,
+						StartPos:  5803,
+						EndPos:    5822,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -20626,8 +20249,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 351,
 								EndLine:   351,
-								StartPos:  6419,
-								EndPos:    6430,
+								StartPos:  5810,
+								EndPos:    5821,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -20635,8 +20258,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 351,
 									EndLine:   351,
-									StartPos:  6419,
-									EndPos:    6421,
+									StartPos:  5810,
+									EndPos:    5812,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -20644,8 +20267,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 351,
 										EndLine:   351,
-										StartPos:  6419,
-										EndPos:    6421,
+										StartPos:  5810,
+										EndPos:    5812,
 									},
 								},
 								Value: []byte("$a"),
@@ -20656,8 +20279,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 351,
 									EndLine:   351,
-									StartPos:  6424,
-									EndPos:    6430,
+									StartPos:  5815,
+									EndPos:    5821,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -20665,8 +20288,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 351,
 										EndLine:   351,
-										StartPos:  6424,
-										EndPos:    6425,
+										StartPos:  5815,
+										EndPos:    5816,
 									},
 								},
 								Value: []byte("1"),
@@ -20676,8 +20299,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 351,
 										EndLine:   351,
-										StartPos:  6429,
-										EndPos:    6430,
+										StartPos:  5820,
+										EndPos:    5821,
 									},
 								},
 								Value: []byte("2"),
@@ -20691,8 +20314,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 352,
 						EndLine:   352,
-						StartPos:  6434,
-						EndPos:    6454,
+						StartPos:  5823,
+						EndPos:    5843,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -20701,8 +20324,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 352,
 								EndLine:   352,
-								StartPos:  6441,
-								EndPos:    6453,
+								StartPos:  5830,
+								EndPos:    5842,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -20710,8 +20333,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 352,
 									EndLine:   352,
-									StartPos:  6441,
-									EndPos:    6443,
+									StartPos:  5830,
+									EndPos:    5832,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -20719,8 +20342,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 352,
 										EndLine:   352,
-										StartPos:  6441,
-										EndPos:    6443,
+										StartPos:  5830,
+										EndPos:    5832,
 									},
 								},
 								Value: []byte("$a"),
@@ -20731,8 +20354,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 352,
 									EndLine:   352,
-									StartPos:  6446,
-									EndPos:    6453,
+									StartPos:  5835,
+									EndPos:    5842,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -20740,8 +20363,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 352,
 										EndLine:   352,
-										StartPos:  6446,
-										EndPos:    6447,
+										StartPos:  5835,
+										EndPos:    5836,
 									},
 								},
 								Value: []byte("1"),
@@ -20751,8 +20374,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 352,
 										EndLine:   352,
-										StartPos:  6452,
-										EndPos:    6453,
+										StartPos:  5841,
+										EndPos:    5842,
 									},
 								},
 								Value: []byte("2"),
@@ -20766,8 +20389,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 353,
 						EndLine:   353,
-						StartPos:  6457,
-						EndPos:    6475,
+						StartPos:  5844,
+						EndPos:    5862,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -20776,8 +20399,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 353,
 								EndLine:   353,
-								StartPos:  6464,
-								EndPos:    6474,
+								StartPos:  5851,
+								EndPos:    5861,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -20785,8 +20408,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 353,
 									EndLine:   353,
-									StartPos:  6464,
-									EndPos:    6466,
+									StartPos:  5851,
+									EndPos:    5853,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -20794,8 +20417,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 353,
 										EndLine:   353,
-										StartPos:  6464,
-										EndPos:    6466,
+										StartPos:  5851,
+										EndPos:    5853,
 									},
 								},
 								Value: []byte("$a"),
@@ -20806,8 +20429,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 353,
 									EndLine:   353,
-									StartPos:  6469,
-									EndPos:    6474,
+									StartPos:  5856,
+									EndPos:    5861,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -20815,8 +20438,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 353,
 										EndLine:   353,
-										StartPos:  6469,
-										EndPos:    6470,
+										StartPos:  5856,
+										EndPos:    5857,
 									},
 								},
 								Value: []byte("1"),
@@ -20826,8 +20449,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 353,
 										EndLine:   353,
-										StartPos:  6473,
-										EndPos:    6474,
+										StartPos:  5860,
+										EndPos:    5861,
 									},
 								},
 								Value: []byte("2"),
@@ -20841,8 +20464,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 354,
 						EndLine:   354,
-						StartPos:  6478,
-						EndPos:    6497,
+						StartPos:  5863,
+						EndPos:    5882,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -20851,8 +20474,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 354,
 								EndLine:   354,
-								StartPos:  6485,
-								EndPos:    6496,
+								StartPos:  5870,
+								EndPos:    5881,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -20860,8 +20483,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 354,
 									EndLine:   354,
-									StartPos:  6485,
-									EndPos:    6487,
+									StartPos:  5870,
+									EndPos:    5872,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -20869,8 +20492,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 354,
 										EndLine:   354,
-										StartPos:  6485,
-										EndPos:    6487,
+										StartPos:  5870,
+										EndPos:    5872,
 									},
 								},
 								Value: []byte("$a"),
@@ -20881,8 +20504,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 354,
 									EndLine:   354,
-									StartPos:  6490,
-									EndPos:    6496,
+									StartPos:  5875,
+									EndPos:    5881,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -20890,8 +20513,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 354,
 										EndLine:   354,
-										StartPos:  6490,
-										EndPos:    6491,
+										StartPos:  5875,
+										EndPos:    5876,
 									},
 								},
 								Value: []byte("1"),
@@ -20901,8 +20524,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 354,
 										EndLine:   354,
-										StartPos:  6495,
-										EndPos:    6496,
+										StartPos:  5880,
+										EndPos:    5881,
 									},
 								},
 								Value: []byte("2"),
@@ -20916,8 +20539,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 355,
 						EndLine:   355,
-						StartPos:  6500,
-						EndPos:    6519,
+						StartPos:  5883,
+						EndPos:    5902,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -20926,8 +20549,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 355,
 								EndLine:   355,
-								StartPos:  6507,
-								EndPos:    6518,
+								StartPos:  5890,
+								EndPos:    5901,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -20935,8 +20558,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 355,
 									EndLine:   355,
-									StartPos:  6507,
-									EndPos:    6509,
+									StartPos:  5890,
+									EndPos:    5892,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -20944,8 +20567,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 355,
 										EndLine:   355,
-										StartPos:  6507,
-										EndPos:    6509,
+										StartPos:  5890,
+										EndPos:    5892,
 									},
 								},
 								Value: []byte("$a"),
@@ -20956,8 +20579,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 355,
 									EndLine:   355,
-									StartPos:  6512,
-									EndPos:    6518,
+									StartPos:  5895,
+									EndPos:    5901,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -20965,8 +20588,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 355,
 										EndLine:   355,
-										StartPos:  6512,
-										EndPos:    6513,
+										StartPos:  5895,
+										EndPos:    5896,
 									},
 								},
 								Value: []byte("1"),
@@ -20976,8 +20599,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 355,
 										EndLine:   355,
-										StartPos:  6517,
-										EndPos:    6518,
+										StartPos:  5900,
+										EndPos:    5901,
 									},
 								},
 								Value: []byte("2"),
@@ -20991,8 +20614,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 356,
 						EndLine:   356,
-						StartPos:  6522,
-						EndPos:    6541,
+						StartPos:  5903,
+						EndPos:    5922,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -21001,8 +20624,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 356,
 								EndLine:   356,
-								StartPos:  6529,
-								EndPos:    6540,
+								StartPos:  5910,
+								EndPos:    5921,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -21010,8 +20633,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 356,
 									EndLine:   356,
-									StartPos:  6529,
-									EndPos:    6531,
+									StartPos:  5910,
+									EndPos:    5912,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -21019,8 +20642,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 356,
 										EndLine:   356,
-										StartPos:  6529,
-										EndPos:    6531,
+										StartPos:  5910,
+										EndPos:    5912,
 									},
 								},
 								Value: []byte("$a"),
@@ -21031,8 +20654,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 356,
 									EndLine:   356,
-									StartPos:  6534,
-									EndPos:    6540,
+									StartPos:  5915,
+									EndPos:    5921,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -21040,8 +20663,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 356,
 										EndLine:   356,
-										StartPos:  6534,
-										EndPos:    6535,
+										StartPos:  5915,
+										EndPos:    5916,
 									},
 								},
 								Value: []byte("1"),
@@ -21051,8 +20674,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 356,
 										EndLine:   356,
-										StartPos:  6539,
-										EndPos:    6540,
+										StartPos:  5920,
+										EndPos:    5921,
 									},
 								},
 								Value: []byte("2"),
@@ -21066,8 +20689,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 357,
 						EndLine:   357,
-						StartPos:  6544,
-						EndPos:    6563,
+						StartPos:  5923,
+						EndPos:    5942,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -21076,8 +20699,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 357,
 								EndLine:   357,
-								StartPos:  6551,
-								EndPos:    6562,
+								StartPos:  5930,
+								EndPos:    5941,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -21085,8 +20708,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 357,
 									EndLine:   357,
-									StartPos:  6551,
-									EndPos:    6553,
+									StartPos:  5930,
+									EndPos:    5932,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -21094,8 +20717,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 357,
 										EndLine:   357,
-										StartPos:  6551,
-										EndPos:    6553,
+										StartPos:  5930,
+										EndPos:    5932,
 									},
 								},
 								Value: []byte("$a"),
@@ -21106,8 +20729,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 357,
 									EndLine:   357,
-									StartPos:  6556,
-									EndPos:    6562,
+									StartPos:  5935,
+									EndPos:    5941,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -21115,8 +20738,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 357,
 										EndLine:   357,
-										StartPos:  6556,
-										EndPos:    6557,
+										StartPos:  5935,
+										EndPos:    5936,
 									},
 								},
 								Value: []byte("1"),
@@ -21126,8 +20749,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 357,
 										EndLine:   357,
-										StartPos:  6561,
-										EndPos:    6562,
+										StartPos:  5940,
+										EndPos:    5941,
 									},
 								},
 								Value: []byte("2"),
@@ -21141,8 +20764,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 358,
 						EndLine:   358,
-						StartPos:  6566,
-						EndPos:    6584,
+						StartPos:  5943,
+						EndPos:    5961,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -21151,8 +20774,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 358,
 								EndLine:   358,
-								StartPos:  6573,
-								EndPos:    6583,
+								StartPos:  5950,
+								EndPos:    5960,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -21160,8 +20783,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 358,
 									EndLine:   358,
-									StartPos:  6573,
-									EndPos:    6575,
+									StartPos:  5950,
+									EndPos:    5952,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -21169,8 +20792,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 358,
 										EndLine:   358,
-										StartPos:  6573,
-										EndPos:    6575,
+										StartPos:  5950,
+										EndPos:    5952,
 									},
 								},
 								Value: []byte("$a"),
@@ -21181,8 +20804,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 358,
 									EndLine:   358,
-									StartPos:  6578,
-									EndPos:    6583,
+									StartPos:  5955,
+									EndPos:    5960,
 								},
 							},
 							Left: &ast.ScalarLnumber{
@@ -21190,8 +20813,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 358,
 										EndLine:   358,
-										StartPos:  6578,
-										EndPos:    6579,
+										StartPos:  5955,
+										EndPos:    5956,
 									},
 								},
 								Value: []byte("1"),
@@ -21201,8 +20824,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 358,
 										EndLine:   358,
-										StartPos:  6582,
-										EndPos:    6583,
+										StartPos:  5959,
+										EndPos:    5960,
 									},
 								},
 								Value: []byte("2"),
@@ -21216,8 +20839,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 359,
 						EndLine:   359,
-						StartPos:  6587,
-						EndPos:    6608,
+						StartPos:  5962,
+						EndPos:    5983,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -21226,8 +20849,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 359,
 								EndLine:   359,
-								StartPos:  6594,
-								EndPos:    6607,
+								StartPos:  5969,
+								EndPos:    5982,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -21235,8 +20858,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 359,
 									EndLine:   359,
-									StartPos:  6594,
-									EndPos:    6596,
+									StartPos:  5969,
+									EndPos:    5971,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -21244,8 +20867,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 359,
 										EndLine:   359,
-										StartPos:  6594,
-										EndPos:    6596,
+										StartPos:  5969,
+										EndPos:    5971,
 									},
 								},
 								Value: []byte("$a"),
@@ -21256,8 +20879,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 359,
 									EndLine:   359,
-									StartPos:  6599,
-									EndPos:    6607,
+									StartPos:  5974,
+									EndPos:    5982,
 								},
 							},
 							Class: &ast.NameName{
@@ -21265,8 +20888,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 359,
 										EndLine:   359,
-										StartPos:  6599,
-										EndPos:    6602,
+										StartPos:  5974,
+										EndPos:    5977,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -21275,8 +20898,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 359,
 												EndLine:   359,
-												StartPos:  6599,
-												EndPos:    6602,
+												StartPos:  5974,
+												EndPos:    5977,
 											},
 										},
 										Value: []byte("Foo"),
@@ -21288,8 +20911,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 359,
 										EndLine:   359,
-										StartPos:  6604,
-										EndPos:    6607,
+										StartPos:  5979,
+										EndPos:    5982,
 									},
 								},
 								Value: []byte("bar"),
@@ -21303,8 +20926,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 360,
 						EndLine:   360,
-						StartPos:  6611,
-						EndPos:    6634,
+						StartPos:  5984,
+						EndPos:    6007,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -21313,8 +20936,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 360,
 								EndLine:   360,
-								StartPos:  6618,
-								EndPos:    6633,
+								StartPos:  5991,
+								EndPos:    6006,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -21322,8 +20945,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 360,
 									EndLine:   360,
-									StartPos:  6618,
-									EndPos:    6620,
+									StartPos:  5991,
+									EndPos:    5993,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -21331,8 +20954,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 360,
 										EndLine:   360,
-										StartPos:  6618,
-										EndPos:    6620,
+										StartPos:  5991,
+										EndPos:    5993,
 									},
 								},
 								Value: []byte("$a"),
@@ -21343,8 +20966,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 360,
 									EndLine:   360,
-									StartPos:  6623,
-									EndPos:    6633,
+									StartPos:  5996,
+									EndPos:    6006,
 								},
 							},
 							Class: &ast.NameName{
@@ -21352,8 +20975,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 360,
 										EndLine:   360,
-										StartPos:  6623,
-										EndPos:    6626,
+										StartPos:  5996,
+										EndPos:    5999,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -21362,8 +20985,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 360,
 												EndLine:   360,
-												StartPos:  6623,
-												EndPos:    6626,
+												StartPos:  5996,
+												EndPos:    5999,
 											},
 										},
 										Value: []byte("Foo"),
@@ -21375,8 +20998,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 360,
 										EndLine:   360,
-										StartPos:  6628,
-										EndPos:    6633,
+										StartPos:  6001,
+										EndPos:    6006,
 									},
 								},
 								Value: []byte("class"),
@@ -21390,8 +21013,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 361,
 						EndLine:   361,
-						StartPos:  6637,
-						EndPos:    6659,
+						StartPos:  6008,
+						EndPos:    6030,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -21400,8 +21023,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 361,
 								EndLine:   361,
-								StartPos:  6644,
-								EndPos:    6658,
+								StartPos:  6015,
+								EndPos:    6029,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -21409,8 +21032,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 361,
 									EndLine:   361,
-									StartPos:  6644,
-									EndPos:    6646,
+									StartPos:  6015,
+									EndPos:    6017,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -21418,8 +21041,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 361,
 										EndLine:   361,
-										StartPos:  6644,
-										EndPos:    6646,
+										StartPos:  6015,
+										EndPos:    6017,
 									},
 								},
 								Value: []byte("$a"),
@@ -21430,8 +21053,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 361,
 									EndLine:   361,
-									StartPos:  6649,
-									EndPos:    6658,
+									StartPos:  6020,
+									EndPos:    6029,
 								},
 							},
 							Value: []byte("__CLASS__"),
@@ -21444,8 +21067,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 362,
 						EndLine:   362,
-						StartPos:  6662,
-						EndPos:    6678,
+						StartPos:  6031,
+						EndPos:    6047,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -21454,8 +21077,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 362,
 								EndLine:   362,
-								StartPos:  6669,
-								EndPos:    6677,
+								StartPos:  6038,
+								EndPos:    6046,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -21463,8 +21086,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 362,
 									EndLine:   362,
-									StartPos:  6669,
-									EndPos:    6671,
+									StartPos:  6038,
+									EndPos:    6040,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -21472,8 +21095,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 362,
 										EndLine:   362,
-										StartPos:  6669,
-										EndPos:    6671,
+										StartPos:  6038,
+										EndPos:    6040,
 									},
 								},
 								Value: []byte("$a"),
@@ -21484,8 +21107,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 362,
 									EndLine:   362,
-									StartPos:  6674,
-									EndPos:    6677,
+									StartPos:  6043,
+									EndPos:    6046,
 								},
 							},
 							Const: &ast.NameName{
@@ -21493,8 +21116,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 362,
 										EndLine:   362,
-										StartPos:  6674,
-										EndPos:    6677,
+										StartPos:  6043,
+										EndPos:    6046,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -21503,8 +21126,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 362,
 												EndLine:   362,
-												StartPos:  6674,
-												EndPos:    6677,
+												StartPos:  6043,
+												EndPos:    6046,
 											},
 										},
 										Value: []byte("Foo"),
@@ -21520,8 +21143,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 363,
 						EndLine:   363,
-						StartPos:  6681,
-						EndPos:    6707,
+						StartPos:  6048,
+						EndPos:    6074,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -21530,8 +21153,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 363,
 								EndLine:   363,
-								StartPos:  6688,
-								EndPos:    6706,
+								StartPos:  6055,
+								EndPos:    6073,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -21539,8 +21162,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 363,
 									EndLine:   363,
-									StartPos:  6688,
-									EndPos:    6690,
+									StartPos:  6055,
+									EndPos:    6057,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -21548,8 +21171,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 363,
 										EndLine:   363,
-										StartPos:  6688,
-										EndPos:    6690,
+										StartPos:  6055,
+										EndPos:    6057,
 									},
 								},
 								Value: []byte("$a"),
@@ -21560,8 +21183,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 363,
 									EndLine:   363,
-									StartPos:  6693,
-									EndPos:    6706,
+									StartPos:  6060,
+									EndPos:    6073,
 								},
 							},
 							Const: &ast.NameRelative{
@@ -21569,8 +21192,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 363,
 										EndLine:   363,
-										StartPos:  6693,
-										EndPos:    6706,
+										StartPos:  6060,
+										EndPos:    6073,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -21579,8 +21202,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 363,
 												EndLine:   363,
-												StartPos:  6703,
-												EndPos:    6706,
+												StartPos:  6070,
+												EndPos:    6073,
 											},
 										},
 										Value: []byte("Foo"),
@@ -21596,8 +21219,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 364,
 						EndLine:   364,
-						StartPos:  6710,
-						EndPos:    6727,
+						StartPos:  6075,
+						EndPos:    6092,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -21606,8 +21229,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 364,
 								EndLine:   364,
-								StartPos:  6717,
-								EndPos:    6726,
+								StartPos:  6082,
+								EndPos:    6091,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -21615,8 +21238,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 364,
 									EndLine:   364,
-									StartPos:  6717,
-									EndPos:    6719,
+									StartPos:  6082,
+									EndPos:    6084,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -21624,8 +21247,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 364,
 										EndLine:   364,
-										StartPos:  6717,
-										EndPos:    6719,
+										StartPos:  6082,
+										EndPos:    6084,
 									},
 								},
 								Value: []byte("$a"),
@@ -21636,8 +21259,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 364,
 									EndLine:   364,
-									StartPos:  6722,
-									EndPos:    6726,
+									StartPos:  6087,
+									EndPos:    6091,
 								},
 							},
 							Const: &ast.NameFullyQualified{
@@ -21645,8 +21268,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 364,
 										EndLine:   364,
-										StartPos:  6722,
-										EndPos:    6726,
+										StartPos:  6087,
+										EndPos:    6091,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -21655,8 +21278,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 364,
 												EndLine:   364,
-												StartPos:  6723,
-												EndPos:    6726,
+												StartPos:  6088,
+												EndPos:    6091,
 											},
 										},
 										Value: []byte("Foo"),
@@ -21672,8 +21295,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 365,
 						EndLine:   365,
-						StartPos:  6730,
-						EndPos:    6750,
+						StartPos:  6093,
+						EndPos:    6113,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -21682,8 +21305,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 365,
 								EndLine:   365,
-								StartPos:  6737,
-								EndPos:    6749,
+								StartPos:  6100,
+								EndPos:    6112,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -21691,8 +21314,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 365,
 									EndLine:   365,
-									StartPos:  6737,
-									EndPos:    6739,
+									StartPos:  6100,
+									EndPos:    6102,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -21700,8 +21323,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 365,
 										EndLine:   365,
-										StartPos:  6737,
-										EndPos:    6739,
+										StartPos:  6100,
+										EndPos:    6102,
 									},
 								},
 								Value: []byte("$a"),
@@ -21712,8 +21335,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 365,
 									EndLine:   365,
-									StartPos:  6742,
-									EndPos:    6749,
+									StartPos:  6105,
+									EndPos:    6112,
 								},
 							},
 						},
@@ -21725,8 +21348,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 366,
 						EndLine:   366,
-						StartPos:  6753,
-						EndPos:    6782,
+						StartPos:  6114,
+						EndPos:    6143,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -21735,8 +21358,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 366,
 								EndLine:   366,
-								StartPos:  6760,
-								EndPos:    6781,
+								StartPos:  6121,
+								EndPos:    6142,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -21744,8 +21367,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 366,
 									EndLine:   366,
-									StartPos:  6760,
-									EndPos:    6762,
+									StartPos:  6121,
+									EndPos:    6123,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -21753,8 +21376,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 366,
 										EndLine:   366,
-										StartPos:  6760,
-										EndPos:    6762,
+										StartPos:  6121,
+										EndPos:    6123,
 									},
 								},
 								Value: []byte("$a"),
@@ -21765,8 +21388,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 366,
 									EndLine:   366,
-									StartPos:  6765,
-									EndPos:    6781,
+									StartPos:  6126,
+									EndPos:    6142,
 								},
 							},
 							Items: []ast.Vertex{
@@ -21775,8 +21398,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 366,
 											EndLine:   366,
-											StartPos:  6771,
-											EndPos:    6777,
+											StartPos:  6132,
+											EndPos:    6138,
 										},
 									},
 									Key: &ast.ScalarLnumber{
@@ -21784,8 +21407,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 366,
 												EndLine:   366,
-												StartPos:  6771,
-												EndPos:    6772,
+												StartPos:  6132,
+												EndPos:    6133,
 											},
 										},
 										Value: []byte("1"),
@@ -21795,8 +21418,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 366,
 												EndLine:   366,
-												StartPos:  6776,
-												EndPos:    6777,
+												StartPos:  6137,
+												EndPos:    6138,
 											},
 										},
 										Value: []byte("1"),
@@ -21807,8 +21430,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 366,
 											EndLine:   366,
-											StartPos:  6779,
-											EndPos:    6780,
+											StartPos:  6140,
+											EndPos:    6141,
 										},
 									},
 									Val: &ast.ScalarLnumber{
@@ -21816,8 +21439,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 366,
 												EndLine:   366,
-												StartPos:  6779,
-												EndPos:    6780,
+												StartPos:  6140,
+												EndPos:    6141,
 											},
 										},
 										Value: []byte("2"),
@@ -21833,8 +21456,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 367,
 						EndLine:   367,
-						StartPos:  6785,
-						EndPos:    6812,
+						StartPos:  6144,
+						EndPos:    6171,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -21843,8 +21466,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 367,
 								EndLine:   367,
-								StartPos:  6792,
-								EndPos:    6811,
+								StartPos:  6151,
+								EndPos:    6170,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -21852,8 +21475,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 367,
 									EndLine:   367,
-									StartPos:  6792,
-									EndPos:    6794,
+									StartPos:  6151,
+									EndPos:    6153,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -21861,8 +21484,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 367,
 										EndLine:   367,
-										StartPos:  6792,
-										EndPos:    6794,
+										StartPos:  6151,
+										EndPos:    6153,
 									},
 								},
 								Value: []byte("$a"),
@@ -21873,8 +21496,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 367,
 									EndLine:   367,
-									StartPos:  6797,
-									EndPos:    6811,
+									StartPos:  6156,
+									EndPos:    6170,
 								},
 							},
 							Var: &ast.ExprShortArray{
@@ -21882,8 +21505,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 367,
 										EndLine:   367,
-										StartPos:  6797,
-										EndPos:    6808,
+										StartPos:  6156,
+										EndPos:    6167,
 									},
 								},
 								Items: []ast.Vertex{
@@ -21892,8 +21515,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 367,
 												EndLine:   367,
-												StartPos:  6798,
-												EndPos:    6799,
+												StartPos:  6157,
+												EndPos:    6158,
 											},
 										},
 										Val: &ast.ScalarLnumber{
@@ -21901,8 +21524,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 367,
 													EndLine:   367,
-													StartPos:  6798,
-													EndPos:    6799,
+													StartPos:  6157,
+													EndPos:    6158,
 												},
 											},
 											Value: []byte("1"),
@@ -21913,8 +21536,8 @@ func TestPhp5(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 367,
 												EndLine:   367,
-												StartPos:  6801,
-												EndPos:    6807,
+												StartPos:  6160,
+												EndPos:    6166,
 											},
 										},
 										Key: &ast.ScalarLnumber{
@@ -21922,8 +21545,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 367,
 													EndLine:   367,
-													StartPos:  6801,
-													EndPos:    6802,
+													StartPos:  6160,
+													EndPos:    6161,
 												},
 											},
 											Value: []byte("2"),
@@ -21933,8 +21556,8 @@ func TestPhp5(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 367,
 													EndLine:   367,
-													StartPos:  6806,
-													EndPos:    6807,
+													StartPos:  6165,
+													EndPos:    6166,
 												},
 											},
 											Value: []byte("2"),
@@ -21947,8 +21570,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 367,
 										EndLine:   367,
-										StartPos:  6809,
-										EndPos:    6810,
+										StartPos:  6168,
+										EndPos:    6169,
 									},
 								},
 								Value: []byte("0"),
@@ -21962,8 +21585,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 369,
 						EndLine:   369,
-						StartPos:  6816,
-						EndPos:    6831,
+						StartPos:  6173,
+						EndPos:    6188,
 					},
 				},
 				Cond: &ast.ExprYield{
@@ -21971,8 +21594,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 369,
 							EndLine:   369,
-							StartPos:  6820,
-							EndPos:    6827,
+							StartPos:  6177,
+							EndPos:    6184,
 						},
 					},
 					Value: &ast.ScalarLnumber{
@@ -21980,8 +21603,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 369,
 								EndLine:   369,
-								StartPos:  6826,
-								EndPos:    6827,
+								StartPos:  6183,
+								EndPos:    6184,
 							},
 						},
 						Value: []byte("1"),
@@ -21992,8 +21615,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 369,
 							EndLine:   369,
-							StartPos:  6829,
-							EndPos:    6831,
+							StartPos:  6186,
+							EndPos:    6188,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -22004,8 +21627,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 370,
 						EndLine:   370,
-						StartPos:  6834,
-						EndPos:    6845,
+						StartPos:  6189,
+						EndPos:    6200,
 					},
 				},
 				Expr: &ast.ExprStaticPropertyFetch{
@@ -22013,8 +21636,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 370,
 							EndLine:   370,
-							StartPos:  6834,
-							EndPos:    6844,
+							StartPos:  6189,
+							EndPos:    6199,
 						},
 					},
 					Class: &ast.NameName{
@@ -22022,8 +21645,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 370,
 								EndLine:   370,
-								StartPos:  6834,
-								EndPos:    6837,
+								StartPos:  6189,
+								EndPos:    6192,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -22032,8 +21655,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 370,
 										EndLine:   370,
-										StartPos:  6834,
-										EndPos:    6837,
+										StartPos:  6189,
+										EndPos:    6192,
 									},
 								},
 								Value: []byte("Foo"),
@@ -22045,8 +21668,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 370,
 								EndLine:   370,
-								StartPos:  6839,
-								EndPos:    6844,
+								StartPos:  6194,
+								EndPos:    6199,
 							},
 						},
 						VarName: &ast.ExprVariable{
@@ -22054,8 +21677,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 370,
 									EndLine:   370,
-									StartPos:  6840,
-									EndPos:    6844,
+									StartPos:  6195,
+									EndPos:    6199,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -22063,8 +21686,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 370,
 										EndLine:   370,
-										StartPos:  6840,
-										EndPos:    6844,
+										StartPos:  6195,
+										EndPos:    6199,
 									},
 								},
 								Value: []byte("$bar"),
@@ -22078,8 +21701,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 372,
 						EndLine:   372,
-						StartPos:  6849,
-						EndPos:    6856,
+						StartPos:  6202,
+						EndPos:    6209,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -22087,8 +21710,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 372,
 							EndLine:   372,
-							StartPos:  6849,
-							EndPos:    6855,
+							StartPos:  6202,
+							EndPos:    6208,
 						},
 					},
 					Function: &ast.ExprVariable{
@@ -22096,8 +21719,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 372,
 								EndLine:   372,
-								StartPos:  6849,
-								EndPos:    6853,
+								StartPos:  6202,
+								EndPos:    6206,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -22105,8 +21728,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 372,
 									EndLine:   372,
-									StartPos:  6849,
-									EndPos:    6853,
+									StartPos:  6202,
+									EndPos:    6206,
 								},
 							},
 							Value: []byte("$foo"),
@@ -22117,8 +21740,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 372,
 								EndLine:   372,
-								StartPos:  6853,
-								EndPos:    6855,
+								StartPos:  6206,
+								EndPos:    6208,
 							},
 						},
 					},
@@ -22129,8 +21752,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 373,
 						EndLine:   373,
-						StartPos:  6859,
-						EndPos:    6872,
+						StartPos:  6210,
+						EndPos:    6223,
 					},
 				},
 				Expr: &ast.ExprArrayDimFetch{
@@ -22138,8 +21761,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 373,
 							EndLine:   373,
-							StartPos:  6859,
-							EndPos:    6871,
+							StartPos:  6210,
+							EndPos:    6222,
 						},
 					},
 					Var: &ast.ExprArrayDimFetch{
@@ -22147,8 +21770,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 373,
 								EndLine:   373,
-								StartPos:  6859,
-								EndPos:    6868,
+								StartPos:  6210,
+								EndPos:    6219,
 							},
 						},
 						Var: &ast.ExprFunctionCall{
@@ -22156,8 +21779,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 373,
 									EndLine:   373,
-									StartPos:  6859,
-									EndPos:    6865,
+									StartPos:  6210,
+									EndPos:    6216,
 								},
 							},
 							Function: &ast.ExprVariable{
@@ -22165,8 +21788,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 373,
 										EndLine:   373,
-										StartPos:  6859,
-										EndPos:    6863,
+										StartPos:  6210,
+										EndPos:    6214,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -22174,8 +21797,8 @@ func TestPhp5(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 373,
 											EndLine:   373,
-											StartPos:  6859,
-											EndPos:    6863,
+											StartPos:  6210,
+											EndPos:    6214,
 										},
 									},
 									Value: []byte("$foo"),
@@ -22186,8 +21809,8 @@ func TestPhp5(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 373,
 										EndLine:   373,
-										StartPos:  6863,
-										EndPos:    6865,
+										StartPos:  6214,
+										EndPos:    6216,
 									},
 								},
 							},
@@ -22197,8 +21820,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 373,
 									EndLine:   373,
-									StartPos:  6866,
-									EndPos:    6867,
+									StartPos:  6217,
+									EndPos:    6218,
 								},
 							},
 							Value: []byte("0"),
@@ -22209,8 +21832,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 373,
 								EndLine:   373,
-								StartPos:  6869,
-								EndPos:    6870,
+								StartPos:  6220,
+								EndPos:    6221,
 							},
 						},
 						Value: []byte("0"),
@@ -22222,8 +21845,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 374,
 						EndLine:   374,
-						StartPos:  6875,
-						EndPos:    6882,
+						StartPos:  6224,
+						EndPos:    6231,
 					},
 				},
 				Expr: &ast.ExprArrayDimFetch{
@@ -22231,8 +21854,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 374,
 							EndLine:   374,
-							StartPos:  6875,
-							EndPos:    6881,
+							StartPos:  6224,
+							EndPos:    6230,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -22240,8 +21863,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 374,
 								EndLine:   374,
-								StartPos:  6875,
-								EndPos:    6877,
+								StartPos:  6224,
+								EndPos:    6226,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -22249,8 +21872,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 374,
 									EndLine:   374,
-									StartPos:  6875,
-									EndPos:    6877,
+									StartPos:  6224,
+									EndPos:    6226,
 								},
 							},
 							Value: []byte("$a"),
@@ -22261,8 +21884,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 374,
 								EndLine:   374,
-								StartPos:  6878,
-								EndPos:    6880,
+								StartPos:  6227,
+								EndPos:    6229,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -22270,8 +21893,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 374,
 									EndLine:   374,
-									StartPos:  6878,
-									EndPos:    6880,
+									StartPos:  6227,
+									EndPos:    6229,
 								},
 							},
 							Value: []byte("$b"),
@@ -22284,8 +21907,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 375,
 						EndLine:   375,
-						StartPos:  6885,
-						EndPos:    6891,
+						StartPos:  6232,
+						EndPos:    6238,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -22293,8 +21916,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 375,
 							EndLine:   375,
-							StartPos:  6885,
-							EndPos:    6890,
+							StartPos:  6232,
+							EndPos:    6237,
 						},
 					},
 					VarName: &ast.ExprVariable{
@@ -22302,8 +21925,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 375,
 								EndLine:   375,
-								StartPos:  6887,
-								EndPos:    6889,
+								StartPos:  6234,
+								EndPos:    6236,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -22311,8 +21934,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 375,
 									EndLine:   375,
-									StartPos:  6887,
-									EndPos:    6889,
+									StartPos:  6234,
+									EndPos:    6236,
 								},
 							},
 							Value: []byte("$a"),
@@ -22325,8 +21948,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 376,
 						EndLine:   376,
-						StartPos:  6894,
-						EndPos:    6909,
+						StartPos:  6239,
+						EndPos:    6254,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -22334,8 +21957,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 376,
 							EndLine:   376,
-							StartPos:  6894,
-							EndPos:    6908,
+							StartPos:  6239,
+							EndPos:    6253,
 						},
 					},
 					Class: &ast.ExprVariable{
@@ -22343,8 +21966,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 376,
 								EndLine:   376,
-								StartPos:  6894,
-								EndPos:    6898,
+								StartPos:  6239,
+								EndPos:    6243,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -22352,8 +21975,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 376,
 									EndLine:   376,
-									StartPos:  6894,
-									EndPos:    6898,
+									StartPos:  6239,
+									EndPos:    6243,
 								},
 							},
 							Value: []byte("$foo"),
@@ -22364,8 +21987,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 376,
 								EndLine:   376,
-								StartPos:  6900,
-								EndPos:    6906,
+								StartPos:  6245,
+								EndPos:    6251,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -22373,8 +21996,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 376,
 									EndLine:   376,
-									StartPos:  6901,
-									EndPos:    6905,
+									StartPos:  6246,
+									EndPos:    6250,
 								},
 							},
 							Value: []byte("$bar"),
@@ -22385,8 +22008,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 376,
 								EndLine:   376,
-								StartPos:  6906,
-								EndPos:    6908,
+								StartPos:  6251,
+								EndPos:    6253,
 							},
 						},
 					},
@@ -22397,8 +22020,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 377,
 						EndLine:   377,
-						StartPos:  6912,
-						EndPos:    6922,
+						StartPos:  6255,
+						EndPos:    6265,
 					},
 				},
 				Expr: &ast.ExprClassConstFetch{
@@ -22406,8 +22029,8 @@ func TestPhp5(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 377,
 							EndLine:   377,
-							StartPos:  6912,
-							EndPos:    6921,
+							StartPos:  6255,
+							EndPos:    6264,
 						},
 					},
 					Class: &ast.ExprVariable{
@@ -22415,8 +22038,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 377,
 								EndLine:   377,
-								StartPos:  6912,
-								EndPos:    6916,
+								StartPos:  6255,
+								EndPos:    6259,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -22424,8 +22047,8 @@ func TestPhp5(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 377,
 									EndLine:   377,
-									StartPos:  6912,
-									EndPos:    6916,
+									StartPos:  6255,
+									EndPos:    6259,
 								},
 							},
 							Value: []byte("$foo"),
@@ -22436,8 +22059,8 @@ func TestPhp5(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 377,
 								EndLine:   377,
-								StartPos:  6918,
-								EndPos:    6921,
+								StartPos:  6261,
+								EndPos:    6264,
 							},
 						},
 						Value: []byte("bar"),
@@ -22449,8 +22072,8 @@ func TestPhp5(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 379,
 						EndLine:   379,
-						StartPos:  6926,
-						EndPos:    6944,
+						StartPos:  6267,
+						EndPos:    6285,
 					},
 				},
 			},
diff --git a/internal/php5/test.php b/internal/php5/test.php
new file mode 100644
index 0000000..c811eb1
--- /dev/null
+++ b/internal/php5/test.php
@@ -0,0 +1,381 @@
+<?
+foo($a, ...$b);
+$foo($a, ...$b);
+$foo->bar($a, ...$b);
+foo::bar($a, ...$b);
+$foo::bar($a, ...$b);
+new foo($a, ...$b);
+
+function foo(bar $bar=null, baz &...$baz) {}
+class foo {public function foo(bar $bar=null, baz &...$baz) {}}
+function(bar $bar=null, baz &...$baz) {};
+static function(bar $bar=null, baz &...$baz) {};
+
+1234567890123456789;
+12345678901234567890;
+0.;
+0b0111111111111111111111111111111111111111111111111111111111111111;
+0b1111111111111111111111111111111111111111111111111111111111111111;
+0x007111111111111111;
+0x8111111111111111;
+__CLASS__;
+__DIR__;
+__FILE__;
+__FUNCTION__;
+__LINE__;
+__NAMESPACE__;
+__METHOD__;
+__TRAIT__;
+
+"test $var";
+"test $var[1]";
+"test $var[1234567890123456789012345678901234567890]";
+"test $var[bar]";
+"test $var[$bar]";
+"$foo $bar";
+"test $foo->bar()";
+"test ${foo}";
+"test ${foo[0]}";
+"test {$foo->bar()}";
+
+if ($a) :
+endif;
+if ($a) :
+elseif ($b):
+endif;
+if ($a) :
+else:
+endif;
+if ($a) :
+elseif ($b):
+elseif ($c):
+else:
+endif;
+
+while (1) { break; }
+while (1) { break 2; }
+while (1) : break(3); endwhile;
+class foo{ const FOO = 1, BAR = 2; }
+class foo{ function bar() {} }
+class foo{ public static function &bar() {} }
+class foo{ final private function bar() {} protected function baz() {} }
+abstract class foo{ abstract public function bar(); }
+final class foo extends bar { }
+final class foo implements bar { }
+final class foo implements bar, baz { }
+
+const FOO = 1, BAR = 2;
+while (1) { continue; }
+while (1) { continue 2; }
+while (1) { continue(3); }
+declare(ticks=1);
+declare(ticks=1, strict_types=1) {}
+declare(ticks=1): enddeclare;
+do {} while(1);
+echo $a, 1;
+echo($a);
+for($i = 0; $i < 10; $i++, $i++) {}
+for(; $i < 10; $i++) : endfor;
+foreach ($a as $v) {}
+foreach ([] as $v) {}
+foreach ($a as $v) : endforeach;
+foreach ($a as $k => $v) {}
+foreach ([] as $k => $v) {}
+foreach ($a as $k => &$v) {}
+foreach ($a as $k => list($v)) {}
+function foo() {}
+
+function foo() {
+    function bar() {}
+    class Baz {}
+    return $a;
+}
+
+function foo(array $a, callable $b) {return;}
+function &foo() {return 1;}
+function &foo() {}
+global $a, $b, $$c, ${foo()};
+a:
+goto a;
+if ($a) {}
+if ($a) {} elseif ($b) {}
+if ($a) {} else {}
+if ($a) {} elseif ($b) {} elseif ($c) {} else {}
+if ($a) {} elseif ($b) {} else if ($c) {} else {}
+?> <div></div> <?
+interface Foo {}
+interface Foo extends Bar {}
+interface Foo extends Bar, Baz {}
+namespace Foo;
+namespace Foo\Bar {}
+namespace {}
+class foo {var $a;}
+class foo {public static $a, $b = 1;}
+class foo {public static $a = 1, $b;}
+static $a, $b = 1;
+static $a = 1, $b;
+
+switch (1) :
+    case 1:
+    default:
+    case 2:
+endswitch;
+
+switch (1) :;
+    case 1;
+    case 2;
+endswitch;
+
+switch (1) {
+    case 1: break;
+    case 2: break;
+}
+
+switch (1) {;
+    case 1; break;
+    case 2; break;
+}
+throw $e;
+trait Foo {}
+class Foo { use Bar; }
+class Foo { use Bar, Baz {} }
+class Foo { use Bar, Baz { one as public; } }
+class Foo { use Bar, Baz { one as public two; } }
+class Foo { use Bar, Baz { Bar::one insteadof Baz, Quux; Baz::one as two; } }
+
+try {}
+try {} catch (Exception $e) {}
+try {} catch (Exception $e) {} catch (RuntimeException $e) {}
+try {} catch (Exception $e) {} catch (\RuntimeException $e) {} catch (namespace\AdditionException $e) {}
+try {} catch (Exception $e) {} finally {}
+
+unset($a, $b);
+
+use Foo;
+use \Foo;
+use \Foo as Bar;
+use Foo, Bar;
+use Foo, Bar as Baz;
+use function Foo, \Bar;
+use function Foo as foo, \Bar as bar;
+use const Foo, \Bar;
+use const Foo as foo, \Bar as bar;
+
+$a[1];
+$a[1][2];
+array();
+array(1);
+array(1=>1, &$b,);
+array(3 =>&$b);
+array(&$b, 1=>1, 1, 3 =>&$b);
+~$a;
+!$a;
+
+Foo::Bar;
+clone($a);
+clone $a;
+function(){};
+function($a, $b) use ($c, &$d) {};
+function($a, $b) use (&$c, $d) {};
+function() {};
+foo;
+namespace\foo;
+\foo;
+
+empty($a);
+empty(Foo);
+@$a;
+eval($a);
+exit;
+exit($a);
+die();
+die($a);
+foo();
+namespace\foo(&$a);
+\foo([]);
+$foo(yield $a);
+
+$a--;
+$a++;
+--$a;
+++$a;
+
+include $a;
+include_once $a;
+require $a;
+require_once $a;
+
+$a instanceof Foo;
+$a instanceof namespace\Foo;
+$a instanceof \Foo;
+
+isset($a, $b);
+isset(Foo);
+list() = $b;
+list($a, $b) = $b;
+list($a[]) = $b;
+list(list($a)) = $b;
+
+$a->foo();
+new Foo;
+new namespace\Foo();
+new \Foo();
+print($a);
+$a->foo;
+$a->foo[1];
+$a->foo->bar->baz()->quux[0];
+$a->foo()[1][1];
+`cmd $a`;
+`cmd`;
+``;
+[];
+[1];
+[1=>1, &$b,];
+
+Foo::bar();
+namespace\Foo::bar();
+\Foo::bar();
+Foo::$bar();
+$foo::$bar();
+Foo::$bar;
+namespace\Foo::$bar;
+\Foo::$bar;
+$a ? $b : $c;
+$a ? : $c;
+$a ? $b ? $c : $d : $e;
+$a ? $b : $c ? $d : $e;
+-$a;
++$a;
+$$a;
+$$$a;
+yield;
+yield $a;
+yield $a => $b;
+yield Foo::class;
+yield $a => Foo::class;
+
+(array)$a;
+(boolean)$a;
+(bool)$a;
+(double)$a;
+(float)$a;
+(integer)$a;
+(int)$a;
+(object)$a;
+(string)$a;
+(unset)$a;
+
+$a & $b;
+$a | $b;
+$a ^ $b;
+$a && $b;
+$a || $b;
+$a . $b;
+$a / $b;
+$a == $b;
+$a >= $b;
+$a > $b;
+$a === $b;
+$a and $b;
+$a or $b;
+$a xor $b;
+$a - $b;
+$a % $b;
+$a * $b;
+$a != $b;
+$a !== $b;
+$a + $b;
+$a ** $b;
+$a << $b;
+$a >> $b;
+$a <= $b;
+$a < $b;
+
+$a =& $b;
+$a =& new Foo;
+$a =& new Foo($b);
+$a = $b;
+$a &= $b;
+$a |= $b;
+$a ^= $b;
+$a .= $b;
+$a /= $b;
+$a -= $b;
+$a %= $b;
+$a *= $b;
+$a += $b;
+$a **= $b;
+$a <<= $b;
+$a >>= $b;
+
+
+(new \Foo());
+(new \Foo())->bar()->baz;
+(new \Foo())[0][0];
+(new \Foo())[0]->bar();
+
+array([0])[0][0];
+"foo"[0];
+foo[0];
+static::foo;
+
+new $foo;
+new $foo::$bar;
+new $a->b[0];
+new $a->b{$b ?: null}->$c->d[0];static $a = [1][0];
+
+static $a = !1;
+static $a = ~1;
+static $a = +1;
+static $a = -1;
+static $a = (1);
+static $a = 1 ?: 2;
+static $a = 1 ? 2 : 3;
+static $a = 1 & 2;
+static $a = 1 | 2;
+static $a = 1 ^ 2;
+static $a = 1 && 2;
+static $a = 1 || 2;
+static $a = 1 . 2;
+static $a = 1 / 2;
+static $a = 1 == 2;
+static $a = 1 >= 2;
+static $a = 1 > 2;
+static $a = 1 === 2;
+static $a = 1 and 2;
+static $a = 1 or 2;
+static $a = 1 xor 2;
+static $a = 1 - 2;
+static $a = 1 % 2;
+static $a = 1 * 2;
+static $a = 1 != 2;
+static $a = 1 !== 2;
+static $a = 1 + 2;
+static $a = 1 ** 2;
+static $a = 1 << 2;
+static $a = 1 >> 2;
+static $a = 1 <= 2;
+static $a = 1 < 2;
+static $a = Foo::bar;
+static $a = Foo::class;
+static $a = __CLASS__;
+static $a = Foo;
+static $a = namespace\Foo;
+static $a = \Foo;
+static $a = array();
+static $a = array(1 => 1, 2);
+static $a = [1, 2 => 2][0];
+
+if (yield 1) {}
+Foo::$$bar;
+
+$foo();
+$foo()[0][0];
+$a{$b};
+${$a};
+$foo::{$bar}();
+$foo::bar;
+
+__halt_compiler();
+
+parsing process must be terminated
\ No newline at end of file
diff --git a/internal/php7/parser_test.go b/internal/php7/parser_test.go
index 60e0289..0e1ff12 100644
--- a/internal/php7/parser_test.go
+++ b/internal/php7/parser_test.go
@@ -960,7 +960,7 @@ func TestPhp7ArgumentNode(t *testing.T) {
 }
 
 func TestPhp7ParameterNode(t *testing.T) {
-	src := `<? 
+	src := `<?
 		function foo(?bar $bar=null, baz &...$baz) {}
 		class foo {public function foo(?bar $bar=null, baz &...$baz) {}}
 		function(?bar $bar=null, baz &...$baz) {};
@@ -972,8 +972,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 			Position: &position.Position{
 				StartLine: 2,
 				EndLine:   5,
-				StartPos:  6,
-				EndPos:    215,
+				StartPos:  5,
+				EndPos:    214,
 			},
 		},
 		Stmts: []ast.Vertex{
@@ -982,18 +982,17 @@ func TestPhp7ParameterNode(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 2,
 						EndLine:   2,
-						StartPos:  6,
-						EndPos:    51,
+						StartPos:  5,
+						EndPos:    50,
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
-							StartPos:  15,
-							EndPos:    18,
+							StartPos:  14,
+							EndPos:    17,
 						},
 					},
 					Value: []byte("foo"),
@@ -1004,19 +1003,17 @@ func TestPhp7ParameterNode(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
-								StartPos:  19,
-								EndPos:    33,
+								StartPos:  18,
+								EndPos:    32,
 							},
 						},
-						ByRef:    false,
-						Variadic: false,
 						Type: &ast.Nullable{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  19,
-									EndPos:    23,
+									StartPos:  18,
+									EndPos:    22,
 								},
 							},
 							Expr: &ast.NameName{
@@ -1024,8 +1021,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  20,
-										EndPos:    23,
+										StartPos:  19,
+										EndPos:    22,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1034,8 +1031,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
-												StartPos:  20,
-												EndPos:    23,
+												StartPos:  19,
+												EndPos:    22,
 											},
 										},
 										Value: []byte("bar"),
@@ -1048,8 +1045,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  24,
-									EndPos:    28,
+									StartPos:  23,
+									EndPos:    27,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -1057,8 +1054,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  24,
-										EndPos:    28,
+										StartPos:  23,
+										EndPos:    27,
 									},
 								},
 								Value: []byte("$bar"),
@@ -1069,8 +1066,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  29,
-									EndPos:    33,
+									StartPos:  28,
+									EndPos:    32,
 								},
 							},
 							Const: &ast.NameName{
@@ -1078,8 +1075,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  29,
-										EndPos:    33,
+										StartPos:  28,
+										EndPos:    32,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1088,8 +1085,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
-												StartPos:  29,
-												EndPos:    33,
+												StartPos:  28,
+												EndPos:    32,
 											},
 										},
 										Value: []byte("null"),
@@ -1103,19 +1100,17 @@ func TestPhp7ParameterNode(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
-								StartPos:  35,
-								EndPos:    47,
+								StartPos:  34,
+								EndPos:    46,
 							},
 						},
-						ByRef:    true,
-						Variadic: true,
 						Type: &ast.NameName{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  35,
-									EndPos:    38,
+									StartPos:  34,
+									EndPos:    37,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -1124,46 +1119,67 @@ func TestPhp7ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 2,
 											EndLine:   2,
-											StartPos:  35,
-											EndPos:    38,
+											StartPos:  34,
+											EndPos:    37,
 										},
 									},
 									Value: []byte("baz"),
 								},
 							},
 						},
-						Var: &ast.ExprVariable{
+						Var: &ast.Reference{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  43,
-									EndPos:    47,
+									StartPos:  38,
+									EndPos:    46,
 								},
 							},
-							VarName: &ast.Identifier{
+							Var: &ast.Variadic{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  43,
-										EndPos:    47,
+										StartPos:  39,
+										EndPos:    46,
+									},
+								},
+								Var: &ast.ExprVariable{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  42,
+											EndPos:    46,
+										},
+									},
+									VarName: &ast.Identifier{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 2,
+												EndLine:   2,
+												StartPos:  42,
+												EndPos:    46,
+											},
+										},
+										Value: []byte("$baz"),
 									},
 								},
-								Value: []byte("$baz"),
 							},
 						},
 					},
 				},
-				Stmts: []ast.Vertex{},
+				Stmts: []ast.Vertex{
+				},
 			},
 			&ast.StmtClass{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 3,
 						EndLine:   3,
-						StartPos:  54,
-						EndPos:    118,
+						StartPos:  53,
+						EndPos:    117,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -1171,8 +1187,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 3,
 							EndLine:   3,
-							StartPos:  60,
-							EndPos:    63,
+							StartPos:  59,
+							EndPos:    62,
 						},
 					},
 					Value: []byte("foo"),
@@ -1183,18 +1199,17 @@ func TestPhp7ParameterNode(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 3,
 								EndLine:   3,
-								StartPos:  65,
-								EndPos:    117,
+								StartPos:  64,
+								EndPos:    116,
 							},
 						},
-						ReturnsRef: false,
 						MethodName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  81,
-									EndPos:    84,
+									StartPos:  80,
+									EndPos:    83,
 								},
 							},
 							Value: []byte("foo"),
@@ -1205,8 +1220,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  65,
-										EndPos:    71,
+										StartPos:  64,
+										EndPos:    70,
 									},
 								},
 								Value: []byte("public"),
@@ -1218,19 +1233,17 @@ func TestPhp7ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  85,
-										EndPos:    99,
+										StartPos:  84,
+										EndPos:    98,
 									},
 								},
-								ByRef:    false,
-								Variadic: false,
 								Type: &ast.Nullable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  85,
-											EndPos:    89,
+											StartPos:  84,
+											EndPos:    88,
 										},
 									},
 									Expr: &ast.NameName{
@@ -1238,8 +1251,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
-												StartPos:  86,
-												EndPos:    89,
+												StartPos:  85,
+												EndPos:    88,
 											},
 										},
 										Parts: []ast.Vertex{
@@ -1248,8 +1261,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 3,
 														EndLine:   3,
-														StartPos:  86,
-														EndPos:    89,
+														StartPos:  85,
+														EndPos:    88,
 													},
 												},
 												Value: []byte("bar"),
@@ -1262,8 +1275,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  90,
-											EndPos:    94,
+											StartPos:  89,
+											EndPos:    93,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -1271,8 +1284,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
-												StartPos:  90,
-												EndPos:    94,
+												StartPos:  89,
+												EndPos:    93,
 											},
 										},
 										Value: []byte("$bar"),
@@ -1283,8 +1296,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  95,
-											EndPos:    99,
+											StartPos:  94,
+											EndPos:    98,
 										},
 									},
 									Const: &ast.NameName{
@@ -1292,8 +1305,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
-												StartPos:  95,
-												EndPos:    99,
+												StartPos:  94,
+												EndPos:    98,
 											},
 										},
 										Parts: []ast.Vertex{
@@ -1302,8 +1315,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 3,
 														EndLine:   3,
-														StartPos:  95,
-														EndPos:    99,
+														StartPos:  94,
+														EndPos:    98,
 													},
 												},
 												Value: []byte("null"),
@@ -1317,19 +1330,17 @@ func TestPhp7ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  101,
-										EndPos:    113,
+										StartPos:  100,
+										EndPos:    112,
 									},
 								},
-								ByRef:    true,
-								Variadic: true,
 								Type: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  101,
-											EndPos:    104,
+											StartPos:  100,
+											EndPos:    103,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -1338,33 +1349,53 @@ func TestPhp7ParameterNode(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 3,
 													EndLine:   3,
-													StartPos:  101,
-													EndPos:    104,
+													StartPos:  100,
+													EndPos:    103,
 												},
 											},
 											Value: []byte("baz"),
 										},
 									},
 								},
-								Var: &ast.ExprVariable{
+								Var: &ast.Reference{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  109,
-											EndPos:    113,
+											StartPos:  104,
+											EndPos:    112,
 										},
 									},
-									VarName: &ast.Identifier{
+									Var: &ast.Variadic{
 										Node: ast.Node{
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
-												StartPos:  109,
-												EndPos:    113,
+												StartPos:  105,
+												EndPos:    112,
+											},
+										},
+										Var: &ast.ExprVariable{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 3,
+													EndLine:   3,
+													StartPos:  108,
+													EndPos:    112,
+												},
+											},
+											VarName: &ast.Identifier{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 3,
+														EndLine:   3,
+														StartPos:  108,
+														EndPos:    112,
+													},
+												},
+												Value: []byte("$baz"),
 											},
 										},
-										Value: []byte("$baz"),
 									},
 								},
 							},
@@ -1374,11 +1405,12 @@ func TestPhp7ParameterNode(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  115,
-									EndPos:    117,
+									StartPos:  114,
+									EndPos:    116,
 								},
 							},
-							Stmts: []ast.Vertex{},
+							Stmts: []ast.Vertex{
+							},
 						},
 					},
 				},
@@ -1388,8 +1420,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 4,
 						EndLine:   4,
-						StartPos:  121,
-						EndPos:    163,
+						StartPos:  120,
+						EndPos:    162,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -1397,31 +1429,27 @@ func TestPhp7ParameterNode(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 4,
 							EndLine:   4,
-							StartPos:  121,
-							EndPos:    162,
+							StartPos:  120,
+							EndPos:    161,
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
 					Params: []ast.Vertex{
 						&ast.Parameter{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
-									StartPos:  130,
-									EndPos:    144,
+									StartPos:  129,
+									EndPos:    143,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Type: &ast.Nullable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  130,
-										EndPos:    134,
+										StartPos:  129,
+										EndPos:    133,
 									},
 								},
 								Expr: &ast.NameName{
@@ -1429,8 +1457,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  131,
-											EndPos:    134,
+											StartPos:  130,
+											EndPos:    133,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -1439,8 +1467,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 4,
 													EndLine:   4,
-													StartPos:  131,
-													EndPos:    134,
+													StartPos:  130,
+													EndPos:    133,
 												},
 											},
 											Value: []byte("bar"),
@@ -1453,8 +1481,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  135,
-										EndPos:    139,
+										StartPos:  134,
+										EndPos:    138,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -1462,8 +1490,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  135,
-											EndPos:    139,
+											StartPos:  134,
+											EndPos:    138,
 										},
 									},
 									Value: []byte("$bar"),
@@ -1474,8 +1502,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  140,
-										EndPos:    144,
+										StartPos:  139,
+										EndPos:    143,
 									},
 								},
 								Const: &ast.NameName{
@@ -1483,8 +1511,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  140,
-											EndPos:    144,
+											StartPos:  139,
+											EndPos:    143,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -1493,8 +1521,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 4,
 													EndLine:   4,
-													StartPos:  140,
-													EndPos:    144,
+													StartPos:  139,
+													EndPos:    143,
 												},
 											},
 											Value: []byte("null"),
@@ -1508,19 +1536,17 @@ func TestPhp7ParameterNode(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
-									StartPos:  146,
-									EndPos:    158,
+									StartPos:  145,
+									EndPos:    157,
 								},
 							},
-							Variadic: true,
-							ByRef:    true,
 							Type: &ast.NameName{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  146,
-										EndPos:    149,
+										StartPos:  145,
+										EndPos:    148,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1529,38 +1555,59 @@ func TestPhp7ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 4,
 												EndLine:   4,
-												StartPos:  146,
-												EndPos:    149,
+												StartPos:  145,
+												EndPos:    148,
 											},
 										},
 										Value: []byte("baz"),
 									},
 								},
 							},
-							Var: &ast.ExprVariable{
+							Var: &ast.Reference{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  154,
-										EndPos:    158,
+										StartPos:  149,
+										EndPos:    157,
 									},
 								},
-								VarName: &ast.Identifier{
+								Var: &ast.Variadic{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  154,
-											EndPos:    158,
+											StartPos:  150,
+											EndPos:    157,
+										},
+									},
+									Var: &ast.ExprVariable{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 4,
+												EndLine:   4,
+												StartPos:  153,
+												EndPos:    157,
+											},
+										},
+										VarName: &ast.Identifier{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 4,
+													EndLine:   4,
+													StartPos:  153,
+													EndPos:    157,
+												},
+											},
+											Value: []byte("$baz"),
 										},
 									},
-									Value: []byte("$baz"),
 								},
 							},
 						},
 					},
-					Stmts: []ast.Vertex{},
+					Stmts: []ast.Vertex{
+					},
 				},
 			},
 			&ast.StmtExpression{
@@ -1568,8 +1615,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 5,
 						EndLine:   5,
-						StartPos:  166,
-						EndPos:    215,
+						StartPos:  165,
+						EndPos:    214,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -1577,31 +1624,28 @@ func TestPhp7ParameterNode(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 5,
 							EndLine:   5,
-							StartPos:  166,
-							EndPos:    214,
+							StartPos:  165,
+							EndPos:    213,
 						},
 					},
-					Static:     true,
-					ReturnsRef: false,
+					Static: true,
 					Params: []ast.Vertex{
 						&ast.Parameter{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 5,
 									EndLine:   5,
-									StartPos:  182,
-									EndPos:    196,
+									StartPos:  181,
+									EndPos:    195,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Type: &ast.Nullable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  182,
-										EndPos:    186,
+										StartPos:  181,
+										EndPos:    185,
 									},
 								},
 								Expr: &ast.NameName{
@@ -1609,8 +1653,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  183,
-											EndPos:    186,
+											StartPos:  182,
+											EndPos:    185,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -1619,8 +1663,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 5,
 													EndLine:   5,
-													StartPos:  183,
-													EndPos:    186,
+													StartPos:  182,
+													EndPos:    185,
 												},
 											},
 											Value: []byte("bar"),
@@ -1633,8 +1677,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  187,
-										EndPos:    191,
+										StartPos:  186,
+										EndPos:    190,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -1642,8 +1686,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  187,
-											EndPos:    191,
+											StartPos:  186,
+											EndPos:    190,
 										},
 									},
 									Value: []byte("$bar"),
@@ -1654,8 +1698,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  192,
-										EndPos:    196,
+										StartPos:  191,
+										EndPos:    195,
 									},
 								},
 								Const: &ast.NameName{
@@ -1663,8 +1707,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  192,
-											EndPos:    196,
+											StartPos:  191,
+											EndPos:    195,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -1673,8 +1717,8 @@ func TestPhp7ParameterNode(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 5,
 													EndLine:   5,
-													StartPos:  192,
-													EndPos:    196,
+													StartPos:  191,
+													EndPos:    195,
 												},
 											},
 											Value: []byte("null"),
@@ -1688,19 +1732,17 @@ func TestPhp7ParameterNode(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 5,
 									EndLine:   5,
-									StartPos:  198,
-									EndPos:    210,
+									StartPos:  197,
+									EndPos:    209,
 								},
 							},
-							Variadic: true,
-							ByRef:    true,
 							Type: &ast.NameName{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  198,
-										EndPos:    201,
+										StartPos:  197,
+										EndPos:    200,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1709,43 +1751,65 @@ func TestPhp7ParameterNode(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 5,
 												EndLine:   5,
-												StartPos:  198,
-												EndPos:    201,
+												StartPos:  197,
+												EndPos:    200,
 											},
 										},
 										Value: []byte("baz"),
 									},
 								},
 							},
-							Var: &ast.ExprVariable{
+							Var: &ast.Reference{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  206,
-										EndPos:    210,
+										StartPos:  201,
+										EndPos:    209,
 									},
 								},
-								VarName: &ast.Identifier{
+								Var: &ast.Variadic{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  206,
-											EndPos:    210,
+											StartPos:  202,
+											EndPos:    209,
+										},
+									},
+									Var: &ast.ExprVariable{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 5,
+												EndLine:   5,
+												StartPos:  205,
+												EndPos:    209,
+											},
+										},
+										VarName: &ast.Identifier{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 5,
+													EndLine:   5,
+													StartPos:  205,
+													EndPos:    209,
+												},
+											},
+											Value: []byte("$baz"),
 										},
 									},
-									Value: []byte("$baz"),
 								},
 							},
 						},
 					},
-					Stmts: []ast.Vertex{},
+					Stmts: []ast.Vertex{
+					},
 				},
 			},
 		},
 	}
 
+
 	lexer := scanner.NewLexer([]byte(src), "7.4", false, nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
@@ -7497,8 +7561,6 @@ func TestStmtFunction_ReturnVar(t *testing.T) {
 								EndPos:    24,
 							},
 						},
-						ByRef:    false,
-						Variadic: false,
 						Type: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
@@ -7541,8 +7603,6 @@ func TestStmtFunction_ReturnVar(t *testing.T) {
 								EndPos:    37,
 							},
 						},
-						ByRef:    false,
-						Variadic: false,
 						Type: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
@@ -15290,8 +15350,6 @@ func TestExprClosure_Use(t *testing.T) {
 									EndPos:    14,
 								},
 							},
-							Variadic: false,
-							ByRef:    false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
@@ -15323,8 +15381,6 @@ func TestExprClosure_Use(t *testing.T) {
 									EndPos:    18,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
@@ -15468,8 +15524,6 @@ func TestExprClosure_Use2(t *testing.T) {
 									EndPos:    14,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
@@ -15501,8 +15555,6 @@ func TestExprClosure_Use2(t *testing.T) {
 									EndPos:    18,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
diff --git a/internal/php7/php7.go b/internal/php7/php7.go
index b80599360aa14fb46d461c41d34b92bba19b3f3e..e54c1a76bfc3d00ccdaa38d36a084062b596e527 100644
GIT binary patch
delta 5520
zcmds5Yj~B#wSH#JmxK^5;g$e_WQzhKw|&dri8O~qO~NH4fC65Ca7QSYKm}sa0HqJ~
zV1d9979mmsazGJGV$lIC7)p7(fQYqLtW^>bP^l%TJl0aldDnb9iO}=&{5n7KJem1s
z*1WUUyWX{Czi>YO%3tEE26QEVXr;I7YHwF%yj|(3B+i~n_j1h|YRSvLR!)z_lNWmM
zH*4~gInzCpfA-jbvC|hmHodrIY;0^~n%5;e19;<9x=*&X<>I?lGOv3~dwA_PsuM4&
z!Cb@r)WO?iCd1RqS`xF<W=&lxgZ%l^rZ0W6U(;Dnwv6TaSjW$k3RDNKt=9=W@+}?1
z3k%g9uJz1;svXy#Rt`5jKvA51mukx|PS?>~bxK9^nJ~q~-+Cgyxlnsl#BkLy)r&Jr
zRLdrtz9w@q{QPq&j_U`iD2@(M3KyNESe_E14tyb-I+{UYs#kn!oca%bFN20qIK&I~
z(ICDt4=es}J=l&*N2uH7%JIB6OSR#BcM<OG$G!g_x%T$`aNLv0aB^KXb!PZCgBw1e
zo-!B1^_iG^VY-fOifx*y$)pU$gNqS@?{jE~^6`o~O5lf6RSy3qmxgdwU!BO4@@Wi@
z9zr=3@UgE_Kgu)|ivxTnUnQ9tLy472<=ZCcB=cGx-KTg$9_6SIs|tL^%o?S_u3=c(
zO8zviI|M4)Qywg!T<uS{c9XfLfPUcX`IP9gCi5X`!52p(RQn&NSaW?Oy{=r0Ni5$C
zzU?9kgm}jyTEcoP<*Fbrn5q87x#NI-%@~U3_zKlZR(CQr<7k@V9lLZlgYhm!X+EC3
znEu6|K0-M<knVNO>>N)yeEwmaT2+Ak^>^!GeE$TP>oXp};yY3ou9&Ib<}DL3_r-WD
zsa!;}_@P3|<?;#0`N#LsCNp>vbtek?h11&@Bai97pZXIInGTeo`b?F^^Ghg?JI<h7
z3Z=>6J^0K@eIFm60r!T*y(!#gKkgZrNe__@!cFgD&b&B_3N#$iE?XsV(KaMw=4!0!
zIhS@S^85L<vntgfjdny+YP#4xiUaE=BC^fs$1ef;?Tdi^T)v9uPpVZ%b9M<mEukFM
zpgdwSic6PLl7aJ&D&@5iX3u&=0@D{I5*3T6n6Equ{QdxMm`*GC)e_t;AWIW?`9hef
z%~XSU<auOT@iO`W;ko70rR8*kN4-bgT+1zg0a2i^&(y7=ZNz1(C|ifp!ZJKh<P9+X
z35i7X5rF-;;(dxYlh@D~0-PNMxMHI}BH!AtrI!>1Qms=svjTT5I;FbU>zO|5>4X9%
zY)o+j{on>DQED0w+o#71q7+{DKD9RkH_|wYgv7vCixekqM!ZKhsN1-_Gxau^<*JKf
z??{Y`Rzm%IZ-H05A#UdfH$KFmwa*X1Un-(McmA}^?V$G-P5ljsQs#JSZGKfolMuf&
z+0%&|w$eHZ1YHCFD92&dGgL8~X8<sm&T1RIg;2eFw@xsg-858j-|fh{uq8!g=A~Zh
zKJ8CSb8~aqF3HU$J1LveuwRnXo$9^|8@-aDc4m#@Gk5Dmv9TVW3z+IXbgy^`luZz%
zQ+V$4fK$20<@y0rIEh|SeCIylaoB+H1GM8$PYb)*wY`e6F-(tSX<@ZE=HKFRC0|9E
zxR)qQW_LA>CEoH11Sc5D(7zgNN{uAwGY4_{C$E6I%?Uc<5a@jSK_n>rmdoE9!uoK;
zdH;Rb-mh>mnD*tXNbdB*kV1Qry}!faza7R!Q2KiFvd&Ixu0292CjSU^*T^L^w}zg9
z#Dsal$CS+bYN&@9ew-Gm=u{g{KKV~QmP<cIt~`7aF&uD$t`ddP&24W`drdy8bsoFG
zV8KU<eCal5>^TmhUj7C}oAGbcAfYcZqlY>C4sB4%Z{x!wPf|;>;9aUk94vyKruaRK
z5O|yW%{EHjr*jHfo^>6RwN_VtATw5YdzxQ;NS}z+9oc9p?B}%~(WjB5j%?WUv25^(
zI7a|)Jtt}IZ^mmX>gckPsK6U{nCkQRzPUnmbAcYYKo=Ak;C_7Ll57T<MWmX6{^<)k
zub>cFzt-Kj_NsEs*~|22K?44znA2a;CYOI)bQPEX<rR8gmKUASx0$6^>A!@CxMWYx
zyhbr*&^LlP)$Zj<*WpY|UlK>STF^jk&4}*=R?ucaiY#hvCVh`>l0~>{iow)Z0zh(!
ziyA1w{QL)e=d0u32y1j%1B`N3F6d>yA3RSX#YNxJRPLvBE(OC}-9g`B%CyGikn~oV
z<?x+Rx=x}Xkj?Wk7>K&aRb9)~u^LE3rLA_!789otVM~X|q9d(k#&6NO+m5%DnLrcd
zw&u-t`XUVZ41mNDFi3)PX(H-9FmyHE2en^u|3sbZaw3JFN^%l;@EXXu`|V<9EmeEL
zc4)B;%!n?!O#IS#n>f=VNu$>P7}|+$IQAxJ?<VUnZiZIt(Vq%5*GHfC&_Tf`u6HkU
zPfz`s_^8qUZB1Tp{iV`j)I00e34LUN*S(TJv-=p+F=k$0eB%vqx|b>L4=fy?tr9KY
zOvykEDp<PMViYU=#bB;^1Pwr~PtO+OAT9}9^N@akUk>P8R)5tV(=Dini`d&-!l0Mg
zAJT~gF4tXdWW?n(eIeo-TRAp15_snz!5XPWLVL42LtxmN=rJ!27Jmg@;vLA6fh*!J
z<iq!3Ey|x&8*?lhbV6g2=H9$2OSdp@<s$M<AU!>7UL2~GhVN~pt5)bJb0$xh%TeH0
z<W_&q$E_;!aI1_0y;<>3^U=^Dv*OIPk$R)s4cTaO#skp&qoZ|UQz$HYOmC5kq9<@^
zAq(5{;Q3H5@Fs>&)leKaEI}yl8mrNtd9B|}y9Z^TRTB%PT+%5~dIIdrR;|qHhjkgj
z6E6BJpwF71KZ|zR=`lIe^oA(*byl7E$}DttzEoE2akZb%M!uoPnfFtj#GlO8>rgNa
z2CKx@Ej`ZFc^btW<$Vz?=IZ$vgaXo!<#T;CwRcHgSfo$F;}9)*d(__09k?{gDd2wf
zD#4svsAmz{Q&;`XQ%m&}#U~f*9IhyU7K}Wt+nO-0PSPlQ%*4laYvNkyr!0N0QKqGm
z=7OUodI)<azzOvwx?F;6d+BS-fD7l_!Jg%~UBC)Nq(RPGAv5Vx98%1I75X2Fyv@Dh
zugMoQ6Mu=Ik>6IkN4fVZExoxVwr#Obxf6{&&Tw9~8X^#ER`tz?;rz?1bruOckI7r3
zuL%i|p-EiZ+3}mw4Z5S^XV>a%>;n_JbLD#MiCd>vOTd9Gi9OqNv^lU|W_%LVZtj{1
z8}wQc2v9P~U`?Ll(NE)iSG!Er(?S!soXKFc;%bI}0i;`Gd10B=teZ^cC~i}(b0S)5
z4UbTK^ckHkT56jj7#pQ{&Trs8pO*(ICs(42-u*Mx+Ct-DJ9K~Zz;^v7!Pjga(-n~<
zirlKzvwD*xt=QeXPRF@B>v!qp5wTC<(%pKaJS~u1#~~(b_gKufynMSy&r!CCMN_$*
znDzm<H()TjV2Kmiv$Ya?@Lt%hXLDYaL_N$`m+MEkz6ueI$e6YMY&BNe7Z>W495?1A
zWO-V(p2IDE3*#ukV3U1LHOpNO#g`8>QEfJFe;LjSN2mrXV|eEi=!@&~bw3JQzWr~a
z2`j;afMbJhPangdAH<nHOXpc!b_h@)$DUUX>jE@RJ~QffdM=XFz!`TEU#dZLt;~)%
zrdx^3f<4wyxxB}KdloPL11gbKTe#+rK-T93n3vYvGw`HXrz;oLs91v^6-v-|ziu%d
zJ&VH9*yDF{bqxvL$$a&?-YZeIk}fmcW;M0qch1o;uFq4ym!c4BzIqFB7Ps48&n_EK
z4yh{Yq6eTIcpGO}uct6FJ=zqWMwM!;WOio$8O$_Y;}3s?ho#B5ta}>odwLiiFxDNt
zh<AQ~5L$Ia5xnIxdq2cMZr5cXF$IdNey^wS;g7%xxAjVH0+1Q`_~yr!681%oC-*&y
z=beKU+Xqc-DtU<B{dJfQyDuJ)b~s0W3TJx_%Kk*fFPz6$Tk!*Ybf)V2<DI1!@XbCt
zE!~Iny%#07(&dHnD1Unq>UQ=562SI)p6j{?mt4~8BVCiQwD@zmK)@XPTpvUK9Fpgd
z{8W)>wtuPbX=>UU_jfnRf79=vVUBceV$yj3uE!|tOAqpYeyub3)eypV`iee8NOFUz
z$>ip8lC-2zocSGs@3{sEl3xi*|EcGh?%(MJno?5@MuW7-+>al|vGOJ#&ILD+DWIds
zhJkEsQK$kC*n!THO<y~BzjzHkq2cm{ZhlzaLb|Dnzjv@c;FbDPW<i<SD5nBH4cL;i
z+Qh~>ck1Yn^~UDCG=PP249c}MOItY~NDDpcGc}a!3+XNfk6W5EZ5$6WE1k2VoS!t6
ztS8Koc20LKxfdz3=yn3^eHKYwG(z3OrLCQ%tP`Mv(jtkDnK=p0Dis}cUovG~ouKL0
z*~unosQFn}=a`nRc|{9U!<*{mO2x?@C!zr<W|haeN<72kcnsg}WI)oSPqxj&w>=&7
z9CeiuR+zoLovk-FJk$C(c>7opNHMSVb&!APk8Mw28$C?Lm?!!>8<kE?2h|2TM|npj
YekD5Pb%t=;flfRRu7pB7?sNSA15YznMF0Q*

delta 5435
zcmdT|YjjoBwH|BEorGWlNq_($k`oXV0XeUnlQRMZq9HLvNF-2WD-aAwKp>z96fMLI
zRHQr<nkfhxh5AH@Ey=PDD6#iSs|ZLPEzpVq19VUn;<Z$5ecW%YeNG6Dj(dOIANS80
zXRW=~e9v!wdtdr<%ByWDjW=abFj(i!c+{Jrv^Rs+^pl#YG+z3Tp)6_H!d+zddn!?Q
zE@epkzf_7$i%>5a{Q~_^8bXvTb6=*h?!Uuxsk<y5L-}%~j)v%q5qez7hx@3f+#jKV
z(mqvnlax=$uO5=IH>w`8;!cj2#`jdb9GOUwYbMs*U%g;{<-O(0YNTvEd8G7+ijzGP
zX|fDiKt1HsVUUEqaF;2Si>fQDs_&M{N0dj_995a(nNK-Vs=2S+umDE=qKZ9Njvc9D
zU$@w$Azc#_6R%j{x3`iyDW56NRq=I+W9QY(Ty$UM{3<cmyLT+3_iG~5N2XM9fz<pA
z;js#1LgZi-=XB{<P5XnoO`7wlh;no4N797<J-$g&I)>8aq;mdkkTrtbmHux->sx^I
z*Gy4<*{}<F+j%3UO1ob<|4+ibFQ1C!XdCyI`8#=>%($6~R8Ue2RF<sV#l_O|7Q6A*
z2u_!l*Ljj0FdI2?+Qa?yjRho1g=MV5qWuKtE6FOt<6QY{RmaZTw?aehGt}F?zoeK7
zWn~G9!Ya%hPlXilid8UXI2XzEwW^mKA5SkMq?Nm%wtWQ3d%+~?BCkxKRNY)c?<?2j
zjwc#Vb`a$RC3^-9kZB*Payd|jLJE1MvVy*m<ViFRhFY^AYMFwKszLQLa(n5%lWDz@
z*Y2PcSx`Zj<i#ISflRG{jYoFS44HKYjg#$nBC(^3`A+Fw0m1%|hTxkO1#&v+%={4^
z1%oKwJgIpJSNBgvf6k3iq6QGWrsTw3a5v=bIG}N06H%^Lp7@F%mSdHs_(MkGE)}ss
zmYNdf=u0!G68_mZ0e8&S!kJXc^=+J4Uq?y${A_w&QP3;<k0U!RtAHyP=Frl3nSCF;
z8ZiTqV59Pvg~&!@Gkq)B_fcVI9rDrZs;Az1A8k@9B&lDK5uB)}ET$6*sW3S<8-k5~
z(%6U6WX#hrW7QIB`d$=%xy(et=eqRMpV)edRaBC6%R(mC|B{DF=|Pm;$mR5n(HE__
z&d;Ym2Jn0JLHd@$0r4%Nf%@=6)UGHuqFYwb$HZZ8j`_EZB!3n1>zDm2D6HZ9n?!-I
zd*#{3=)9twfEySjrH3@GC7<lOLnZ2@HS~g#wB77+t37iqEDwjI+e`do>+GkG177;q
zQJUWR67N;Adp$kfIcOR|Tdbt@3B)qj22H#U#mUw_G*}}(eU*4iRkpN0O1H=-8&OBK
zwLC|*Zi1eGSD)KN2aq+m@5ijDX+mps75voPqk7A&o2Xp&Vo4!iry5)S6z+z?ZgdMb
zTZ8ozn`wvAsUPuFB^$TmO2pf_D<jXCEnnxhY<(7a@!KYdw(hFuj8P#Y3sQz}r*V|y
zGwt)WEZkwswv!d!Ul=PQu|lrxDDuA}KL)+?G-CZZ$?VrCNvbR8?{fD}DsTc`U*{$r
z@ER5A_(qyS(y|*V3`*G<RD(&AE^VaSNnYIJcI8EB_!S~k(F7ntS7N5^K{VBah-PXN
zY(dw=g1AmDYn-z2t8S)o?DIzb*rm<N=k4Ukyf<*!7ZKlHw8*vs?xjz?K@%CRq_MS?
zT&x4c@1+5{`+i!i;=^8y#^tj9A3Q~$Y9VII4ePW2L1~PD)|ODFjQLOMt-D>K!Ai!k
zgUi3C)$I4d#6xtQ_Pj%Rqyi>ES$g?FG@P6+W{)0mh|Z~)zSb6s*Lg?iwCP6Gh6;tM
zIGul#S`By^WUQagUB!C{=ZZd{kCXvftGcT$`6JdG@P=K5Wyk2_Xb)$J6<l!wVki)h
zvQ`?ZXa2>kP=<E3@T3v;*<M(*pp`x`01w=ZUaUP$XN`W~e{|<(ZN}<ICmWwSOKlK`
zm>c+R2y&v{`d9jsv7j~;E<bsmeh%d}8vS+Q1@kCqCP0=R^(h|7^j!c3-0QBtyl8}n
z?LC>UI9@xS(O=<eOZ0?Xdzlh+pU+{kfk%XNkjB<I#W_BB7suDRCwyPfDPurs91oJx
zZ*b=aUztb-tX?bH-7fwY4$52O5K7M%)K%jw^qunXV13tj@JmilL||YFcFShQPR(OJ
zt<1DB4!VXej^kFvAz#>9p_eBx46sQbq-ztgprAEykbdkMoJ8J@ZF+4o!{d-Ot3I0(
z^p@^s!;aJ}-H^&pMH7AMGms3d<MdrUc%!1Q*9h?Fv|c!(d?p`R`rUNi+@W=KA4q~$
zy)c85O<`MwJ2Dx?;VN`3-`Ssom`Ty_r3{1-$=Q6;B-!4;&fn1Gb{IvS%^t*OOn7af
z*gOrro-Y{9D3rl^)DTA11YMi*hnm<S#~$$(VB}yHR4X}f6Bi-TD4A+mIs!ZZt!;}S
zQJ)&Y<H-%SbsFoz;;lnBJmBXvGFS&KgY@p8(PBN1l9g{m5E`wzSz(xH#sYe<zn&9;
z5eR|p!G(FoqU;aIqnC~{F~SJ2r+zxxoXT};bJbXGQylbqt(W@on<38$dVM*1Q2{G<
zdw63JZ&e~Cu-($7&BbtKj6z=2c&?B2lGY`RF`Mi5!`un{fTD=2Q?TkSo??}xC$y`Z
zl-yp%g>VW38BAgVr^&ieoFW_c(lye)7^%5f#=isani7lFA15LIrnP;=2<7p~xNVC(
zT|lpT>G4x|GfDd@Smadj*?1Q<TACm!X*#cuBY#9HyQ*~ARs}ly)=b7s2#899kRQzA
zLPIegoy9K$Ewuk0euQM-T%gdK&Gfl6&9Nz5cn@v^qAO+bT-?s}#fF5PylG-`sHbH(
zbxK~ChXauu-9C>qnF2lwD|+G*o}py@A|6NnXu2*hG8G$i(}e{*KK}ro=LEEG2_J}J
zWQ>GP{t1G<=xmH~CM<_tHi^-)__f)v^eVbB_d(Y)P{MSVm!>>~xB--Aqr<JiOCRDd
z6=<Is9kb;43NGpv@S8bcUXyAn7u_%2zu_u*awT8FJsSfIph<F}7P@j=D71`s!^7}7
z2dJ<dqwAJBI1viT(Zf7Y@2=yq1Ve32raZ!zQ4|RMTBORG=8RS{Yc(i(%2#x)Ozi0d
zbjl{~sU&3$8|s5g{mgc}Ub==K1vcezrn`QB9bA#w>u?Mm*npS7(w<J7#`aoZW=KQ9
zJ?OtD@Z3(Cs2KO!;*Hq0CSA3C-OsTdv3#OK$v7o{s5kC-uhxS7+NWUn(c6_ZJl?3r
zrgsa1?$4F)zUD%W7wBPRS}1CCw{6^@>KkywHTD_CTsZeUiu}|T&eeMwc%_A6+h*nR
z?DO!^QhJ-waw*#m;fS7X<2SbRy~?sh5W8nd4!mee%crqAYpN<nK1*cUt9XJzcyvE{
zCuJvu+E*Q06zdFT-3vkk<58AT!dfC3yX;2n6{%bf?y|-JlhQSM?h(+&#;XdhTxPru
zJwQ-fZ~%%eraotbG`Q!#{1wjoT^-Z+@RRr-6F*s|HbI{S)-3U~0sr4=;$q{5nV=mz
z4#~(j5p|$iwr)Sn2_&!V<-$&|n!1mZ0IT1DYQloavU)${Mmj0VYvF<@xJIM;Nej#d
zkGwM24}HMTE4lnzlgjYb9NX=5L8tf9cYeorE9v<*0u#J)+kLj-ZEo(MS?080Cs8+C
z@A#E8zk@6G4Kqt$`z{;yA5H4;_ps_@Z@D~nm<u=u_-x5ZEHq5=#rqKAyE;DDp7jB&
z2DsT8fg^ZNFjU-(2dF}YTJF~VXTC*N978BACHnr8bti20q0*uczT|+LT$yZhl=L}?
zu;<siVJ??<PqJa8mS_K1$%0m-+MQX^<d>i3BD~i{D?8z1*dCA+KUK>c9|Jl}bpkD<
z@dEdeOXoRG^4oa5VJy)bBhPSQQpgv>rs`QTc8Th(UpRw~qHxe<x+^1;AS(vo=b3Zh
zS<BAxFqc(<R3^#pi<}{z&pAzdF3|%@=A1YAwe-qX*Z}i|YnjaZ8-EB|>zCUu@+iIf
z0{@oK&>E{s+shtPjp_PKyG5Fyl>dY0>(l?m3mI>88ml};0$*>YTp7L;ABRSrRQb~5
zpJpaREG(GsYJFwIFqI%FJ*lrg`A?pP+2(Wc)y|lvuW{U$tAQdI+=1Z#Sc9)1!@03>
zG*wEI9iM(*IrkHV>^qBj@hH)U9Onj(&kb6ZuacdcY(WYNGFgxA;v6$o_nYJDRz1C|
zQ%)QNug3t}=C)o%vI90?+tW_mk>cI1`by1ha1GzxGGu<DQz^eobxbFKqxF;4-p+vL
zO*{~_(8DQ=54mp_ccnW)-QL3~APR?dINf=RQQLu-@!y-J2bJVyIUZe{34RRimi+xF
z%Na#3m9@NS{y--|@6UGdtz%^>h6>hOP!Z9RzhRJ*XW<|^@anF2z|sNchSTZD5NETJ
iW5b-(P9GD-4|NPoA%S1ZhGF<0bsKOpK}HRC{QnK%FcJv>

diff --git a/internal/php7/php7.y b/internal/php7/php7.y
index 6002670..c65b0f9 100644
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -2139,12 +2139,27 @@ parameter:
         optional_type is_reference is_variadic T_VARIABLE
             {
                 identifier := &ast.Identifier{ast.Node{}, $4.Value}
-                variable := &ast.ExprVariable{ast.Node{}, identifier}
-                $$ = &ast.Parameter{ast.Node{}, $2 != nil, $3 != nil, $1, variable, nil}
-
-                // save position
                 identifier.GetNode().Position = position.NewTokenPosition($4)
+
+                var variable ast.Vertex
+                variable = &ast.ExprVariable{ast.Node{}, identifier}
                 variable.GetNode().Position = position.NewTokenPosition($4)
+                yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Tokens)
+
+                if $3 != nil {
+                    variable = &ast.Variadic{ast.Node{}, variable}
+                    variable.GetNode().Position = position.NewTokensPosition($3, $4)
+                    yylex.(*Parser).setFreeFloating(variable, token.Start, $3.Tokens)
+                }
+
+                if $2 != nil {
+                    variable = &ast.Reference{ast.Node{}, variable}
+                    variable.GetNode().Position = position.NewTokensPosition($2, $4)
+                    yylex.(*Parser).setFreeFloating(variable, token.Start, $2.Tokens)
+                }
+
+                $$ = &ast.Parameter{ast.Node{}, $1, variable, nil}
+
                 if $1 != nil {
                     $$.GetNode().Position = position.NewNodeTokenPosition($1, $4)
                 } else if $2 != nil {
@@ -2155,41 +2170,33 @@ parameter:
                     $$.GetNode().Position = position.NewTokenPosition($4)
                 }
 
-                // save comments
-                if $1 != nil {
-                    yylex.(*Parser).MoveFreeFloating($1, $$)
-                }
-                if $2 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Tokens)
-                }
-                if $3 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens)
-                }
-                yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Tokens)
-
-
-                // normalize
-                if $3 == nil {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.Ampersand, $$.GetNode().Tokens[token.Variadic]); delete($$.GetNode().Tokens, token.Variadic)
-                }
-                if $2 == nil {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.OptionalType, $$.GetNode().Tokens[token.Ampersand]); delete($$.GetNode().Tokens, token.Ampersand)
-                }
-                if $1 == nil {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $$.GetNode().Tokens[token.OptionalType]); delete($$.GetNode().Tokens, token.OptionalType)
-                }
-
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
     |   optional_type is_reference is_variadic T_VARIABLE '=' expr
             {
                 identifier := &ast.Identifier{ast.Node{}, $4.Value}
-                variable := &ast.ExprVariable{ast.Node{}, identifier}
-                $$ = &ast.Parameter{ast.Node{}, $2 != nil, $3 != nil, $1, variable, $6}
-
-                // save position
                 identifier.GetNode().Position = position.NewTokenPosition($4)
+
+                var variable ast.Vertex
+                variable = &ast.ExprVariable{ast.Node{}, identifier}
                 variable.GetNode().Position = position.NewTokenPosition($4)
+                yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(variable, token.End, $5.Tokens)
+
+                if $3 != nil {
+                    variable = &ast.Variadic{ast.Node{}, variable}
+                    variable.GetNode().Position = position.NewTokensPosition($3, $4)
+                    yylex.(*Parser).setFreeFloating(variable, token.Start, $3.Tokens)
+                }
+
+                if $2 != nil {
+                    variable = &ast.Reference{ast.Node{}, variable}
+                    variable.GetNode().Position = position.NewTokensPosition($2, $4)
+                    yylex.(*Parser).setFreeFloating(variable, token.Start, $2.Tokens)
+                }
+
+                $$ = &ast.Parameter{ast.Node{}, $1, variable, $6}
+
                 if $1 != nil {
                     $$.GetNode().Position = position.NewNodesPosition($1, $6)
                 } else if $2 != nil {
@@ -2200,31 +2207,6 @@ parameter:
                     $$.GetNode().Position = position.NewTokenNodePosition($4, $6)
                 }
 
-                // save comments
-                if $1 != nil {
-                    yylex.(*Parser).MoveFreeFloating($1, $$)
-                }
-                if $2 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Tokens)
-                }
-                if $3 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens)
-                }
-                yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $5.Tokens)
-
-
-                // normalize
-                if $3 == nil {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.Ampersand, $$.GetNode().Tokens[token.Variadic]); delete($$.GetNode().Tokens, token.Variadic)
-                }
-                if $2 == nil {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.OptionalType, $$.GetNode().Tokens[token.Ampersand]); delete($$.GetNode().Tokens, token.Ampersand)
-                }
-                if $1 == nil {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $$.GetNode().Tokens[token.OptionalType]); delete($$.GetNode().Tokens, token.OptionalType)
-                }
-
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
 ;
diff --git a/internal/php7/php7_test.go b/internal/php7/php7_test.go
index 6d214a7..88589ee 100644
--- a/internal/php7/php7_test.go
+++ b/internal/php7/php7_test.go
@@ -1,6 +1,7 @@
 package php7_test
 
 import (
+	"io/ioutil"
 	"testing"
 
 	"gotest.tools/assert"
@@ -13,365 +14,16 @@ import (
 )
 
 func TestPhp7(t *testing.T) {
-	src := `<?
-		foo($a, ...$b);
-		$foo($a, ...$b);
-		$foo->bar($a, ...$b);
-		foo::bar($a, ...$b);
-		$foo::bar($a, ...$b);
-		new foo($a, ...$b);
-		/** anonymous class */
-		new class ($a, ...$b) {};
-		new class {};
-		new $foo;
-		new $foo[1];
-		new $foo{$bar};
-		new $foo->bar;
-		new $foo::$bar;
-		new static::$bar;
-
-		function foo(?bar $bar=null, baz &...$baz) {}
-		class foo {public function foo(?bar $bar=null, baz &...$baz) {}}
-		function(?bar $bar=null, baz &...$baz) {};
-		static function(?bar $bar=null, baz &...$baz) {};
-
-		1234567890123456789;
-		12345678901234567890;
-		0.;
-		0b0111111111111111111111111111111111111111111111111111111111111111;
-		0b1111111111111111111111111111111111111111111111111111111111111111;
-		0x007111111111111111;
-		0x8111111111111111;
-		__CLASS__;
-		__DIR__;
-		__FILE__;
-		__FUNCTION__;
-		__LINE__;
-		__NAMESPACE__;
-		__METHOD__;
-		__TRAIT__;
-
-		"test $var";
-		"test $var[1]";
-		"test $var[-1]";
-		"test $var[1234567890123456789012345678901234567890]";
-		"test $var[-1234567890123456789012345678901234567890]";
-		"test $var[bar]";
-		"test $var[$bar]";
-		"$foo $bar";
-		"test $foo->bar()";
-		"test ${foo}";
-		"test ${foo[0]}";
-		"test ${$foo}";
-		"test {$foo->bar()}";
-
-		if ($a) :
-		endif;
-		if ($a) :
-		elseif ($b):
-		endif;
-		if ($a) :
-		else:
-		endif;
-		if ($a) :
-		elseif ($b):
-		elseif ($c):
-		else:
-		endif;
-
-		while (1) { break; }
-		while (1) { break 2; }
-		while (1) : break(3); endwhile;
-		class foo{ public const FOO = 1, BAR = 2; }
-		class foo{ const FOO = 1, BAR = 2; }
-		class foo{ function bar() {} }
-		class foo{ public static function &bar() {} }
-		class foo{ public static function &bar(): void {} }
-		abstract class foo{ }
-		final class foo extends bar { }
-		final class foo implements bar { }
-		final class foo implements bar, baz { }
-		new class() extends foo implements bar, baz { };
-
-		const FOO = 1, BAR = 2;
-		while (1) { continue; }
-		while (1) { continue 2; }
-		while (1) { continue(3); }
-		declare(ticks=1);
-		declare(ticks=1) {}
-		declare(ticks=1): enddeclare;
-		do {} while(1);
-		echo $a, 1;
-		echo($a);
-		for($i = 0; $i < 10; $i++, $i++) {}
-		for(; $i < 10; $i++, $i++) : endfor;
-		foreach ($a as $v) {}
-		foreach ($a as $v) : endforeach;
-		foreach ($a as $k => $v) {}
-		foreach ($a as $k => &$v) {}
-		foreach ($a as $k => list($v)) {}
-		foreach ($a as $k => [$v]) {}
-		function foo() {}
-		function foo() {return;}
-		function &foo() {return 1;}
-		function &foo(): void {}
-		global $a, $b;
-		a: 
-		goto a;
-		if ($a) {}
-		if ($a) {} elseif ($b) {}
-		if ($a) {} else {}
-		if ($a) {} elseif ($b) {} elseif ($c) {} else {}
-		if ($a) {} elseif ($b) {} else if ($c) {} else {}
-		?> <div></div> <?
-		interface Foo {}
-		interface Foo extends Bar {}
-		interface Foo extends Bar, Baz {}
-		namespace Foo;
-		namespace Foo {}
-		namespace {}
-		class foo {var $a;}
-		class foo {public static $a, $b = 1;}
-		static $a, $b = 1;
-
-		switch (1) :
-			case 1:
-			default:
-			case 2:
-		endswitch;
-
-		switch (1) :;
-			case 1;
-			case 2;
-		endswitch;
-		
-		switch (1) {
-			case 1: break;
-			case 2: break;
-		}
-		
-		switch (1) {;
-			case 1; break;
-			case 2; break;
-		}
-
-		throw $e;
-
-		trait Foo {}
-		class Foo { use Bar; }
-		class Foo { use Bar, Baz {} }
-		class Foo { use Bar, Baz { one as include; } }
-		class Foo { use Bar, Baz { one as public; } }
-		class Foo { use Bar, Baz { one as public two; } }
-		class Foo { use Bar, Baz { Bar::one insteadof Baz, Quux; Baz::one as two; } }
-
-		try {}
-		try {} catch (Exception $e) {}
-		try {} catch (Exception|RuntimeException $e) {}
-		try {} catch (Exception $e) {} catch (RuntimeException $e) {}
-		try {} catch (Exception $e) {} finally {}
-
-		unset($a, $b,);
-
-		use Foo;
-		use \Foo;
-		use \Foo as Bar;
-		use Foo, Bar;
-		use Foo, Bar as Baz;
-		use function Foo, \Bar;
-		use function Foo as foo, \Bar as bar;
-		use const Foo, \Bar;
-		use const Foo as foo, \Bar as bar;
-
-		use \Foo\{Bar, Baz};
-		use Foo\{Bar, Baz as quux};
-		use function Foo\{Bar, Baz};
-		use const \Foo\{Bar, Baz};
-		use Foo\{const Bar, function Baz};
-
-		$a[1];
-		$a[1][2];
-		array();
-		array(1);
-		array(1=>1, &$b,);
-		~$a;
-		!$a;
-
-		Foo::Bar;
-		$foo::Bar;
-		clone($a);
-		clone $a;
-		function(){};
-		function($a, $b) use ($c, &$d) {};
-		function(): void {};
-		foo;
-		namespace\foo;
-		\foo;
-
-		empty($a);
-		@$a;
-		eval($a);
-		exit;
-		exit($a);
-		die;
-		die($a);
-		foo();
-		namespace\foo();
-		\foo();
-		$foo();
-
-		$a--;
-		$a++;
-		--$a;
-		++$a;
-
-		include $a;
-		include_once $a;
-		require $a;
-		require_once $a;
-
-		$a instanceof Foo;
-		$a instanceof namespace\Foo;
-		$a instanceof \Foo;
-
-		isset($a, $b);
-		list($a) = $b;
-		list($a[]) = $b;
-		list(list($a)) = $b;
-
-		$a->foo();
-		new Foo();
-		new namespace\Foo();
-		new \Foo();
-		new class ($a, ...$b) {};
-		print($a);
-		$a->foo;
-		` + "`cmd $a`;" + `
-		` + "`cmd`;" + `
-		` + "``;" + `
-		[];
-		[1];
-		[1=>1, &$b,];
-
-		[$a] = $b;
-		[$a[]] = $b;
-		[list($a)] = $b;
-		Foo::bar();
-		namespace\Foo::bar();
-		\Foo::bar();
-		Foo::$bar;
-		$foo::$bar;
-		namespace\Foo::$bar;
-		\Foo::$bar;
-		$a ? $b : $c;
-		$a ? : $c;
-		$a ? $b ? $c : $d : $e;
-		$a ? $b : $c ? $d : $e;
-		-$a;
-		+$a;
-		$$a;
-		yield;
-		yield $a;
-		yield $a => $b;
-		yield from $a;
-		
-		(array)$a;
-		(boolean)$a;
-		(bool)$a;
-		(double)$a;
-		(float)$a;
-		(integer)$a;
-		(int)$a;
-		(object)$a;
-		(string)$a;
-		(unset)$a;
-
-		$a & $b;
-		$a | $b;
-		$a ^ $b;
-		$a && $b;
-		$a || $b;
-		$a ?? $b;
-		$a . $b;
-		$a / $b;
-		$a == $b;
-		$a >= $b;
-		$a > $b;
-		$a === $b;
-		$a and $b;
-		$a or $b;
-		$a xor $b;
-		$a - $b;
-		$a % $b;
-		$a * $b;
-		$a != $b;
-		$a !== $b;
-		$a + $b;
-		$a ** $b;
-		$a << $b;
-		$a >> $b;
-		$a <= $b;
-		$a < $b;
-		$a <=> $b;
-
-		$a =& $b;
-		$a = $b;
-		$a &= $b;
-		$a |= $b;
-		$a ^= $b;
-		$a .= $b;
-		$a /= $b;
-		$a -= $b;
-		$a %= $b;
-		$a *= $b;
-		$a += $b;
-		$a **= $b;
-		$a <<= $b;
-		$a >>= $b;
-
-		class foo {public function class() {} }
-		\foo\bar();
-
-		function foo(&$a, ...$b) {
-			                  
-			function bar() {}
-			class Baz {}
-			trait Quux{}
-			interface Quuux {}
-		}
-		
-		function foo(&$a = 1, ...$b = 1, $c = 1) {}
-		function foo(array $a, callable $b) {}
-		abstract final class foo { abstract protected static function bar(); final private function baz() {} }
-
-		(new Foo)->bar;
-		(new Foo)();
-		[$foo][0]();
-		foo[1]();
-		"foo"();
-		[1]{$foo}();
-		${foo()};
-
-		Foo::$bar();
-		Foo::{$bar[0]}();
-		
-		$foo->$bar;
-		$foo->{$bar[0]};
-
-		[1=>&$a, 2=>list($b)];
-
-		__halt_compiler();
-
-		parsing process must be terminated
-	`
+	src, err := ioutil.ReadFile("test.php")
+	assert.NilError(t, err)
 
 	expected := &ast.Root{
 		Node: ast.Node{
 			Position: &position.Position{
 				StartLine: 2,
 				EndLine:   348,
-				StartPos:  5,
-				EndPos:    6319,
+				StartPos:  3,
+				EndPos:    5706,
 			},
 		},
 		Stmts: []ast.Vertex{
@@ -380,8 +32,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 2,
 						EndLine:   2,
-						StartPos:  5,
-						EndPos:    20,
+						StartPos:  3,
+						EndPos:    18,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -389,8 +41,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
-							StartPos:  5,
-							EndPos:    19,
+							StartPos:  3,
+							EndPos:    17,
 						},
 					},
 					Function: &ast.NameName{
@@ -398,8 +50,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
-								StartPos:  5,
-								EndPos:    8,
+								StartPos:  3,
+								EndPos:    6,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -408,8 +60,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  5,
-										EndPos:    8,
+										StartPos:  3,
+										EndPos:    6,
 									},
 								},
 								Value: []byte("foo"),
@@ -421,8 +73,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
-								StartPos:  8,
-								EndPos:    19,
+								StartPos:  6,
+								EndPos:    17,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -431,19 +83,17 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  9,
-										EndPos:    11,
+										StartPos:  7,
+										EndPos:    9,
 									},
 								},
-								Variadic:    false,
-								IsReference: false,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 2,
 											EndLine:   2,
-											StartPos:  9,
-											EndPos:    11,
+											StartPos:  7,
+											EndPos:    9,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -451,8 +101,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
-												StartPos:  9,
-												EndPos:    11,
+												StartPos:  7,
+												EndPos:    9,
 											},
 										},
 										Value: []byte("$a"),
@@ -464,19 +114,18 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  13,
-										EndPos:    18,
+										StartPos:  11,
+										EndPos:    16,
 									},
 								},
-								Variadic:    true,
-								IsReference: false,
+								Variadic: true,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 2,
 											EndLine:   2,
-											StartPos:  16,
-											EndPos:    18,
+											StartPos:  14,
+											EndPos:    16,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -484,8 +133,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
-												StartPos:  16,
-												EndPos:    18,
+												StartPos:  14,
+												EndPos:    16,
 											},
 										},
 										Value: []byte("$b"),
@@ -501,8 +150,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 3,
 						EndLine:   3,
-						StartPos:  23,
-						EndPos:    39,
+						StartPos:  19,
+						EndPos:    35,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -510,8 +159,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 3,
 							EndLine:   3,
-							StartPos:  23,
-							EndPos:    38,
+							StartPos:  19,
+							EndPos:    34,
 						},
 					},
 					Function: &ast.ExprVariable{
@@ -519,8 +168,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 3,
 								EndLine:   3,
-								StartPos:  23,
-								EndPos:    27,
+								StartPos:  19,
+								EndPos:    23,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -528,8 +177,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  23,
-									EndPos:    27,
+									StartPos:  19,
+									EndPos:    23,
 								},
 							},
 							Value: []byte("$foo"),
@@ -540,8 +189,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 3,
 								EndLine:   3,
-								StartPos:  27,
-								EndPos:    38,
+								StartPos:  23,
+								EndPos:    34,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -550,19 +199,17 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  28,
-										EndPos:    30,
+										StartPos:  24,
+										EndPos:    26,
 									},
 								},
-								Variadic:    false,
-								IsReference: false,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  28,
-											EndPos:    30,
+											StartPos:  24,
+											EndPos:    26,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -570,8 +217,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
-												StartPos:  28,
-												EndPos:    30,
+												StartPos:  24,
+												EndPos:    26,
 											},
 										},
 										Value: []byte("$a"),
@@ -583,19 +230,18 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  32,
-										EndPos:    37,
+										StartPos:  28,
+										EndPos:    33,
 									},
 								},
-								Variadic:    true,
-								IsReference: false,
+								Variadic: true,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  35,
-											EndPos:    37,
+											StartPos:  31,
+											EndPos:    33,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -603,8 +249,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
-												StartPos:  35,
-												EndPos:    37,
+												StartPos:  31,
+												EndPos:    33,
 											},
 										},
 										Value: []byte("$b"),
@@ -620,8 +266,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 4,
 						EndLine:   4,
-						StartPos:  42,
-						EndPos:    63,
+						StartPos:  36,
+						EndPos:    57,
 					},
 				},
 				Expr: &ast.ExprMethodCall{
@@ -629,8 +275,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 4,
 							EndLine:   4,
-							StartPos:  42,
-							EndPos:    62,
+							StartPos:  36,
+							EndPos:    56,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -638,8 +284,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 4,
 								EndLine:   4,
-								StartPos:  42,
-								EndPos:    46,
+								StartPos:  36,
+								EndPos:    40,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -647,8 +293,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
-									StartPos:  42,
-									EndPos:    46,
+									StartPos:  36,
+									EndPos:    40,
 								},
 							},
 							Value: []byte("$foo"),
@@ -659,8 +305,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 4,
 								EndLine:   4,
-								StartPos:  48,
-								EndPos:    51,
+								StartPos:  42,
+								EndPos:    45,
 							},
 						},
 						Value: []byte("bar"),
@@ -670,8 +316,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 4,
 								EndLine:   4,
-								StartPos:  51,
-								EndPos:    62,
+								StartPos:  45,
+								EndPos:    56,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -680,19 +326,17 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  52,
-										EndPos:    54,
+										StartPos:  46,
+										EndPos:    48,
 									},
 								},
-								IsReference: false,
-								Variadic:    false,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  52,
-											EndPos:    54,
+											StartPos:  46,
+											EndPos:    48,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -700,8 +344,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 4,
 												EndLine:   4,
-												StartPos:  52,
-												EndPos:    54,
+												StartPos:  46,
+												EndPos:    48,
 											},
 										},
 										Value: []byte("$a"),
@@ -713,19 +357,18 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  56,
-										EndPos:    61,
+										StartPos:  50,
+										EndPos:    55,
 									},
 								},
-								Variadic:    true,
-								IsReference: false,
+								Variadic: true,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  59,
-											EndPos:    61,
+											StartPos:  53,
+											EndPos:    55,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -733,8 +376,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 4,
 												EndLine:   4,
-												StartPos:  59,
-												EndPos:    61,
+												StartPos:  53,
+												EndPos:    55,
 											},
 										},
 										Value: []byte("$b"),
@@ -750,8 +393,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 5,
 						EndLine:   5,
-						StartPos:  66,
-						EndPos:    86,
+						StartPos:  58,
+						EndPos:    78,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -759,8 +402,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 5,
 							EndLine:   5,
-							StartPos:  66,
-							EndPos:    85,
+							StartPos:  58,
+							EndPos:    77,
 						},
 					},
 					Class: &ast.NameName{
@@ -768,8 +411,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 5,
 								EndLine:   5,
-								StartPos:  66,
-								EndPos:    69,
+								StartPos:  58,
+								EndPos:    61,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -778,8 +421,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  66,
-										EndPos:    69,
+										StartPos:  58,
+										EndPos:    61,
 									},
 								},
 								Value: []byte("foo"),
@@ -791,8 +434,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 5,
 								EndLine:   5,
-								StartPos:  71,
-								EndPos:    74,
+								StartPos:  63,
+								EndPos:    66,
 							},
 						},
 						Value: []byte("bar"),
@@ -802,8 +445,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 5,
 								EndLine:   5,
-								StartPos:  74,
-								EndPos:    85,
+								StartPos:  66,
+								EndPos:    77,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -812,19 +455,17 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  75,
-										EndPos:    77,
+										StartPos:  67,
+										EndPos:    69,
 									},
 								},
-								Variadic:    false,
-								IsReference: false,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  75,
-											EndPos:    77,
+											StartPos:  67,
+											EndPos:    69,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -832,8 +473,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 5,
 												EndLine:   5,
-												StartPos:  75,
-												EndPos:    77,
+												StartPos:  67,
+												EndPos:    69,
 											},
 										},
 										Value: []byte("$a"),
@@ -845,19 +486,18 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  79,
-										EndPos:    84,
+										StartPos:  71,
+										EndPos:    76,
 									},
 								},
-								Variadic:    true,
-								IsReference: false,
+								Variadic: true,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  82,
-											EndPos:    84,
+											StartPos:  74,
+											EndPos:    76,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -865,8 +505,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 5,
 												EndLine:   5,
-												StartPos:  82,
-												EndPos:    84,
+												StartPos:  74,
+												EndPos:    76,
 											},
 										},
 										Value: []byte("$b"),
@@ -882,8 +522,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 6,
 						EndLine:   6,
-						StartPos:  89,
-						EndPos:    110,
+						StartPos:  79,
+						EndPos:    100,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -891,8 +531,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 6,
 							EndLine:   6,
-							StartPos:  89,
-							EndPos:    109,
+							StartPos:  79,
+							EndPos:    99,
 						},
 					},
 					Class: &ast.ExprVariable{
@@ -900,8 +540,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 6,
 								EndLine:   6,
-								StartPos:  89,
-								EndPos:    93,
+								StartPos:  79,
+								EndPos:    83,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -909,8 +549,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 6,
 									EndLine:   6,
-									StartPos:  89,
-									EndPos:    93,
+									StartPos:  79,
+									EndPos:    83,
 								},
 							},
 							Value: []byte("$foo"),
@@ -921,8 +561,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 6,
 								EndLine:   6,
-								StartPos:  95,
-								EndPos:    98,
+								StartPos:  85,
+								EndPos:    88,
 							},
 						},
 						Value: []byte("bar"),
@@ -932,8 +572,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 6,
 								EndLine:   6,
-								StartPos:  98,
-								EndPos:    109,
+								StartPos:  88,
+								EndPos:    99,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -942,19 +582,17 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 6,
 										EndLine:   6,
-										StartPos:  99,
-										EndPos:    101,
+										StartPos:  89,
+										EndPos:    91,
 									},
 								},
-								Variadic:    false,
-								IsReference: false,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 6,
 											EndLine:   6,
-											StartPos:  99,
-											EndPos:    101,
+											StartPos:  89,
+											EndPos:    91,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -962,8 +600,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 6,
 												EndLine:   6,
-												StartPos:  99,
-												EndPos:    101,
+												StartPos:  89,
+												EndPos:    91,
 											},
 										},
 										Value: []byte("$a"),
@@ -975,19 +613,18 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 6,
 										EndLine:   6,
-										StartPos:  103,
-										EndPos:    108,
+										StartPos:  93,
+										EndPos:    98,
 									},
 								},
-								Variadic:    true,
-								IsReference: false,
+								Variadic: true,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 6,
 											EndLine:   6,
-											StartPos:  106,
-											EndPos:    108,
+											StartPos:  96,
+											EndPos:    98,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -995,8 +632,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 6,
 												EndLine:   6,
-												StartPos:  106,
-												EndPos:    108,
+												StartPos:  96,
+												EndPos:    98,
 											},
 										},
 										Value: []byte("$b"),
@@ -1012,8 +649,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 7,
 						EndLine:   7,
-						StartPos:  113,
-						EndPos:    132,
+						StartPos:  101,
+						EndPos:    120,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -1021,8 +658,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 7,
 							EndLine:   7,
-							StartPos:  113,
-							EndPos:    131,
+							StartPos:  101,
+							EndPos:    119,
 						},
 					},
 					Class: &ast.NameName{
@@ -1030,8 +667,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 7,
 								EndLine:   7,
-								StartPos:  117,
-								EndPos:    120,
+								StartPos:  105,
+								EndPos:    108,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -1040,8 +677,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 7,
 										EndLine:   7,
-										StartPos:  117,
-										EndPos:    120,
+										StartPos:  105,
+										EndPos:    108,
 									},
 								},
 								Value: []byte("foo"),
@@ -1053,8 +690,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 7,
 								EndLine:   7,
-								StartPos:  120,
-								EndPos:    131,
+								StartPos:  108,
+								EndPos:    119,
 							},
 						},
 						Arguments: []ast.Vertex{
@@ -1063,19 +700,17 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 7,
 										EndLine:   7,
-										StartPos:  121,
-										EndPos:    123,
+										StartPos:  109,
+										EndPos:    111,
 									},
 								},
-								Variadic:    false,
-								IsReference: false,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 7,
 											EndLine:   7,
-											StartPos:  121,
-											EndPos:    123,
+											StartPos:  109,
+											EndPos:    111,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -1083,8 +718,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 7,
 												EndLine:   7,
-												StartPos:  121,
-												EndPos:    123,
+												StartPos:  109,
+												EndPos:    111,
 											},
 										},
 										Value: []byte("$a"),
@@ -1096,19 +731,18 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 7,
 										EndLine:   7,
-										StartPos:  125,
-										EndPos:    130,
+										StartPos:  113,
+										EndPos:    118,
 									},
 								},
-								Variadic:    true,
-								IsReference: false,
+								Variadic: true,
 								Expr: &ast.ExprVariable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 7,
 											EndLine:   7,
-											StartPos:  128,
-											EndPos:    130,
+											StartPos:  116,
+											EndPos:    118,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -1116,8 +750,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 7,
 												EndLine:   7,
-												StartPos:  128,
-												EndPos:    130,
+												StartPos:  116,
+												EndPos:    118,
 											},
 										},
 										Value: []byte("$b"),
@@ -1133,8 +767,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 9,
 						EndLine:   9,
-						StartPos:  160,
-						EndPos:    185,
+						StartPos:  144,
+						EndPos:    169,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -1142,8 +776,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 9,
 							EndLine:   9,
-							StartPos:  160,
-							EndPos:    184,
+							StartPos:  144,
+							EndPos:    168,
 						},
 					},
 					Class: &ast.StmtClass{
@@ -1151,8 +785,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 9,
 								EndLine:   9,
-								StartPos:  164,
-								EndPos:    184,
+								StartPos:  148,
+								EndPos:    168,
 							},
 						},
 						ArgumentList: &ast.ArgumentList{
@@ -1160,8 +794,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 9,
 									EndLine:   9,
-									StartPos:  170,
-									EndPos:    181,
+									StartPos:  154,
+									EndPos:    165,
 								},
 							},
 							Arguments: []ast.Vertex{
@@ -1170,19 +804,17 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 9,
 											EndLine:   9,
-											StartPos:  171,
-											EndPos:    173,
+											StartPos:  155,
+											EndPos:    157,
 										},
 									},
-									Variadic:    false,
-									IsReference: false,
 									Expr: &ast.ExprVariable{
 										Node: ast.Node{
 											Position: &position.Position{
 												StartLine: 9,
 												EndLine:   9,
-												StartPos:  171,
-												EndPos:    173,
+												StartPos:  155,
+												EndPos:    157,
 											},
 										},
 										VarName: &ast.Identifier{
@@ -1190,8 +822,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 9,
 													EndLine:   9,
-													StartPos:  171,
-													EndPos:    173,
+													StartPos:  155,
+													EndPos:    157,
 												},
 											},
 											Value: []byte("$a"),
@@ -1203,19 +835,18 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 9,
 											EndLine:   9,
-											StartPos:  175,
-											EndPos:    180,
+											StartPos:  159,
+											EndPos:    164,
 										},
 									},
-									Variadic:    true,
-									IsReference: false,
+									Variadic: true,
 									Expr: &ast.ExprVariable{
 										Node: ast.Node{
 											Position: &position.Position{
 												StartLine: 9,
 												EndLine:   9,
-												StartPos:  178,
-												EndPos:    180,
+												StartPos:  162,
+												EndPos:    164,
 											},
 										},
 										VarName: &ast.Identifier{
@@ -1223,8 +854,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 9,
 													EndLine:   9,
-													StartPos:  178,
-													EndPos:    180,
+													StartPos:  162,
+													EndPos:    164,
 												},
 											},
 											Value: []byte("$b"),
@@ -1242,8 +873,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 10,
 						EndLine:   10,
-						StartPos:  188,
-						EndPos:    201,
+						StartPos:  170,
+						EndPos:    183,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -1251,8 +882,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 10,
 							EndLine:   10,
-							StartPos:  188,
-							EndPos:    200,
+							StartPos:  170,
+							EndPos:    182,
 						},
 					},
 					Class: &ast.StmtClass{
@@ -1260,8 +891,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 10,
 								EndLine:   10,
-								StartPos:  192,
-								EndPos:    200,
+								StartPos:  174,
+								EndPos:    182,
 							},
 						},
 						Stmts: []ast.Vertex{},
@@ -1273,8 +904,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 11,
 						EndLine:   11,
-						StartPos:  204,
-						EndPos:    213,
+						StartPos:  184,
+						EndPos:    193,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -1282,8 +913,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 11,
 							EndLine:   11,
-							StartPos:  204,
-							EndPos:    212,
+							StartPos:  184,
+							EndPos:    192,
 						},
 					},
 					Class: &ast.ExprVariable{
@@ -1291,8 +922,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 11,
 								EndLine:   11,
-								StartPos:  208,
-								EndPos:    212,
+								StartPos:  188,
+								EndPos:    192,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -1300,8 +931,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 11,
 									EndLine:   11,
-									StartPos:  208,
-									EndPos:    212,
+									StartPos:  188,
+									EndPos:    192,
 								},
 							},
 							Value: []byte("$foo"),
@@ -1314,8 +945,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 12,
 						EndLine:   12,
-						StartPos:  216,
-						EndPos:    228,
+						StartPos:  194,
+						EndPos:    206,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -1323,8 +954,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 12,
 							EndLine:   12,
-							StartPos:  216,
-							EndPos:    227,
+							StartPos:  194,
+							EndPos:    205,
 						},
 					},
 					Class: &ast.ExprArrayDimFetch{
@@ -1332,8 +963,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 12,
 								EndLine:   12,
-								StartPos:  220,
-								EndPos:    227,
+								StartPos:  198,
+								EndPos:    205,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -1341,8 +972,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 12,
 									EndLine:   12,
-									StartPos:  220,
-									EndPos:    224,
+									StartPos:  198,
+									EndPos:    202,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -1350,8 +981,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 12,
 										EndLine:   12,
-										StartPos:  220,
-										EndPos:    224,
+										StartPos:  198,
+										EndPos:    202,
 									},
 								},
 								Value: []byte("$foo"),
@@ -1362,8 +993,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 12,
 									EndLine:   12,
-									StartPos:  225,
-									EndPos:    226,
+									StartPos:  203,
+									EndPos:    204,
 								},
 							},
 							Value: []byte("1"),
@@ -1376,8 +1007,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 13,
 						EndLine:   13,
-						StartPos:  231,
-						EndPos:    246,
+						StartPos:  207,
+						EndPos:    222,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -1385,8 +1016,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 13,
 							EndLine:   13,
-							StartPos:  231,
-							EndPos:    245,
+							StartPos:  207,
+							EndPos:    221,
 						},
 					},
 					Class: &ast.ExprArrayDimFetch{
@@ -1394,8 +1025,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 13,
 								EndLine:   13,
-								StartPos:  235,
-								EndPos:    245,
+								StartPos:  211,
+								EndPos:    221,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -1403,8 +1034,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 13,
 									EndLine:   13,
-									StartPos:  235,
-									EndPos:    239,
+									StartPos:  211,
+									EndPos:    215,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -1412,8 +1043,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 13,
 										EndLine:   13,
-										StartPos:  235,
-										EndPos:    239,
+										StartPos:  211,
+										EndPos:    215,
 									},
 								},
 								Value: []byte("$foo"),
@@ -1424,8 +1055,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 13,
 									EndLine:   13,
-									StartPos:  240,
-									EndPos:    244,
+									StartPos:  216,
+									EndPos:    220,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -1433,8 +1064,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 13,
 										EndLine:   13,
-										StartPos:  240,
-										EndPos:    244,
+										StartPos:  216,
+										EndPos:    220,
 									},
 								},
 								Value: []byte("$bar"),
@@ -1448,8 +1079,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 14,
 						EndLine:   14,
-						StartPos:  249,
-						EndPos:    263,
+						StartPos:  223,
+						EndPos:    237,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -1457,8 +1088,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 14,
 							EndLine:   14,
-							StartPos:  249,
-							EndPos:    262,
+							StartPos:  223,
+							EndPos:    236,
 						},
 					},
 					Class: &ast.ExprPropertyFetch{
@@ -1466,8 +1097,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 14,
 								EndLine:   14,
-								StartPos:  253,
-								EndPos:    262,
+								StartPos:  227,
+								EndPos:    236,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -1475,8 +1106,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 14,
 									EndLine:   14,
-									StartPos:  253,
-									EndPos:    257,
+									StartPos:  227,
+									EndPos:    231,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -1484,8 +1115,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 14,
 										EndLine:   14,
-										StartPos:  253,
-										EndPos:    257,
+										StartPos:  227,
+										EndPos:    231,
 									},
 								},
 								Value: []byte("$foo"),
@@ -1496,8 +1127,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 14,
 									EndLine:   14,
-									StartPos:  259,
-									EndPos:    262,
+									StartPos:  233,
+									EndPos:    236,
 								},
 							},
 							Value: []byte("bar"),
@@ -1510,8 +1141,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 15,
 						EndLine:   15,
-						StartPos:  266,
-						EndPos:    281,
+						StartPos:  238,
+						EndPos:    253,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -1519,8 +1150,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 15,
 							EndLine:   15,
-							StartPos:  266,
-							EndPos:    280,
+							StartPos:  238,
+							EndPos:    252,
 						},
 					},
 					Class: &ast.ExprStaticPropertyFetch{
@@ -1528,8 +1159,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 15,
 								EndLine:   15,
-								StartPos:  270,
-								EndPos:    280,
+								StartPos:  242,
+								EndPos:    252,
 							},
 						},
 						Class: &ast.ExprVariable{
@@ -1537,8 +1168,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 15,
 									EndLine:   15,
-									StartPos:  270,
-									EndPos:    274,
+									StartPos:  242,
+									EndPos:    246,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -1546,8 +1177,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 15,
 										EndLine:   15,
-										StartPos:  270,
-										EndPos:    274,
+										StartPos:  242,
+										EndPos:    246,
 									},
 								},
 								Value: []byte("$foo"),
@@ -1558,8 +1189,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 15,
 									EndLine:   15,
-									StartPos:  276,
-									EndPos:    280,
+									StartPos:  248,
+									EndPos:    252,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -1567,8 +1198,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 15,
 										EndLine:   15,
-										StartPos:  276,
-										EndPos:    280,
+										StartPos:  248,
+										EndPos:    252,
 									},
 								},
 								Value: []byte("$bar"),
@@ -1582,8 +1213,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 16,
 						EndLine:   16,
-						StartPos:  284,
-						EndPos:    301,
+						StartPos:  254,
+						EndPos:    271,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -1591,8 +1222,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 16,
 							EndLine:   16,
-							StartPos:  284,
-							EndPos:    300,
+							StartPos:  254,
+							EndPos:    270,
 						},
 					},
 					Class: &ast.ExprStaticPropertyFetch{
@@ -1600,8 +1231,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 16,
 								EndLine:   16,
-								StartPos:  288,
-								EndPos:    300,
+								StartPos:  258,
+								EndPos:    270,
 							},
 						},
 						Class: &ast.Identifier{
@@ -1609,8 +1240,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 16,
 									EndLine:   16,
-									StartPos:  288,
-									EndPos:    294,
+									StartPos:  258,
+									EndPos:    264,
 								},
 							},
 							Value: []byte("static"),
@@ -1620,8 +1251,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 16,
 									EndLine:   16,
-									StartPos:  296,
-									EndPos:    300,
+									StartPos:  266,
+									EndPos:    270,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -1629,8 +1260,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 16,
 										EndLine:   16,
-										StartPos:  296,
-										EndPos:    300,
+										StartPos:  266,
+										EndPos:    270,
 									},
 								},
 								Value: []byte("$bar"),
@@ -1644,18 +1275,17 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 18,
 						EndLine:   18,
-						StartPos:  305,
-						EndPos:    350,
+						StartPos:  273,
+						EndPos:    318,
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 18,
 							EndLine:   18,
-							StartPos:  314,
-							EndPos:    317,
+							StartPos:  282,
+							EndPos:    285,
 						},
 					},
 					Value: []byte("foo"),
@@ -1666,19 +1296,17 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 18,
 								EndLine:   18,
-								StartPos:  318,
-								EndPos:    332,
+								StartPos:  286,
+								EndPos:    300,
 							},
 						},
-						ByRef:    false,
-						Variadic: false,
 						Type: &ast.Nullable{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 18,
 									EndLine:   18,
-									StartPos:  318,
-									EndPos:    322,
+									StartPos:  286,
+									EndPos:    290,
 								},
 							},
 							Expr: &ast.NameName{
@@ -1686,8 +1314,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 18,
 										EndLine:   18,
-										StartPos:  319,
-										EndPos:    322,
+										StartPos:  287,
+										EndPos:    290,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1696,8 +1324,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 18,
 												EndLine:   18,
-												StartPos:  319,
-												EndPos:    322,
+												StartPos:  287,
+												EndPos:    290,
 											},
 										},
 										Value: []byte("bar"),
@@ -1710,8 +1338,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 18,
 									EndLine:   18,
-									StartPos:  323,
-									EndPos:    327,
+									StartPos:  291,
+									EndPos:    295,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -1719,8 +1347,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 18,
 										EndLine:   18,
-										StartPos:  323,
-										EndPos:    327,
+										StartPos:  291,
+										EndPos:    295,
 									},
 								},
 								Value: []byte("$bar"),
@@ -1731,8 +1359,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 18,
 									EndLine:   18,
-									StartPos:  328,
-									EndPos:    332,
+									StartPos:  296,
+									EndPos:    300,
 								},
 							},
 							Const: &ast.NameName{
@@ -1740,8 +1368,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 18,
 										EndLine:   18,
-										StartPos:  328,
-										EndPos:    332,
+										StartPos:  296,
+										EndPos:    300,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -1750,8 +1378,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 18,
 												EndLine:   18,
-												StartPos:  328,
-												EndPos:    332,
+												StartPos:  296,
+												EndPos:    300,
 											},
 										},
 										Value: []byte("null"),
@@ -1765,19 +1393,17 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 18,
 								EndLine:   18,
-								StartPos:  334,
-								EndPos:    346,
+								StartPos:  302,
+								EndPos:    314,
 							},
 						},
-						Variadic: true,
-						ByRef:    true,
 						Type: &ast.NameName{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 18,
 									EndLine:   18,
-									StartPos:  334,
-									EndPos:    337,
+									StartPos:  302,
+									EndPos:    305,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -1786,33 +1412,53 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 18,
 											EndLine:   18,
-											StartPos:  334,
-											EndPos:    337,
+											StartPos:  302,
+											EndPos:    305,
 										},
 									},
 									Value: []byte("baz"),
 								},
 							},
 						},
-						Var: &ast.ExprVariable{
+						Var: &ast.Reference{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 18,
 									EndLine:   18,
-									StartPos:  342,
-									EndPos:    346,
+									StartPos:  306,
+									EndPos:    314,
 								},
 							},
-							VarName: &ast.Identifier{
+							Var: &ast.Variadic{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 18,
 										EndLine:   18,
-										StartPos:  342,
-										EndPos:    346,
+										StartPos:  307,
+										EndPos:    314,
+									},
+								},
+								Var: &ast.ExprVariable{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 18,
+											EndLine:   18,
+											StartPos:  310,
+											EndPos:    314,
+										},
+									},
+									VarName: &ast.Identifier{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 18,
+												EndLine:   18,
+												StartPos:  310,
+												EndPos:    314,
+											},
+										},
+										Value: []byte("$baz"),
 									},
 								},
-								Value: []byte("$baz"),
 							},
 						},
 					},
@@ -1824,8 +1470,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 19,
 						EndLine:   19,
-						StartPos:  353,
-						EndPos:    417,
+						StartPos:  319,
+						EndPos:    383,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -1833,8 +1479,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 19,
 							EndLine:   19,
-							StartPos:  359,
-							EndPos:    362,
+							StartPos:  325,
+							EndPos:    328,
 						},
 					},
 					Value: []byte("foo"),
@@ -1845,18 +1491,17 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 19,
 								EndLine:   19,
-								StartPos:  364,
-								EndPos:    416,
+								StartPos:  330,
+								EndPos:    382,
 							},
 						},
-						ReturnsRef: false,
 						MethodName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 19,
 									EndLine:   19,
-									StartPos:  380,
-									EndPos:    383,
+									StartPos:  346,
+									EndPos:    349,
 								},
 							},
 							Value: []byte("foo"),
@@ -1867,8 +1512,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 19,
 										EndLine:   19,
-										StartPos:  364,
-										EndPos:    370,
+										StartPos:  330,
+										EndPos:    336,
 									},
 								},
 								Value: []byte("public"),
@@ -1880,19 +1525,17 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 19,
 										EndLine:   19,
-										StartPos:  384,
-										EndPos:    398,
+										StartPos:  350,
+										EndPos:    364,
 									},
 								},
-								ByRef:    false,
-								Variadic: false,
 								Type: &ast.Nullable{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 19,
 											EndLine:   19,
-											StartPos:  384,
-											EndPos:    388,
+											StartPos:  350,
+											EndPos:    354,
 										},
 									},
 									Expr: &ast.NameName{
@@ -1900,8 +1543,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 19,
 												EndLine:   19,
-												StartPos:  385,
-												EndPos:    388,
+												StartPos:  351,
+												EndPos:    354,
 											},
 										},
 										Parts: []ast.Vertex{
@@ -1910,8 +1553,8 @@ func TestPhp7(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 19,
 														EndLine:   19,
-														StartPos:  385,
-														EndPos:    388,
+														StartPos:  351,
+														EndPos:    354,
 													},
 												},
 												Value: []byte("bar"),
@@ -1924,8 +1567,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 19,
 											EndLine:   19,
-											StartPos:  389,
-											EndPos:    393,
+											StartPos:  355,
+											EndPos:    359,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -1933,8 +1576,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 19,
 												EndLine:   19,
-												StartPos:  389,
-												EndPos:    393,
+												StartPos:  355,
+												EndPos:    359,
 											},
 										},
 										Value: []byte("$bar"),
@@ -1945,8 +1588,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 19,
 											EndLine:   19,
-											StartPos:  394,
-											EndPos:    398,
+											StartPos:  360,
+											EndPos:    364,
 										},
 									},
 									Const: &ast.NameName{
@@ -1954,8 +1597,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 19,
 												EndLine:   19,
-												StartPos:  394,
-												EndPos:    398,
+												StartPos:  360,
+												EndPos:    364,
 											},
 										},
 										Parts: []ast.Vertex{
@@ -1964,8 +1607,8 @@ func TestPhp7(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 19,
 														EndLine:   19,
-														StartPos:  394,
-														EndPos:    398,
+														StartPos:  360,
+														EndPos:    364,
 													},
 												},
 												Value: []byte("null"),
@@ -1979,19 +1622,17 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 19,
 										EndLine:   19,
-										StartPos:  400,
-										EndPos:    412,
+										StartPos:  366,
+										EndPos:    378,
 									},
 								},
-								ByRef:    true,
-								Variadic: true,
 								Type: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 19,
 											EndLine:   19,
-											StartPos:  400,
-											EndPos:    403,
+											StartPos:  366,
+											EndPos:    369,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -2000,33 +1641,53 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 19,
 													EndLine:   19,
-													StartPos:  400,
-													EndPos:    403,
+													StartPos:  366,
+													EndPos:    369,
 												},
 											},
 											Value: []byte("baz"),
 										},
 									},
 								},
-								Var: &ast.ExprVariable{
+								Var: &ast.Reference{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 19,
 											EndLine:   19,
-											StartPos:  408,
-											EndPos:    412,
+											StartPos:  370,
+											EndPos:    378,
 										},
 									},
-									VarName: &ast.Identifier{
+									Var: &ast.Variadic{
 										Node: ast.Node{
 											Position: &position.Position{
 												StartLine: 19,
 												EndLine:   19,
-												StartPos:  408,
-												EndPos:    412,
+												StartPos:  371,
+												EndPos:    378,
+											},
+										},
+										Var: &ast.ExprVariable{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 19,
+													EndLine:   19,
+													StartPos:  374,
+													EndPos:    378,
+												},
+											},
+											VarName: &ast.Identifier{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 19,
+														EndLine:   19,
+														StartPos:  374,
+														EndPos:    378,
+													},
+												},
+												Value: []byte("$baz"),
 											},
 										},
-										Value: []byte("$baz"),
 									},
 								},
 							},
@@ -2036,8 +1697,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 19,
 									EndLine:   19,
-									StartPos:  414,
-									EndPos:    416,
+									StartPos:  380,
+									EndPos:    382,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -2050,8 +1711,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 20,
 						EndLine:   20,
-						StartPos:  420,
-						EndPos:    462,
+						StartPos:  384,
+						EndPos:    426,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -2059,31 +1720,27 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 20,
 							EndLine:   20,
-							StartPos:  420,
-							EndPos:    461,
+							StartPos:  384,
+							EndPos:    425,
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
 					Params: []ast.Vertex{
 						&ast.Parameter{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 20,
 									EndLine:   20,
-									StartPos:  429,
-									EndPos:    443,
+									StartPos:  393,
+									EndPos:    407,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Type: &ast.Nullable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 20,
 										EndLine:   20,
-										StartPos:  429,
-										EndPos:    433,
+										StartPos:  393,
+										EndPos:    397,
 									},
 								},
 								Expr: &ast.NameName{
@@ -2091,8 +1748,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 20,
 											EndLine:   20,
-											StartPos:  430,
-											EndPos:    433,
+											StartPos:  394,
+											EndPos:    397,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -2101,8 +1758,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 20,
 													EndLine:   20,
-													StartPos:  430,
-													EndPos:    433,
+													StartPos:  394,
+													EndPos:    397,
 												},
 											},
 											Value: []byte("bar"),
@@ -2115,8 +1772,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 20,
 										EndLine:   20,
-										StartPos:  434,
-										EndPos:    438,
+										StartPos:  398,
+										EndPos:    402,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -2124,8 +1781,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 20,
 											EndLine:   20,
-											StartPos:  434,
-											EndPos:    438,
+											StartPos:  398,
+											EndPos:    402,
 										},
 									},
 									Value: []byte("$bar"),
@@ -2136,8 +1793,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 20,
 										EndLine:   20,
-										StartPos:  439,
-										EndPos:    443,
+										StartPos:  403,
+										EndPos:    407,
 									},
 								},
 								Const: &ast.NameName{
@@ -2145,8 +1802,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 20,
 											EndLine:   20,
-											StartPos:  439,
-											EndPos:    443,
+											StartPos:  403,
+											EndPos:    407,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -2155,8 +1812,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 20,
 													EndLine:   20,
-													StartPos:  439,
-													EndPos:    443,
+													StartPos:  403,
+													EndPos:    407,
 												},
 											},
 											Value: []byte("null"),
@@ -2170,19 +1827,17 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 20,
 									EndLine:   20,
-									StartPos:  445,
-									EndPos:    457,
+									StartPos:  409,
+									EndPos:    421,
 								},
 							},
-							ByRef:    true,
-							Variadic: true,
 							Type: &ast.NameName{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 20,
 										EndLine:   20,
-										StartPos:  445,
-										EndPos:    448,
+										StartPos:  409,
+										EndPos:    412,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -2191,33 +1846,53 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 20,
 												EndLine:   20,
-												StartPos:  445,
-												EndPos:    448,
+												StartPos:  409,
+												EndPos:    412,
 											},
 										},
 										Value: []byte("baz"),
 									},
 								},
 							},
-							Var: &ast.ExprVariable{
+							Var: &ast.Reference{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 20,
 										EndLine:   20,
-										StartPos:  453,
-										EndPos:    457,
+										StartPos:  413,
+										EndPos:    421,
 									},
 								},
-								VarName: &ast.Identifier{
+								Var: &ast.Variadic{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 20,
 											EndLine:   20,
-											StartPos:  453,
-											EndPos:    457,
+											StartPos:  414,
+											EndPos:    421,
+										},
+									},
+									Var: &ast.ExprVariable{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 20,
+												EndLine:   20,
+												StartPos:  417,
+												EndPos:    421,
+											},
+										},
+										VarName: &ast.Identifier{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 20,
+													EndLine:   20,
+													StartPos:  417,
+													EndPos:    421,
+												},
+											},
+											Value: []byte("$baz"),
 										},
 									},
-									Value: []byte("$baz"),
 								},
 							},
 						},
@@ -2230,8 +1905,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 21,
 						EndLine:   21,
-						StartPos:  465,
-						EndPos:    514,
+						StartPos:  427,
+						EndPos:    476,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -2239,31 +1914,28 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 21,
 							EndLine:   21,
-							StartPos:  465,
-							EndPos:    513,
+							StartPos:  427,
+							EndPos:    475,
 						},
 					},
-					ReturnsRef: false,
-					Static:     true,
+					Static: true,
 					Params: []ast.Vertex{
 						&ast.Parameter{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 21,
 									EndLine:   21,
-									StartPos:  481,
-									EndPos:    495,
+									StartPos:  443,
+									EndPos:    457,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Type: &ast.Nullable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 21,
 										EndLine:   21,
-										StartPos:  481,
-										EndPos:    485,
+										StartPos:  443,
+										EndPos:    447,
 									},
 								},
 								Expr: &ast.NameName{
@@ -2271,8 +1943,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 21,
 											EndLine:   21,
-											StartPos:  482,
-											EndPos:    485,
+											StartPos:  444,
+											EndPos:    447,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -2281,8 +1953,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 21,
 													EndLine:   21,
-													StartPos:  482,
-													EndPos:    485,
+													StartPos:  444,
+													EndPos:    447,
 												},
 											},
 											Value: []byte("bar"),
@@ -2295,8 +1967,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 21,
 										EndLine:   21,
-										StartPos:  486,
-										EndPos:    490,
+										StartPos:  448,
+										EndPos:    452,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -2304,8 +1976,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 21,
 											EndLine:   21,
-											StartPos:  486,
-											EndPos:    490,
+											StartPos:  448,
+											EndPos:    452,
 										},
 									},
 									Value: []byte("$bar"),
@@ -2316,8 +1988,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 21,
 										EndLine:   21,
-										StartPos:  491,
-										EndPos:    495,
+										StartPos:  453,
+										EndPos:    457,
 									},
 								},
 								Const: &ast.NameName{
@@ -2325,8 +1997,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 21,
 											EndLine:   21,
-											StartPos:  491,
-											EndPos:    495,
+											StartPos:  453,
+											EndPos:    457,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -2335,8 +2007,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 21,
 													EndLine:   21,
-													StartPos:  491,
-													EndPos:    495,
+													StartPos:  453,
+													EndPos:    457,
 												},
 											},
 											Value: []byte("null"),
@@ -2350,19 +2022,17 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 21,
 									EndLine:   21,
-									StartPos:  497,
-									EndPos:    509,
+									StartPos:  459,
+									EndPos:    471,
 								},
 							},
-							ByRef:    true,
-							Variadic: true,
 							Type: &ast.NameName{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 21,
 										EndLine:   21,
-										StartPos:  497,
-										EndPos:    500,
+										StartPos:  459,
+										EndPos:    462,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -2371,33 +2041,53 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 21,
 												EndLine:   21,
-												StartPos:  497,
-												EndPos:    500,
+												StartPos:  459,
+												EndPos:    462,
 											},
 										},
 										Value: []byte("baz"),
 									},
 								},
 							},
-							Var: &ast.ExprVariable{
+							Var: &ast.Reference{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 21,
 										EndLine:   21,
-										StartPos:  505,
-										EndPos:    509,
+										StartPos:  463,
+										EndPos:    471,
 									},
 								},
-								VarName: &ast.Identifier{
+								Var: &ast.Variadic{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 21,
 											EndLine:   21,
-											StartPos:  505,
-											EndPos:    509,
+											StartPos:  464,
+											EndPos:    471,
+										},
+									},
+									Var: &ast.ExprVariable{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 21,
+												EndLine:   21,
+												StartPos:  467,
+												EndPos:    471,
+											},
+										},
+										VarName: &ast.Identifier{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 21,
+													EndLine:   21,
+													StartPos:  467,
+													EndPos:    471,
+												},
+											},
+											Value: []byte("$baz"),
 										},
 									},
-									Value: []byte("$baz"),
 								},
 							},
 						},
@@ -2410,8 +2100,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 23,
 						EndLine:   23,
-						StartPos:  518,
-						EndPos:    538,
+						StartPos:  478,
+						EndPos:    498,
 					},
 				},
 				Expr: &ast.ScalarLnumber{
@@ -2419,8 +2109,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 23,
 							EndLine:   23,
-							StartPos:  518,
-							EndPos:    537,
+							StartPos:  478,
+							EndPos:    497,
 						},
 					},
 					Value: []byte("1234567890123456789"),
@@ -2431,8 +2121,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 24,
 						EndLine:   24,
-						StartPos:  541,
-						EndPos:    562,
+						StartPos:  499,
+						EndPos:    520,
 					},
 				},
 				Expr: &ast.ScalarDnumber{
@@ -2440,8 +2130,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 24,
 							EndLine:   24,
-							StartPos:  541,
-							EndPos:    561,
+							StartPos:  499,
+							EndPos:    519,
 						},
 					},
 					Value: []byte("12345678901234567890"),
@@ -2452,8 +2142,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 25,
 						EndLine:   25,
-						StartPos:  565,
-						EndPos:    568,
+						StartPos:  521,
+						EndPos:    524,
 					},
 				},
 				Expr: &ast.ScalarDnumber{
@@ -2461,8 +2151,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 25,
 							EndLine:   25,
-							StartPos:  565,
-							EndPos:    567,
+							StartPos:  521,
+							EndPos:    523,
 						},
 					},
 					Value: []byte("0."),
@@ -2473,8 +2163,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 26,
 						EndLine:   26,
-						StartPos:  571,
-						EndPos:    638,
+						StartPos:  525,
+						EndPos:    592,
 					},
 				},
 				Expr: &ast.ScalarLnumber{
@@ -2482,8 +2172,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 26,
 							EndLine:   26,
-							StartPos:  571,
-							EndPos:    637,
+							StartPos:  525,
+							EndPos:    591,
 						},
 					},
 					Value: []byte("0b0111111111111111111111111111111111111111111111111111111111111111"),
@@ -2494,8 +2184,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 27,
 						EndLine:   27,
-						StartPos:  641,
-						EndPos:    708,
+						StartPos:  593,
+						EndPos:    660,
 					},
 				},
 				Expr: &ast.ScalarDnumber{
@@ -2503,8 +2193,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 27,
 							EndLine:   27,
-							StartPos:  641,
-							EndPos:    707,
+							StartPos:  593,
+							EndPos:    659,
 						},
 					},
 					Value: []byte("0b1111111111111111111111111111111111111111111111111111111111111111"),
@@ -2515,8 +2205,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 28,
 						EndLine:   28,
-						StartPos:  711,
-						EndPos:    732,
+						StartPos:  661,
+						EndPos:    682,
 					},
 				},
 				Expr: &ast.ScalarLnumber{
@@ -2524,8 +2214,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 28,
 							EndLine:   28,
-							StartPos:  711,
-							EndPos:    731,
+							StartPos:  661,
+							EndPos:    681,
 						},
 					},
 					Value: []byte("0x007111111111111111"),
@@ -2536,8 +2226,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 29,
 						EndLine:   29,
-						StartPos:  735,
-						EndPos:    754,
+						StartPos:  683,
+						EndPos:    702,
 					},
 				},
 				Expr: &ast.ScalarDnumber{
@@ -2545,8 +2235,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 29,
 							EndLine:   29,
-							StartPos:  735,
-							EndPos:    753,
+							StartPos:  683,
+							EndPos:    701,
 						},
 					},
 					Value: []byte("0x8111111111111111"),
@@ -2557,8 +2247,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 30,
 						EndLine:   30,
-						StartPos:  757,
-						EndPos:    767,
+						StartPos:  703,
+						EndPos:    713,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2566,8 +2256,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 30,
 							EndLine:   30,
-							StartPos:  757,
-							EndPos:    766,
+							StartPos:  703,
+							EndPos:    712,
 						},
 					},
 					Value: []byte("__CLASS__"),
@@ -2578,8 +2268,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 31,
 						EndLine:   31,
-						StartPos:  770,
-						EndPos:    778,
+						StartPos:  714,
+						EndPos:    722,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2587,8 +2277,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 31,
 							EndLine:   31,
-							StartPos:  770,
-							EndPos:    777,
+							StartPos:  714,
+							EndPos:    721,
 						},
 					},
 					Value: []byte("__DIR__"),
@@ -2599,8 +2289,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 32,
 						EndLine:   32,
-						StartPos:  781,
-						EndPos:    790,
+						StartPos:  723,
+						EndPos:    732,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2608,8 +2298,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 32,
 							EndLine:   32,
-							StartPos:  781,
-							EndPos:    789,
+							StartPos:  723,
+							EndPos:    731,
 						},
 					},
 					Value: []byte("__FILE__"),
@@ -2620,8 +2310,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 33,
 						EndLine:   33,
-						StartPos:  793,
-						EndPos:    806,
+						StartPos:  733,
+						EndPos:    746,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2629,8 +2319,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 33,
 							EndLine:   33,
-							StartPos:  793,
-							EndPos:    805,
+							StartPos:  733,
+							EndPos:    745,
 						},
 					},
 					Value: []byte("__FUNCTION__"),
@@ -2641,8 +2331,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 34,
 						EndLine:   34,
-						StartPos:  809,
-						EndPos:    818,
+						StartPos:  747,
+						EndPos:    756,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2650,8 +2340,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 34,
 							EndLine:   34,
-							StartPos:  809,
-							EndPos:    817,
+							StartPos:  747,
+							EndPos:    755,
 						},
 					},
 					Value: []byte("__LINE__"),
@@ -2662,8 +2352,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 35,
 						EndLine:   35,
-						StartPos:  821,
-						EndPos:    835,
+						StartPos:  757,
+						EndPos:    771,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2671,8 +2361,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 35,
 							EndLine:   35,
-							StartPos:  821,
-							EndPos:    834,
+							StartPos:  757,
+							EndPos:    770,
 						},
 					},
 					Value: []byte("__NAMESPACE__"),
@@ -2683,8 +2373,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 36,
 						EndLine:   36,
-						StartPos:  838,
-						EndPos:    849,
+						StartPos:  772,
+						EndPos:    783,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2692,8 +2382,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 36,
 							EndLine:   36,
-							StartPos:  838,
-							EndPos:    848,
+							StartPos:  772,
+							EndPos:    782,
 						},
 					},
 					Value: []byte("__METHOD__"),
@@ -2704,8 +2394,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 37,
 						EndLine:   37,
-						StartPos:  852,
-						EndPos:    862,
+						StartPos:  784,
+						EndPos:    794,
 					},
 				},
 				Expr: &ast.ScalarMagicConstant{
@@ -2713,8 +2403,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 37,
 							EndLine:   37,
-							StartPos:  852,
-							EndPos:    861,
+							StartPos:  784,
+							EndPos:    793,
 						},
 					},
 					Value: []byte("__TRAIT__"),
@@ -2725,8 +2415,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 39,
 						EndLine:   39,
-						StartPos:  866,
-						EndPos:    878,
+						StartPos:  796,
+						EndPos:    808,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2734,8 +2424,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 39,
 							EndLine:   39,
-							StartPos:  866,
-							EndPos:    877,
+							StartPos:  796,
+							EndPos:    807,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2744,8 +2434,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 39,
 									EndLine:   39,
-									StartPos:  867,
-									EndPos:    872,
+									StartPos:  797,
+									EndPos:    802,
 								},
 							},
 							Value: []byte("test "),
@@ -2755,8 +2445,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 39,
 									EndLine:   39,
-									StartPos:  872,
-									EndPos:    876,
+									StartPos:  802,
+									EndPos:    806,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -2764,8 +2454,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 39,
 										EndLine:   39,
-										StartPos:  872,
-										EndPos:    876,
+										StartPos:  802,
+										EndPos:    806,
 									},
 								},
 								Value: []byte("$var"),
@@ -2779,8 +2469,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 40,
 						EndLine:   40,
-						StartPos:  881,
-						EndPos:    896,
+						StartPos:  809,
+						EndPos:    824,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2788,8 +2478,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 40,
 							EndLine:   40,
-							StartPos:  881,
-							EndPos:    895,
+							StartPos:  809,
+							EndPos:    823,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2798,8 +2488,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 40,
 									EndLine:   40,
-									StartPos:  882,
-									EndPos:    887,
+									StartPos:  810,
+									EndPos:    815,
 								},
 							},
 							Value: []byte("test "),
@@ -2809,8 +2499,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 40,
 									EndLine:   40,
-									StartPos:  887,
-									EndPos:    894,
+									StartPos:  815,
+									EndPos:    822,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -2818,8 +2508,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 40,
 										EndLine:   40,
-										StartPos:  887,
-										EndPos:    891,
+										StartPos:  815,
+										EndPos:    819,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -2827,8 +2517,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 40,
 											EndLine:   40,
-											StartPos:  887,
-											EndPos:    891,
+											StartPos:  815,
+											EndPos:    819,
 										},
 									},
 									Value: []byte("$var"),
@@ -2839,8 +2529,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 40,
 										EndLine:   40,
-										StartPos:  892,
-										EndPos:    893,
+										StartPos:  820,
+										EndPos:    821,
 									},
 								},
 								Value: []byte("1"),
@@ -2854,8 +2544,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 41,
 						EndLine:   41,
-						StartPos:  899,
-						EndPos:    915,
+						StartPos:  825,
+						EndPos:    841,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2863,8 +2553,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 41,
 							EndLine:   41,
-							StartPos:  899,
-							EndPos:    914,
+							StartPos:  825,
+							EndPos:    840,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2873,8 +2563,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 41,
 									EndLine:   41,
-									StartPos:  900,
-									EndPos:    905,
+									StartPos:  826,
+									EndPos:    831,
 								},
 							},
 							Value: []byte("test "),
@@ -2884,8 +2574,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 41,
 									EndLine:   41,
-									StartPos:  905,
-									EndPos:    913,
+									StartPos:  831,
+									EndPos:    839,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -2893,8 +2583,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 41,
 										EndLine:   41,
-										StartPos:  905,
-										EndPos:    909,
+										StartPos:  831,
+										EndPos:    835,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -2902,8 +2592,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 41,
 											EndLine:   41,
-											StartPos:  905,
-											EndPos:    909,
+											StartPos:  831,
+											EndPos:    835,
 										},
 									},
 									Value: []byte("$var"),
@@ -2914,8 +2604,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 41,
 										EndLine:   41,
-										StartPos:  910,
-										EndPos:    912,
+										StartPos:  836,
+										EndPos:    838,
 									},
 								},
 								Expr: &ast.ScalarLnumber{
@@ -2923,8 +2613,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 41,
 											EndLine:   41,
-											StartPos:  910,
-											EndPos:    912,
+											StartPos:  836,
+											EndPos:    838,
 										},
 									},
 									Value: []byte("1"),
@@ -2939,8 +2629,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 42,
 						EndLine:   42,
-						StartPos:  918,
-						EndPos:    972,
+						StartPos:  842,
+						EndPos:    896,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -2948,8 +2638,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 42,
 							EndLine:   42,
-							StartPos:  918,
-							EndPos:    971,
+							StartPos:  842,
+							EndPos:    895,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -2958,8 +2648,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 42,
 									EndLine:   42,
-									StartPos:  919,
-									EndPos:    924,
+									StartPos:  843,
+									EndPos:    848,
 								},
 							},
 							Value: []byte("test "),
@@ -2969,8 +2659,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 42,
 									EndLine:   42,
-									StartPos:  924,
-									EndPos:    970,
+									StartPos:  848,
+									EndPos:    894,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -2978,8 +2668,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 42,
 										EndLine:   42,
-										StartPos:  924,
-										EndPos:    928,
+										StartPos:  848,
+										EndPos:    852,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -2987,8 +2677,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 42,
 											EndLine:   42,
-											StartPos:  924,
-											EndPos:    928,
+											StartPos:  848,
+											EndPos:    852,
 										},
 									},
 									Value: []byte("$var"),
@@ -2999,8 +2689,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 42,
 										EndLine:   42,
-										StartPos:  929,
-										EndPos:    969,
+										StartPos:  853,
+										EndPos:    893,
 									},
 								},
 								Value: []byte("1234567890123456789012345678901234567890"),
@@ -3014,8 +2704,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 43,
 						EndLine:   43,
-						StartPos:  975,
-						EndPos:    1030,
+						StartPos:  897,
+						EndPos:    952,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -3023,8 +2713,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 43,
 							EndLine:   43,
-							StartPos:  975,
-							EndPos:    1029,
+							StartPos:  897,
+							EndPos:    951,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -3033,8 +2723,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 43,
 									EndLine:   43,
-									StartPos:  976,
-									EndPos:    981,
+									StartPos:  898,
+									EndPos:    903,
 								},
 							},
 							Value: []byte("test "),
@@ -3044,8 +2734,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 43,
 									EndLine:   43,
-									StartPos:  981,
-									EndPos:    1028,
+									StartPos:  903,
+									EndPos:    950,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -3053,8 +2743,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 43,
 										EndLine:   43,
-										StartPos:  981,
-										EndPos:    985,
+										StartPos:  903,
+										EndPos:    907,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -3062,8 +2752,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 43,
 											EndLine:   43,
-											StartPos:  981,
-											EndPos:    985,
+											StartPos:  903,
+											EndPos:    907,
 										},
 									},
 									Value: []byte("$var"),
@@ -3074,8 +2764,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 43,
 										EndLine:   43,
-										StartPos:  986,
-										EndPos:    1027,
+										StartPos:  908,
+										EndPos:    949,
 									},
 								},
 								Value: []byte("-1234567890123456789012345678901234567890"),
@@ -3089,8 +2779,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 44,
 						EndLine:   44,
-						StartPos:  1033,
-						EndPos:    1050,
+						StartPos:  953,
+						EndPos:    970,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -3098,8 +2788,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 44,
 							EndLine:   44,
-							StartPos:  1033,
-							EndPos:    1049,
+							StartPos:  953,
+							EndPos:    969,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -3108,8 +2798,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 44,
 									EndLine:   44,
-									StartPos:  1034,
-									EndPos:    1039,
+									StartPos:  954,
+									EndPos:    959,
 								},
 							},
 							Value: []byte("test "),
@@ -3119,8 +2809,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 44,
 									EndLine:   44,
-									StartPos:  1039,
-									EndPos:    1048,
+									StartPos:  959,
+									EndPos:    968,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -3128,8 +2818,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 44,
 										EndLine:   44,
-										StartPos:  1039,
-										EndPos:    1043,
+										StartPos:  959,
+										EndPos:    963,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -3137,8 +2827,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 44,
 											EndLine:   44,
-											StartPos:  1039,
-											EndPos:    1043,
+											StartPos:  959,
+											EndPos:    963,
 										},
 									},
 									Value: []byte("$var"),
@@ -3149,8 +2839,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 44,
 										EndLine:   44,
-										StartPos:  1044,
-										EndPos:    1047,
+										StartPos:  964,
+										EndPos:    967,
 									},
 								},
 								Value: []byte("bar"),
@@ -3164,8 +2854,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 45,
 						EndLine:   45,
-						StartPos:  1053,
-						EndPos:    1071,
+						StartPos:  971,
+						EndPos:    989,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -3173,8 +2863,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 45,
 							EndLine:   45,
-							StartPos:  1053,
-							EndPos:    1070,
+							StartPos:  971,
+							EndPos:    988,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -3183,8 +2873,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 45,
 									EndLine:   45,
-									StartPos:  1054,
-									EndPos:    1059,
+									StartPos:  972,
+									EndPos:    977,
 								},
 							},
 							Value: []byte("test "),
@@ -3194,8 +2884,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 45,
 									EndLine:   45,
-									StartPos:  1059,
-									EndPos:    1069,
+									StartPos:  977,
+									EndPos:    987,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -3203,8 +2893,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 45,
 										EndLine:   45,
-										StartPos:  1059,
-										EndPos:    1063,
+										StartPos:  977,
+										EndPos:    981,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -3212,8 +2902,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 45,
 											EndLine:   45,
-											StartPos:  1059,
-											EndPos:    1063,
+											StartPos:  977,
+											EndPos:    981,
 										},
 									},
 									Value: []byte("$var"),
@@ -3224,8 +2914,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 45,
 										EndLine:   45,
-										StartPos:  1064,
-										EndPos:    1068,
+										StartPos:  982,
+										EndPos:    986,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -3233,8 +2923,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 45,
 											EndLine:   45,
-											StartPos:  1064,
-											EndPos:    1068,
+											StartPos:  982,
+											EndPos:    986,
 										},
 									},
 									Value: []byte("$bar"),
@@ -3249,8 +2939,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 46,
 						EndLine:   46,
-						StartPos:  1074,
-						EndPos:    1086,
+						StartPos:  990,
+						EndPos:    1002,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -3258,8 +2948,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 46,
 							EndLine:   46,
-							StartPos:  1074,
-							EndPos:    1085,
+							StartPos:  990,
+							EndPos:    1001,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -3268,8 +2958,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 46,
 									EndLine:   46,
-									StartPos:  1075,
-									EndPos:    1079,
+									StartPos:  991,
+									EndPos:    995,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -3277,8 +2967,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 46,
 										EndLine:   46,
-										StartPos:  1075,
-										EndPos:    1079,
+										StartPos:  991,
+										EndPos:    995,
 									},
 								},
 								Value: []byte("$foo"),
@@ -3289,8 +2979,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 46,
 									EndLine:   46,
-									StartPos:  1079,
-									EndPos:    1080,
+									StartPos:  995,
+									EndPos:    996,
 								},
 							},
 							Value: []byte(" "),
@@ -3300,8 +2990,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 46,
 									EndLine:   46,
-									StartPos:  1080,
-									EndPos:    1084,
+									StartPos:  996,
+									EndPos:    1000,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -3309,8 +2999,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 46,
 										EndLine:   46,
-										StartPos:  1080,
-										EndPos:    1084,
+										StartPos:  996,
+										EndPos:    1000,
 									},
 								},
 								Value: []byte("$bar"),
@@ -3324,8 +3014,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 47,
 						EndLine:   47,
-						StartPos:  1089,
-						EndPos:    1108,
+						StartPos:  1003,
+						EndPos:    1022,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -3333,8 +3023,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 47,
 							EndLine:   47,
-							StartPos:  1089,
-							EndPos:    1107,
+							StartPos:  1003,
+							EndPos:    1021,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -3343,8 +3033,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 47,
 									EndLine:   47,
-									StartPos:  1090,
-									EndPos:    1095,
+									StartPos:  1004,
+									EndPos:    1009,
 								},
 							},
 							Value: []byte("test "),
@@ -3354,8 +3044,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 47,
 									EndLine:   47,
-									StartPos:  1095,
-									EndPos:    1104,
+									StartPos:  1009,
+									EndPos:    1018,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -3363,8 +3053,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 47,
 										EndLine:   47,
-										StartPos:  1095,
-										EndPos:    1099,
+										StartPos:  1009,
+										EndPos:    1013,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -3372,8 +3062,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 47,
 											EndLine:   47,
-											StartPos:  1095,
-											EndPos:    1099,
+											StartPos:  1009,
+											EndPos:    1013,
 										},
 									},
 									Value: []byte("$foo"),
@@ -3384,8 +3074,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 47,
 										EndLine:   47,
-										StartPos:  1101,
-										EndPos:    1104,
+										StartPos:  1015,
+										EndPos:    1018,
 									},
 								},
 								Value: []byte("bar"),
@@ -3396,8 +3086,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 47,
 									EndLine:   47,
-									StartPos:  1104,
-									EndPos:    1106,
+									StartPos:  1018,
+									EndPos:    1020,
 								},
 							},
 							Value: []byte("()"),
@@ -3410,8 +3100,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 48,
 						EndLine:   48,
-						StartPos:  1111,
-						EndPos:    1125,
+						StartPos:  1023,
+						EndPos:    1037,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -3419,8 +3109,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 48,
 							EndLine:   48,
-							StartPos:  1111,
-							EndPos:    1124,
+							StartPos:  1023,
+							EndPos:    1036,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -3429,8 +3119,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 48,
 									EndLine:   48,
-									StartPos:  1112,
-									EndPos:    1117,
+									StartPos:  1024,
+									EndPos:    1029,
 								},
 							},
 							Value: []byte("test "),
@@ -3440,8 +3130,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 48,
 									EndLine:   48,
-									StartPos:  1117,
-									EndPos:    1123,
+									StartPos:  1029,
+									EndPos:    1035,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -3449,8 +3139,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 48,
 										EndLine:   48,
-										StartPos:  1119,
-										EndPos:    1122,
+										StartPos:  1031,
+										EndPos:    1034,
 									},
 								},
 								Value: []byte("foo"),
@@ -3464,8 +3154,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 49,
 						EndLine:   49,
-						StartPos:  1128,
-						EndPos:    1145,
+						StartPos:  1038,
+						EndPos:    1055,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -3473,8 +3163,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 49,
 							EndLine:   49,
-							StartPos:  1128,
-							EndPos:    1144,
+							StartPos:  1038,
+							EndPos:    1054,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -3483,8 +3173,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 49,
 									EndLine:   49,
-									StartPos:  1129,
-									EndPos:    1134,
+									StartPos:  1039,
+									EndPos:    1044,
 								},
 							},
 							Value: []byte("test "),
@@ -3494,8 +3184,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 49,
 									EndLine:   49,
-									StartPos:  1134,
-									EndPos:    1143,
+									StartPos:  1044,
+									EndPos:    1053,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -3503,8 +3193,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 49,
 										EndLine:   49,
-										StartPos:  1136,
-										EndPos:    1139,
+										StartPos:  1046,
+										EndPos:    1049,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -3512,8 +3202,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 49,
 											EndLine:   49,
-											StartPos:  1136,
-											EndPos:    1139,
+											StartPos:  1046,
+											EndPos:    1049,
 										},
 									},
 									Value: []byte("foo"),
@@ -3524,8 +3214,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 49,
 										EndLine:   49,
-										StartPos:  1140,
-										EndPos:    1141,
+										StartPos:  1050,
+										EndPos:    1051,
 									},
 								},
 								Value: []byte("0"),
@@ -3539,8 +3229,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 50,
 						EndLine:   50,
-						StartPos:  1148,
-						EndPos:    1163,
+						StartPos:  1056,
+						EndPos:    1071,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -3548,8 +3238,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 50,
 							EndLine:   50,
-							StartPos:  1148,
-							EndPos:    1162,
+							StartPos:  1056,
+							EndPos:    1070,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -3558,8 +3248,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 50,
 									EndLine:   50,
-									StartPos:  1149,
-									EndPos:    1154,
+									StartPos:  1057,
+									EndPos:    1062,
 								},
 							},
 							Value: []byte("test "),
@@ -3569,8 +3259,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 50,
 									EndLine:   50,
-									StartPos:  1154,
-									EndPos:    1161,
+									StartPos:  1062,
+									EndPos:    1069,
 								},
 							},
 							VarName: &ast.ExprVariable{
@@ -3578,8 +3268,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 50,
 										EndLine:   50,
-										StartPos:  1156,
-										EndPos:    1160,
+										StartPos:  1064,
+										EndPos:    1068,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -3587,8 +3277,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 50,
 											EndLine:   50,
-											StartPos:  1156,
-											EndPos:    1160,
+											StartPos:  1064,
+											EndPos:    1068,
 										},
 									},
 									Value: []byte("$foo"),
@@ -3603,8 +3293,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 51,
 						EndLine:   51,
-						StartPos:  1166,
-						EndPos:    1187,
+						StartPos:  1072,
+						EndPos:    1093,
 					},
 				},
 				Expr: &ast.ScalarEncapsed{
@@ -3612,8 +3302,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 51,
 							EndLine:   51,
-							StartPos:  1166,
-							EndPos:    1186,
+							StartPos:  1072,
+							EndPos:    1092,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -3622,8 +3312,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 51,
 									EndLine:   51,
-									StartPos:  1167,
-									EndPos:    1172,
+									StartPos:  1073,
+									EndPos:    1078,
 								},
 							},
 							Value: []byte("test "),
@@ -3633,8 +3323,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 51,
 									EndLine:   51,
-									StartPos:  1173,
-									EndPos:    1184,
+									StartPos:  1079,
+									EndPos:    1090,
 								},
 							},
 							Var: &ast.ExprVariable{
@@ -3642,8 +3332,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 51,
 										EndLine:   51,
-										StartPos:  1173,
-										EndPos:    1177,
+										StartPos:  1079,
+										EndPos:    1083,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -3651,8 +3341,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 51,
 											EndLine:   51,
-											StartPos:  1173,
-											EndPos:    1177,
+											StartPos:  1079,
+											EndPos:    1083,
 										},
 									},
 									Value: []byte("$foo"),
@@ -3663,8 +3353,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 51,
 										EndLine:   51,
-										StartPos:  1179,
-										EndPos:    1182,
+										StartPos:  1085,
+										EndPos:    1088,
 									},
 								},
 								Value: []byte("bar"),
@@ -3674,8 +3364,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 51,
 										EndLine:   51,
-										StartPos:  1182,
-										EndPos:    1184,
+										StartPos:  1088,
+										EndPos:    1090,
 									},
 								},
 							},
@@ -3688,8 +3378,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 53,
 						EndLine:   54,
-						StartPos:  1191,
-						EndPos:    1209,
+						StartPos:  1095,
+						EndPos:    1111,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -3697,8 +3387,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 53,
 							EndLine:   53,
-							StartPos:  1195,
-							EndPos:    1197,
+							StartPos:  1099,
+							EndPos:    1101,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -3706,8 +3396,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 53,
 								EndLine:   53,
-								StartPos:  1195,
-								EndPos:    1197,
+								StartPos:  1099,
+								EndPos:    1101,
 							},
 						},
 						Value: []byte("$a"),
@@ -3730,8 +3420,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 55,
 						EndLine:   57,
-						StartPos:  1212,
-						EndPos:    1245,
+						StartPos:  1112,
+						EndPos:    1141,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -3739,8 +3429,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 55,
 							EndLine:   55,
-							StartPos:  1216,
-							EndPos:    1218,
+							StartPos:  1116,
+							EndPos:    1118,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -3748,8 +3438,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 55,
 								EndLine:   55,
-								StartPos:  1216,
-								EndPos:    1218,
+								StartPos:  1116,
+								EndPos:    1118,
 							},
 						},
 						Value: []byte("$a"),
@@ -3772,7 +3462,7 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 56,
 								EndLine:   -1,
-								StartPos:  1224,
+								StartPos:  1122,
 								EndPos:    -1,
 							},
 						},
@@ -3781,8 +3471,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 56,
 									EndLine:   56,
-									StartPos:  1232,
-									EndPos:    1234,
+									StartPos:  1130,
+									EndPos:    1132,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -3790,8 +3480,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 56,
 										EndLine:   56,
-										StartPos:  1232,
-										EndPos:    1234,
+										StartPos:  1130,
+										EndPos:    1132,
 									},
 								},
 								Value: []byte("$b"),
@@ -3816,8 +3506,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 58,
 						EndLine:   60,
-						StartPos:  1248,
-						EndPos:    1274,
+						StartPos:  1142,
+						EndPos:    1164,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -3825,8 +3515,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 58,
 							EndLine:   58,
-							StartPos:  1252,
-							EndPos:    1254,
+							StartPos:  1146,
+							EndPos:    1148,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -3834,8 +3524,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 58,
 								EndLine:   58,
-								StartPos:  1252,
-								EndPos:    1254,
+								StartPos:  1146,
+								EndPos:    1148,
 							},
 						},
 						Value: []byte("$a"),
@@ -3857,7 +3547,7 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 59,
 							EndLine:   -1,
-							StartPos:  1260,
+							StartPos:  1152,
 							EndPos:    -1,
 						},
 					},
@@ -3879,8 +3569,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 61,
 						EndLine:   65,
-						StartPos:  1277,
-						EndPos:    1333,
+						StartPos:  1165,
+						EndPos:    1213,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -3888,8 +3578,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 61,
 							EndLine:   61,
-							StartPos:  1281,
-							EndPos:    1283,
+							StartPos:  1169,
+							EndPos:    1171,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -3897,8 +3587,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 61,
 								EndLine:   61,
-								StartPos:  1281,
-								EndPos:    1283,
+								StartPos:  1169,
+								EndPos:    1171,
 							},
 						},
 						Value: []byte("$a"),
@@ -3921,7 +3611,7 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 62,
 								EndLine:   -1,
-								StartPos:  1289,
+								StartPos:  1175,
 								EndPos:    -1,
 							},
 						},
@@ -3930,8 +3620,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 62,
 									EndLine:   62,
-									StartPos:  1297,
-									EndPos:    1299,
+									StartPos:  1183,
+									EndPos:    1185,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -3939,8 +3629,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 62,
 										EndLine:   62,
-										StartPos:  1297,
-										EndPos:    1299,
+										StartPos:  1183,
+										EndPos:    1185,
 									},
 								},
 								Value: []byte("$b"),
@@ -3963,7 +3653,7 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 63,
 								EndLine:   -1,
-								StartPos:  1304,
+								StartPos:  1188,
 								EndPos:    -1,
 							},
 						},
@@ -3972,8 +3662,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 63,
 									EndLine:   63,
-									StartPos:  1312,
-									EndPos:    1314,
+									StartPos:  1196,
+									EndPos:    1198,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -3981,8 +3671,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 63,
 										EndLine:   63,
-										StartPos:  1312,
-										EndPos:    1314,
+										StartPos:  1196,
+										EndPos:    1198,
 									},
 								},
 								Value: []byte("$c"),
@@ -4006,7 +3696,7 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 64,
 							EndLine:   -1,
-							StartPos:  1319,
+							StartPos:  1201,
 							EndPos:    -1,
 						},
 					},
@@ -4028,8 +3718,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 67,
 						EndLine:   67,
-						StartPos:  1337,
-						EndPos:    1357,
+						StartPos:  1215,
+						EndPos:    1235,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -4037,8 +3727,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 67,
 							EndLine:   67,
-							StartPos:  1344,
-							EndPos:    1345,
+							StartPos:  1222,
+							EndPos:    1223,
 						},
 					},
 					Value: []byte("1"),
@@ -4048,8 +3738,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 67,
 							EndLine:   67,
-							StartPos:  1347,
-							EndPos:    1357,
+							StartPos:  1225,
+							EndPos:    1235,
 						},
 					},
 					Stmts: []ast.Vertex{
@@ -4058,8 +3748,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 67,
 									EndLine:   67,
-									StartPos:  1349,
-									EndPos:    1355,
+									StartPos:  1227,
+									EndPos:    1233,
 								},
 							},
 						},
@@ -4071,8 +3761,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 68,
 						EndLine:   68,
-						StartPos:  1360,
-						EndPos:    1382,
+						StartPos:  1236,
+						EndPos:    1258,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -4080,8 +3770,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 68,
 							EndLine:   68,
-							StartPos:  1367,
-							EndPos:    1368,
+							StartPos:  1243,
+							EndPos:    1244,
 						},
 					},
 					Value: []byte("1"),
@@ -4091,8 +3781,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 68,
 							EndLine:   68,
-							StartPos:  1370,
-							EndPos:    1382,
+							StartPos:  1246,
+							EndPos:    1258,
 						},
 					},
 					Stmts: []ast.Vertex{
@@ -4101,8 +3791,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 68,
 									EndLine:   68,
-									StartPos:  1372,
-									EndPos:    1380,
+									StartPos:  1248,
+									EndPos:    1256,
 								},
 							},
 							Expr: &ast.ScalarLnumber{
@@ -4110,8 +3800,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 68,
 										EndLine:   68,
-										StartPos:  1378,
-										EndPos:    1379,
+										StartPos:  1254,
+										EndPos:    1255,
 									},
 								},
 								Value: []byte("2"),
@@ -4125,8 +3815,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 69,
 						EndLine:   69,
-						StartPos:  1385,
-						EndPos:    1416,
+						StartPos:  1259,
+						EndPos:    1290,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -4134,8 +3824,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 69,
 							EndLine:   69,
-							StartPos:  1392,
-							EndPos:    1393,
+							StartPos:  1266,
+							EndPos:    1267,
 						},
 					},
 					Value: []byte("1"),
@@ -4145,8 +3835,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 69,
 							EndLine:   69,
-							StartPos:  1397,
-							EndPos:    1406,
+							StartPos:  1271,
+							EndPos:    1280,
 						},
 					},
 					Stmts: []ast.Vertex{
@@ -4155,8 +3845,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 69,
 									EndLine:   69,
-									StartPos:  1397,
-									EndPos:    1406,
+									StartPos:  1271,
+									EndPos:    1280,
 								},
 							},
 							Expr: &ast.ScalarLnumber{
@@ -4164,8 +3854,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 69,
 										EndLine:   69,
-										StartPos:  1403,
-										EndPos:    1404,
+										StartPos:  1277,
+										EndPos:    1278,
 									},
 								},
 								Value: []byte("3"),
@@ -4179,8 +3869,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 70,
 						EndLine:   70,
-						StartPos:  1419,
-						EndPos:    1462,
+						StartPos:  1291,
+						EndPos:    1334,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -4188,8 +3878,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 70,
 							EndLine:   70,
-							StartPos:  1425,
-							EndPos:    1428,
+							StartPos:  1297,
+							EndPos:    1300,
 						},
 					},
 					Value: []byte("foo"),
@@ -4200,8 +3890,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 70,
 								EndLine:   70,
-								StartPos:  1430,
-								EndPos:    1460,
+								StartPos:  1302,
+								EndPos:    1332,
 							},
 						},
 						Modifiers: []ast.Vertex{
@@ -4210,8 +3900,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 70,
 										EndLine:   70,
-										StartPos:  1430,
-										EndPos:    1436,
+										StartPos:  1302,
+										EndPos:    1308,
 									},
 								},
 								Value: []byte("public"),
@@ -4223,8 +3913,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 70,
 										EndLine:   70,
-										StartPos:  1443,
-										EndPos:    1450,
+										StartPos:  1315,
+										EndPos:    1322,
 									},
 								},
 								ConstantName: &ast.Identifier{
@@ -4232,8 +3922,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 70,
 											EndLine:   70,
-											StartPos:  1443,
-											EndPos:    1446,
+											StartPos:  1315,
+											EndPos:    1318,
 										},
 									},
 									Value: []byte("FOO"),
@@ -4243,8 +3933,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 70,
 											EndLine:   70,
-											StartPos:  1449,
-											EndPos:    1450,
+											StartPos:  1321,
+											EndPos:    1322,
 										},
 									},
 									Value: []byte("1"),
@@ -4255,8 +3945,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 70,
 										EndLine:   70,
-										StartPos:  1452,
-										EndPos:    1459,
+										StartPos:  1324,
+										EndPos:    1331,
 									},
 								},
 								ConstantName: &ast.Identifier{
@@ -4264,8 +3954,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 70,
 											EndLine:   70,
-											StartPos:  1452,
-											EndPos:    1455,
+											StartPos:  1324,
+											EndPos:    1327,
 										},
 									},
 									Value: []byte("BAR"),
@@ -4275,8 +3965,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 70,
 											EndLine:   70,
-											StartPos:  1458,
-											EndPos:    1459,
+											StartPos:  1330,
+											EndPos:    1331,
 										},
 									},
 									Value: []byte("2"),
@@ -4291,8 +3981,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 71,
 						EndLine:   71,
-						StartPos:  1465,
-						EndPos:    1501,
+						StartPos:  1335,
+						EndPos:    1371,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -4300,8 +3990,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 71,
 							EndLine:   71,
-							StartPos:  1471,
-							EndPos:    1474,
+							StartPos:  1341,
+							EndPos:    1344,
 						},
 					},
 					Value: []byte("foo"),
@@ -4312,8 +4002,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 71,
 								EndLine:   71,
-								StartPos:  1476,
-								EndPos:    1499,
+								StartPos:  1346,
+								EndPos:    1369,
 							},
 						},
 						Consts: []ast.Vertex{
@@ -4322,8 +4012,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 71,
 										EndLine:   71,
-										StartPos:  1482,
-										EndPos:    1489,
+										StartPos:  1352,
+										EndPos:    1359,
 									},
 								},
 								ConstantName: &ast.Identifier{
@@ -4331,8 +4021,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 71,
 											EndLine:   71,
-											StartPos:  1482,
-											EndPos:    1485,
+											StartPos:  1352,
+											EndPos:    1355,
 										},
 									},
 									Value: []byte("FOO"),
@@ -4342,8 +4032,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 71,
 											EndLine:   71,
-											StartPos:  1488,
-											EndPos:    1489,
+											StartPos:  1358,
+											EndPos:    1359,
 										},
 									},
 									Value: []byte("1"),
@@ -4354,8 +4044,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 71,
 										EndLine:   71,
-										StartPos:  1491,
-										EndPos:    1498,
+										StartPos:  1361,
+										EndPos:    1368,
 									},
 								},
 								ConstantName: &ast.Identifier{
@@ -4363,8 +4053,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 71,
 											EndLine:   71,
-											StartPos:  1491,
-											EndPos:    1494,
+											StartPos:  1361,
+											EndPos:    1364,
 										},
 									},
 									Value: []byte("BAR"),
@@ -4374,8 +4064,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 71,
 											EndLine:   71,
-											StartPos:  1497,
-											EndPos:    1498,
+											StartPos:  1367,
+											EndPos:    1368,
 										},
 									},
 									Value: []byte("2"),
@@ -4390,8 +4080,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 72,
 						EndLine:   72,
-						StartPos:  1504,
-						EndPos:    1534,
+						StartPos:  1372,
+						EndPos:    1402,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -4399,8 +4089,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 72,
 							EndLine:   72,
-							StartPos:  1510,
-							EndPos:    1513,
+							StartPos:  1378,
+							EndPos:    1381,
 						},
 					},
 					Value: []byte("foo"),
@@ -4411,18 +4101,17 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 72,
 								EndLine:   72,
-								StartPos:  1515,
-								EndPos:    1532,
+								StartPos:  1383,
+								EndPos:    1400,
 							},
 						},
-						ReturnsRef: false,
 						MethodName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 72,
 									EndLine:   72,
-									StartPos:  1524,
-									EndPos:    1527,
+									StartPos:  1392,
+									EndPos:    1395,
 								},
 							},
 							Value: []byte("bar"),
@@ -4432,8 +4121,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 72,
 									EndLine:   72,
-									StartPos:  1530,
-									EndPos:    1532,
+									StartPos:  1398,
+									EndPos:    1400,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -4446,8 +4135,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 73,
 						EndLine:   73,
-						StartPos:  1537,
-						EndPos:    1582,
+						StartPos:  1403,
+						EndPos:    1448,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -4455,8 +4144,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 73,
 							EndLine:   73,
-							StartPos:  1543,
-							EndPos:    1546,
+							StartPos:  1409,
+							EndPos:    1412,
 						},
 					},
 					Value: []byte("foo"),
@@ -4467,8 +4156,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 73,
 								EndLine:   73,
-								StartPos:  1548,
-								EndPos:    1580,
+								StartPos:  1414,
+								EndPos:    1446,
 							},
 						},
 						ReturnsRef: true,
@@ -4477,8 +4166,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 73,
 									EndLine:   73,
-									StartPos:  1572,
-									EndPos:    1575,
+									StartPos:  1438,
+									EndPos:    1441,
 								},
 							},
 							Value: []byte("bar"),
@@ -4489,8 +4178,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 73,
 										EndLine:   73,
-										StartPos:  1548,
-										EndPos:    1554,
+										StartPos:  1414,
+										EndPos:    1420,
 									},
 								},
 								Value: []byte("public"),
@@ -4500,8 +4189,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 73,
 										EndLine:   73,
-										StartPos:  1555,
-										EndPos:    1561,
+										StartPos:  1421,
+										EndPos:    1427,
 									},
 								},
 								Value: []byte("static"),
@@ -4512,8 +4201,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 73,
 									EndLine:   73,
-									StartPos:  1578,
-									EndPos:    1580,
+									StartPos:  1444,
+									EndPos:    1446,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -4526,8 +4215,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 74,
 						EndLine:   74,
-						StartPos:  1585,
-						EndPos:    1636,
+						StartPos:  1449,
+						EndPos:    1500,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -4535,8 +4224,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 74,
 							EndLine:   74,
-							StartPos:  1591,
-							EndPos:    1594,
+							StartPos:  1455,
+							EndPos:    1458,
 						},
 					},
 					Value: []byte("foo"),
@@ -4547,8 +4236,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 74,
 								EndLine:   74,
-								StartPos:  1596,
-								EndPos:    1634,
+								StartPos:  1460,
+								EndPos:    1498,
 							},
 						},
 						ReturnsRef: true,
@@ -4557,8 +4246,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 74,
 									EndLine:   74,
-									StartPos:  1620,
-									EndPos:    1623,
+									StartPos:  1484,
+									EndPos:    1487,
 								},
 							},
 							Value: []byte("bar"),
@@ -4569,8 +4258,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 74,
 										EndLine:   74,
-										StartPos:  1596,
-										EndPos:    1602,
+										StartPos:  1460,
+										EndPos:    1466,
 									},
 								},
 								Value: []byte("public"),
@@ -4580,8 +4269,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 74,
 										EndLine:   74,
-										StartPos:  1603,
-										EndPos:    1609,
+										StartPos:  1467,
+										EndPos:    1473,
 									},
 								},
 								Value: []byte("static"),
@@ -4592,8 +4281,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 74,
 									EndLine:   74,
-									StartPos:  1627,
-									EndPos:    1631,
+									StartPos:  1491,
+									EndPos:    1495,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -4602,8 +4291,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 74,
 											EndLine:   74,
-											StartPos:  1627,
-											EndPos:    1631,
+											StartPos:  1491,
+											EndPos:    1495,
 										},
 									},
 									Value: []byte("void"),
@@ -4615,8 +4304,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 74,
 									EndLine:   74,
-									StartPos:  1632,
-									EndPos:    1634,
+									StartPos:  1496,
+									EndPos:    1498,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -4629,8 +4318,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 75,
 						EndLine:   75,
-						StartPos:  1639,
-						EndPos:    1660,
+						StartPos:  1501,
+						EndPos:    1522,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -4638,8 +4327,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 75,
 							EndLine:   75,
-							StartPos:  1654,
-							EndPos:    1657,
+							StartPos:  1516,
+							EndPos:    1519,
 						},
 					},
 					Value: []byte("foo"),
@@ -4650,8 +4339,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 75,
 								EndLine:   75,
-								StartPos:  1639,
-								EndPos:    1647,
+								StartPos:  1501,
+								EndPos:    1509,
 							},
 						},
 						Value: []byte("abstract"),
@@ -4664,8 +4353,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 76,
 						EndLine:   76,
-						StartPos:  1663,
-						EndPos:    1694,
+						StartPos:  1523,
+						EndPos:    1554,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -4673,8 +4362,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 76,
 							EndLine:   76,
-							StartPos:  1675,
-							EndPos:    1678,
+							StartPos:  1535,
+							EndPos:    1538,
 						},
 					},
 					Value: []byte("foo"),
@@ -4685,8 +4374,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 76,
 								EndLine:   76,
-								StartPos:  1663,
-								EndPos:    1668,
+								StartPos:  1523,
+								EndPos:    1528,
 							},
 						},
 						Value: []byte("final"),
@@ -4697,8 +4386,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 76,
 							EndLine:   76,
-							StartPos:  1679,
-							EndPos:    1690,
+							StartPos:  1539,
+							EndPos:    1550,
 						},
 					},
 					ClassName: &ast.NameName{
@@ -4706,8 +4395,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 76,
 								EndLine:   76,
-								StartPos:  1687,
-								EndPos:    1690,
+								StartPos:  1547,
+								EndPos:    1550,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -4716,8 +4405,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 76,
 										EndLine:   76,
-										StartPos:  1687,
-										EndPos:    1690,
+										StartPos:  1547,
+										EndPos:    1550,
 									},
 								},
 								Value: []byte("bar"),
@@ -4732,8 +4421,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 77,
 						EndLine:   77,
-						StartPos:  1697,
-						EndPos:    1731,
+						StartPos:  1555,
+						EndPos:    1589,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -4741,8 +4430,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 77,
 							EndLine:   77,
-							StartPos:  1709,
-							EndPos:    1712,
+							StartPos:  1567,
+							EndPos:    1570,
 						},
 					},
 					Value: []byte("foo"),
@@ -4753,8 +4442,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 77,
 								EndLine:   77,
-								StartPos:  1697,
-								EndPos:    1702,
+								StartPos:  1555,
+								EndPos:    1560,
 							},
 						},
 						Value: []byte("final"),
@@ -4765,8 +4454,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 77,
 							EndLine:   77,
-							StartPos:  1713,
-							EndPos:    1727,
+							StartPos:  1571,
+							EndPos:    1585,
 						},
 					},
 					InterfaceNames: []ast.Vertex{
@@ -4775,8 +4464,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 77,
 									EndLine:   77,
-									StartPos:  1724,
-									EndPos:    1727,
+									StartPos:  1582,
+									EndPos:    1585,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -4785,8 +4474,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 77,
 											EndLine:   77,
-											StartPos:  1724,
-											EndPos:    1727,
+											StartPos:  1582,
+											EndPos:    1585,
 										},
 									},
 									Value: []byte("bar"),
@@ -4802,8 +4491,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 78,
 						EndLine:   78,
-						StartPos:  1734,
-						EndPos:    1773,
+						StartPos:  1590,
+						EndPos:    1629,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -4811,8 +4500,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 78,
 							EndLine:   78,
-							StartPos:  1746,
-							EndPos:    1749,
+							StartPos:  1602,
+							EndPos:    1605,
 						},
 					},
 					Value: []byte("foo"),
@@ -4823,8 +4512,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 78,
 								EndLine:   78,
-								StartPos:  1734,
-								EndPos:    1739,
+								StartPos:  1590,
+								EndPos:    1595,
 							},
 						},
 						Value: []byte("final"),
@@ -4835,8 +4524,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 78,
 							EndLine:   78,
-							StartPos:  1750,
-							EndPos:    1769,
+							StartPos:  1606,
+							EndPos:    1625,
 						},
 					},
 					InterfaceNames: []ast.Vertex{
@@ -4845,8 +4534,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 78,
 									EndLine:   78,
-									StartPos:  1761,
-									EndPos:    1764,
+									StartPos:  1617,
+									EndPos:    1620,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -4855,8 +4544,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 78,
 											EndLine:   78,
-											StartPos:  1761,
-											EndPos:    1764,
+											StartPos:  1617,
+											EndPos:    1620,
 										},
 									},
 									Value: []byte("bar"),
@@ -4868,8 +4557,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 78,
 									EndLine:   78,
-									StartPos:  1766,
-									EndPos:    1769,
+									StartPos:  1622,
+									EndPos:    1625,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -4878,8 +4567,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 78,
 											EndLine:   78,
-											StartPos:  1766,
-											EndPos:    1769,
+											StartPos:  1622,
+											EndPos:    1625,
 										},
 									},
 									Value: []byte("baz"),
@@ -4895,8 +4584,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 79,
 						EndLine:   79,
-						StartPos:  1776,
-						EndPos:    1824,
+						StartPos:  1630,
+						EndPos:    1678,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -4904,8 +4593,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 79,
 							EndLine:   79,
-							StartPos:  1776,
-							EndPos:    1823,
+							StartPos:  1630,
+							EndPos:    1677,
 						},
 					},
 					Class: &ast.StmtClass{
@@ -4913,8 +4602,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 79,
 								EndLine:   79,
-								StartPos:  1780,
-								EndPos:    1823,
+								StartPos:  1634,
+								EndPos:    1677,
 							},
 						},
 						ArgumentList: &ast.ArgumentList{
@@ -4922,8 +4611,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 79,
 									EndLine:   79,
-									StartPos:  1785,
-									EndPos:    1787,
+									StartPos:  1639,
+									EndPos:    1641,
 								},
 							},
 						},
@@ -4932,8 +4621,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 79,
 									EndLine:   79,
-									StartPos:  1788,
-									EndPos:    1799,
+									StartPos:  1642,
+									EndPos:    1653,
 								},
 							},
 							ClassName: &ast.NameName{
@@ -4941,8 +4630,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 79,
 										EndLine:   79,
-										StartPos:  1796,
-										EndPos:    1799,
+										StartPos:  1650,
+										EndPos:    1653,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -4951,8 +4640,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 79,
 												EndLine:   79,
-												StartPos:  1796,
-												EndPos:    1799,
+												StartPos:  1650,
+												EndPos:    1653,
 											},
 										},
 										Value: []byte("foo"),
@@ -4965,8 +4654,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 79,
 									EndLine:   79,
-									StartPos:  1800,
-									EndPos:    1819,
+									StartPos:  1654,
+									EndPos:    1673,
 								},
 							},
 							InterfaceNames: []ast.Vertex{
@@ -4975,8 +4664,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 79,
 											EndLine:   79,
-											StartPos:  1811,
-											EndPos:    1814,
+											StartPos:  1665,
+											EndPos:    1668,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -4985,8 +4674,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 79,
 													EndLine:   79,
-													StartPos:  1811,
-													EndPos:    1814,
+													StartPos:  1665,
+													EndPos:    1668,
 												},
 											},
 											Value: []byte("bar"),
@@ -4998,8 +4687,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 79,
 											EndLine:   79,
-											StartPos:  1816,
-											EndPos:    1819,
+											StartPos:  1670,
+											EndPos:    1673,
 										},
 									},
 									Parts: []ast.Vertex{
@@ -5008,8 +4697,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 79,
 													EndLine:   79,
-													StartPos:  1816,
-													EndPos:    1819,
+													StartPos:  1670,
+													EndPos:    1673,
 												},
 											},
 											Value: []byte("baz"),
@@ -5027,8 +4716,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 81,
 						EndLine:   81,
-						StartPos:  1828,
-						EndPos:    1851,
+						StartPos:  1680,
+						EndPos:    1703,
 					},
 				},
 				Consts: []ast.Vertex{
@@ -5037,8 +4726,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 81,
 								EndLine:   81,
-								StartPos:  1834,
-								EndPos:    1841,
+								StartPos:  1686,
+								EndPos:    1693,
 							},
 						},
 						ConstantName: &ast.Identifier{
@@ -5046,8 +4735,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 81,
 									EndLine:   81,
-									StartPos:  1834,
-									EndPos:    1837,
+									StartPos:  1686,
+									EndPos:    1689,
 								},
 							},
 							Value: []byte("FOO"),
@@ -5057,8 +4746,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 81,
 									EndLine:   81,
-									StartPos:  1840,
-									EndPos:    1841,
+									StartPos:  1692,
+									EndPos:    1693,
 								},
 							},
 							Value: []byte("1"),
@@ -5069,8 +4758,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 81,
 								EndLine:   81,
-								StartPos:  1843,
-								EndPos:    1850,
+								StartPos:  1695,
+								EndPos:    1702,
 							},
 						},
 						ConstantName: &ast.Identifier{
@@ -5078,8 +4767,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 81,
 									EndLine:   81,
-									StartPos:  1843,
-									EndPos:    1846,
+									StartPos:  1695,
+									EndPos:    1698,
 								},
 							},
 							Value: []byte("BAR"),
@@ -5089,8 +4778,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 81,
 									EndLine:   81,
-									StartPos:  1849,
-									EndPos:    1850,
+									StartPos:  1701,
+									EndPos:    1702,
 								},
 							},
 							Value: []byte("2"),
@@ -5103,8 +4792,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 82,
 						EndLine:   82,
-						StartPos:  1854,
-						EndPos:    1877,
+						StartPos:  1704,
+						EndPos:    1727,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -5112,8 +4801,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 82,
 							EndLine:   82,
-							StartPos:  1861,
-							EndPos:    1862,
+							StartPos:  1711,
+							EndPos:    1712,
 						},
 					},
 					Value: []byte("1"),
@@ -5123,8 +4812,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 82,
 							EndLine:   82,
-							StartPos:  1864,
-							EndPos:    1877,
+							StartPos:  1714,
+							EndPos:    1727,
 						},
 					},
 					Stmts: []ast.Vertex{
@@ -5133,8 +4822,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 82,
 									EndLine:   82,
-									StartPos:  1866,
-									EndPos:    1875,
+									StartPos:  1716,
+									EndPos:    1725,
 								},
 							},
 						},
@@ -5146,8 +4835,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 83,
 						EndLine:   83,
-						StartPos:  1880,
-						EndPos:    1905,
+						StartPos:  1728,
+						EndPos:    1753,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -5155,8 +4844,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 83,
 							EndLine:   83,
-							StartPos:  1887,
-							EndPos:    1888,
+							StartPos:  1735,
+							EndPos:    1736,
 						},
 					},
 					Value: []byte("1"),
@@ -5166,8 +4855,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 83,
 							EndLine:   83,
-							StartPos:  1890,
-							EndPos:    1905,
+							StartPos:  1738,
+							EndPos:    1753,
 						},
 					},
 					Stmts: []ast.Vertex{
@@ -5176,8 +4865,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 83,
 									EndLine:   83,
-									StartPos:  1892,
-									EndPos:    1903,
+									StartPos:  1740,
+									EndPos:    1751,
 								},
 							},
 							Expr: &ast.ScalarLnumber{
@@ -5185,8 +4874,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 83,
 										EndLine:   83,
-										StartPos:  1901,
-										EndPos:    1902,
+										StartPos:  1749,
+										EndPos:    1750,
 									},
 								},
 								Value: []byte("2"),
@@ -5200,8 +4889,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 84,
 						EndLine:   84,
-						StartPos:  1908,
-						EndPos:    1934,
+						StartPos:  1754,
+						EndPos:    1780,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -5209,8 +4898,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 84,
 							EndLine:   84,
-							StartPos:  1915,
-							EndPos:    1916,
+							StartPos:  1761,
+							EndPos:    1762,
 						},
 					},
 					Value: []byte("1"),
@@ -5220,8 +4909,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 84,
 							EndLine:   84,
-							StartPos:  1918,
-							EndPos:    1934,
+							StartPos:  1764,
+							EndPos:    1780,
 						},
 					},
 					Stmts: []ast.Vertex{
@@ -5230,8 +4919,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 84,
 									EndLine:   84,
-									StartPos:  1920,
-									EndPos:    1932,
+									StartPos:  1766,
+									EndPos:    1778,
 								},
 							},
 							Expr: &ast.ScalarLnumber{
@@ -5239,8 +4928,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 84,
 										EndLine:   84,
-										StartPos:  1929,
-										EndPos:    1930,
+										StartPos:  1775,
+										EndPos:    1776,
 									},
 								},
 								Value: []byte("3"),
@@ -5254,19 +4943,18 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 85,
 						EndLine:   85,
-						StartPos:  1937,
-						EndPos:    1954,
+						StartPos:  1781,
+						EndPos:    1798,
 					},
 				},
-				Alt: false,
 				Consts: []ast.Vertex{
 					&ast.StmtConstant{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 85,
 								EndLine:   85,
-								StartPos:  1945,
-								EndPos:    1952,
+								StartPos:  1789,
+								EndPos:    1796,
 							},
 						},
 						ConstantName: &ast.Identifier{
@@ -5274,8 +4962,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 85,
 									EndLine:   85,
-									StartPos:  1945,
-									EndPos:    1950,
+									StartPos:  1789,
+									EndPos:    1794,
 								},
 							},
 							Value: []byte("ticks"),
@@ -5285,8 +4973,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 85,
 									EndLine:   85,
-									StartPos:  1951,
-									EndPos:    1952,
+									StartPos:  1795,
+									EndPos:    1796,
 								},
 							},
 							Value: []byte("1"),
@@ -5298,8 +4986,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 85,
 							EndLine:   85,
-							StartPos:  1953,
-							EndPos:    1954,
+							StartPos:  1797,
+							EndPos:    1798,
 						},
 					},
 				},
@@ -5309,19 +4997,18 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 86,
 						EndLine:   86,
-						StartPos:  1957,
-						EndPos:    1976,
+						StartPos:  1799,
+						EndPos:    1818,
 					},
 				},
-				Alt: false,
 				Consts: []ast.Vertex{
 					&ast.StmtConstant{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 86,
 								EndLine:   86,
-								StartPos:  1965,
-								EndPos:    1972,
+								StartPos:  1807,
+								EndPos:    1814,
 							},
 						},
 						ConstantName: &ast.Identifier{
@@ -5329,8 +5016,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 86,
 									EndLine:   86,
-									StartPos:  1965,
-									EndPos:    1970,
+									StartPos:  1807,
+									EndPos:    1812,
 								},
 							},
 							Value: []byte("ticks"),
@@ -5340,8 +5027,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 86,
 									EndLine:   86,
-									StartPos:  1971,
-									EndPos:    1972,
+									StartPos:  1813,
+									EndPos:    1814,
 								},
 							},
 							Value: []byte("1"),
@@ -5353,8 +5040,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 86,
 							EndLine:   86,
-							StartPos:  1974,
-							EndPos:    1976,
+							StartPos:  1816,
+							EndPos:    1818,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -5365,8 +5052,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 87,
 						EndLine:   87,
-						StartPos:  1979,
-						EndPos:    2008,
+						StartPos:  1819,
+						EndPos:    1848,
 					},
 				},
 				Alt: true,
@@ -5376,8 +5063,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 87,
 								EndLine:   87,
-								StartPos:  1987,
-								EndPos:    1994,
+								StartPos:  1827,
+								EndPos:    1834,
 							},
 						},
 						ConstantName: &ast.Identifier{
@@ -5385,8 +5072,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 87,
 									EndLine:   87,
-									StartPos:  1987,
-									EndPos:    1992,
+									StartPos:  1827,
+									EndPos:    1832,
 								},
 							},
 							Value: []byte("ticks"),
@@ -5396,8 +5083,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 87,
 									EndLine:   87,
-									StartPos:  1993,
-									EndPos:    1994,
+									StartPos:  1833,
+									EndPos:    1834,
 								},
 							},
 							Value: []byte("1"),
@@ -5421,8 +5108,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 88,
 						EndLine:   88,
-						StartPos:  2011,
-						EndPos:    2026,
+						StartPos:  1849,
+						EndPos:    1864,
 					},
 				},
 				Stmt: &ast.StmtStmtList{
@@ -5430,8 +5117,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 88,
 							EndLine:   88,
-							StartPos:  2014,
-							EndPos:    2016,
+							StartPos:  1852,
+							EndPos:    1854,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -5441,8 +5128,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 88,
 							EndLine:   88,
-							StartPos:  2023,
-							EndPos:    2024,
+							StartPos:  1861,
+							EndPos:    1862,
 						},
 					},
 					Value: []byte("1"),
@@ -5453,8 +5140,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 89,
 						EndLine:   89,
-						StartPos:  2029,
-						EndPos:    2040,
+						StartPos:  1865,
+						EndPos:    1876,
 					},
 				},
 				Exprs: []ast.Vertex{
@@ -5463,8 +5150,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 89,
 								EndLine:   89,
-								StartPos:  2034,
-								EndPos:    2036,
+								StartPos:  1870,
+								EndPos:    1872,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -5472,8 +5159,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 89,
 									EndLine:   89,
-									StartPos:  2034,
-									EndPos:    2036,
+									StartPos:  1870,
+									EndPos:    1872,
 								},
 							},
 							Value: []byte("$a"),
@@ -5484,8 +5171,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 89,
 								EndLine:   89,
-								StartPos:  2038,
-								EndPos:    2039,
+								StartPos:  1874,
+								EndPos:    1875,
 							},
 						},
 						Value: []byte("1"),
@@ -5497,8 +5184,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 90,
 						EndLine:   90,
-						StartPos:  2043,
-						EndPos:    2052,
+						StartPos:  1877,
+						EndPos:    1886,
 					},
 				},
 				Exprs: []ast.Vertex{
@@ -5507,8 +5194,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 90,
 								EndLine:   90,
-								StartPos:  2048,
-								EndPos:    2050,
+								StartPos:  1882,
+								EndPos:    1884,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -5516,8 +5203,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 90,
 									EndLine:   90,
-									StartPos:  2048,
-									EndPos:    2050,
+									StartPos:  1882,
+									EndPos:    1884,
 								},
 							},
 							Value: []byte("$a"),
@@ -5530,8 +5217,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 91,
 						EndLine:   91,
-						StartPos:  2055,
-						EndPos:    2090,
+						StartPos:  1887,
+						EndPos:    1922,
 					},
 				},
 				Init: []ast.Vertex{
@@ -5540,8 +5227,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 91,
 								EndLine:   91,
-								StartPos:  2059,
-								EndPos:    2065,
+								StartPos:  1891,
+								EndPos:    1897,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -5549,8 +5236,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 91,
 									EndLine:   91,
-									StartPos:  2059,
-									EndPos:    2061,
+									StartPos:  1891,
+									EndPos:    1893,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -5558,8 +5245,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 91,
 										EndLine:   91,
-										StartPos:  2059,
-										EndPos:    2061,
+										StartPos:  1891,
+										EndPos:    1893,
 									},
 								},
 								Value: []byte("$i"),
@@ -5570,8 +5257,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 91,
 									EndLine:   91,
-									StartPos:  2064,
-									EndPos:    2065,
+									StartPos:  1896,
+									EndPos:    1897,
 								},
 							},
 							Value: []byte("0"),
@@ -5584,8 +5271,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 91,
 								EndLine:   91,
-								StartPos:  2067,
-								EndPos:    2074,
+								StartPos:  1899,
+								EndPos:    1906,
 							},
 						},
 						Left: &ast.ExprVariable{
@@ -5593,8 +5280,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 91,
 									EndLine:   91,
-									StartPos:  2067,
-									EndPos:    2069,
+									StartPos:  1899,
+									EndPos:    1901,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -5602,8 +5289,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 91,
 										EndLine:   91,
-										StartPos:  2067,
-										EndPos:    2069,
+										StartPos:  1899,
+										EndPos:    1901,
 									},
 								},
 								Value: []byte("$i"),
@@ -5614,8 +5301,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 91,
 									EndLine:   91,
-									StartPos:  2072,
-									EndPos:    2074,
+									StartPos:  1904,
+									EndPos:    1906,
 								},
 							},
 							Value: []byte("10"),
@@ -5628,8 +5315,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 91,
 								EndLine:   91,
-								StartPos:  2076,
-								EndPos:    2080,
+								StartPos:  1908,
+								EndPos:    1912,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -5637,8 +5324,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 91,
 									EndLine:   91,
-									StartPos:  2076,
-									EndPos:    2078,
+									StartPos:  1908,
+									EndPos:    1910,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -5646,8 +5333,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 91,
 										EndLine:   91,
-										StartPos:  2076,
-										EndPos:    2078,
+										StartPos:  1908,
+										EndPos:    1910,
 									},
 								},
 								Value: []byte("$i"),
@@ -5659,8 +5346,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 91,
 								EndLine:   91,
-								StartPos:  2082,
-								EndPos:    2086,
+								StartPos:  1914,
+								EndPos:    1918,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -5668,8 +5355,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 91,
 									EndLine:   91,
-									StartPos:  2082,
-									EndPos:    2084,
+									StartPos:  1914,
+									EndPos:    1916,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -5677,8 +5364,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 91,
 										EndLine:   91,
-										StartPos:  2082,
-										EndPos:    2084,
+										StartPos:  1914,
+										EndPos:    1916,
 									},
 								},
 								Value: []byte("$i"),
@@ -5691,8 +5378,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 91,
 							EndLine:   91,
-							StartPos:  2088,
-							EndPos:    2090,
+							StartPos:  1920,
+							EndPos:    1922,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -5703,8 +5390,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 92,
 						EndLine:   92,
-						StartPos:  2093,
-						EndPos:    2129,
+						StartPos:  1923,
+						EndPos:    1959,
 					},
 				},
 				Cond: []ast.Vertex{
@@ -5713,8 +5400,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 92,
 								EndLine:   92,
-								StartPos:  2099,
-								EndPos:    2106,
+								StartPos:  1929,
+								EndPos:    1936,
 							},
 						},
 						Left: &ast.ExprVariable{
@@ -5722,8 +5409,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 92,
 									EndLine:   92,
-									StartPos:  2099,
-									EndPos:    2101,
+									StartPos:  1929,
+									EndPos:    1931,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -5731,8 +5418,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 92,
 										EndLine:   92,
-										StartPos:  2099,
-										EndPos:    2101,
+										StartPos:  1929,
+										EndPos:    1931,
 									},
 								},
 								Value: []byte("$i"),
@@ -5743,8 +5430,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 92,
 									EndLine:   92,
-									StartPos:  2104,
-									EndPos:    2106,
+									StartPos:  1934,
+									EndPos:    1936,
 								},
 							},
 							Value: []byte("10"),
@@ -5757,8 +5444,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 92,
 								EndLine:   92,
-								StartPos:  2108,
-								EndPos:    2112,
+								StartPos:  1938,
+								EndPos:    1942,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -5766,8 +5453,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 92,
 									EndLine:   92,
-									StartPos:  2108,
-									EndPos:    2110,
+									StartPos:  1938,
+									EndPos:    1940,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -5775,8 +5462,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 92,
 										EndLine:   92,
-										StartPos:  2108,
-										EndPos:    2110,
+										StartPos:  1938,
+										EndPos:    1940,
 									},
 								},
 								Value: []byte("$i"),
@@ -5788,8 +5475,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 92,
 								EndLine:   92,
-								StartPos:  2114,
-								EndPos:    2118,
+								StartPos:  1944,
+								EndPos:    1948,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -5797,8 +5484,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 92,
 									EndLine:   92,
-									StartPos:  2114,
-									EndPos:    2116,
+									StartPos:  1944,
+									EndPos:    1946,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -5806,8 +5493,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 92,
 										EndLine:   92,
-										StartPos:  2114,
-										EndPos:    2116,
+										StartPos:  1944,
+										EndPos:    1946,
 									},
 								},
 								Value: []byte("$i"),
@@ -5832,8 +5519,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 93,
 						EndLine:   93,
-						StartPos:  2132,
-						EndPos:    2153,
+						StartPos:  1960,
+						EndPos:    1981,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -5841,8 +5528,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 93,
 							EndLine:   93,
-							StartPos:  2141,
-							EndPos:    2143,
+							StartPos:  1969,
+							EndPos:    1971,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5850,8 +5537,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 93,
 								EndLine:   93,
-								StartPos:  2141,
-								EndPos:    2143,
+								StartPos:  1969,
+								EndPos:    1971,
 							},
 						},
 						Value: []byte("$a"),
@@ -5862,8 +5549,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 93,
 							EndLine:   93,
-							StartPos:  2147,
-							EndPos:    2149,
+							StartPos:  1975,
+							EndPos:    1977,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5871,8 +5558,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 93,
 								EndLine:   93,
-								StartPos:  2147,
-								EndPos:    2149,
+								StartPos:  1975,
+								EndPos:    1977,
 							},
 						},
 						Value: []byte("$v"),
@@ -5883,8 +5570,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 93,
 							EndLine:   93,
-							StartPos:  2151,
-							EndPos:    2153,
+							StartPos:  1979,
+							EndPos:    1981,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -5895,8 +5582,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 94,
 						EndLine:   94,
-						StartPos:  2156,
-						EndPos:    2188,
+						StartPos:  1982,
+						EndPos:    2014,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -5904,8 +5591,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 94,
 							EndLine:   94,
-							StartPos:  2165,
-							EndPos:    2167,
+							StartPos:  1991,
+							EndPos:    1993,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5913,8 +5600,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 94,
 								EndLine:   94,
-								StartPos:  2165,
-								EndPos:    2167,
+								StartPos:  1991,
+								EndPos:    1993,
 							},
 						},
 						Value: []byte("$a"),
@@ -5925,8 +5612,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 94,
 							EndLine:   94,
-							StartPos:  2171,
-							EndPos:    2173,
+							StartPos:  1997,
+							EndPos:    1999,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5934,8 +5621,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 94,
 								EndLine:   94,
-								StartPos:  2171,
-								EndPos:    2173,
+								StartPos:  1997,
+								EndPos:    1999,
 							},
 						},
 						Value: []byte("$v"),
@@ -5958,8 +5645,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 95,
 						EndLine:   95,
-						StartPos:  2191,
-						EndPos:    2218,
+						StartPos:  2015,
+						EndPos:    2042,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -5967,8 +5654,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 95,
 							EndLine:   95,
-							StartPos:  2200,
-							EndPos:    2202,
+							StartPos:  2024,
+							EndPos:    2026,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5976,8 +5663,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 95,
 								EndLine:   95,
-								StartPos:  2200,
-								EndPos:    2202,
+								StartPos:  2024,
+								EndPos:    2026,
 							},
 						},
 						Value: []byte("$a"),
@@ -5988,8 +5675,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 95,
 							EndLine:   95,
-							StartPos:  2206,
-							EndPos:    2208,
+							StartPos:  2030,
+							EndPos:    2032,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -5997,8 +5684,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 95,
 								EndLine:   95,
-								StartPos:  2206,
-								EndPos:    2208,
+								StartPos:  2030,
+								EndPos:    2032,
 							},
 						},
 						Value: []byte("$k"),
@@ -6009,8 +5696,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 95,
 							EndLine:   95,
-							StartPos:  2212,
-							EndPos:    2214,
+							StartPos:  2036,
+							EndPos:    2038,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6018,8 +5705,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 95,
 								EndLine:   95,
-								StartPos:  2212,
-								EndPos:    2214,
+								StartPos:  2036,
+								EndPos:    2038,
 							},
 						},
 						Value: []byte("$v"),
@@ -6030,8 +5717,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 95,
 							EndLine:   95,
-							StartPos:  2216,
-							EndPos:    2218,
+							StartPos:  2040,
+							EndPos:    2042,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -6042,8 +5729,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 96,
 						EndLine:   96,
-						StartPos:  2221,
-						EndPos:    2249,
+						StartPos:  2043,
+						EndPos:    2071,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -6051,8 +5738,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 96,
 							EndLine:   96,
-							StartPos:  2230,
-							EndPos:    2232,
+							StartPos:  2052,
+							EndPos:    2054,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6060,8 +5747,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 96,
 								EndLine:   96,
-								StartPos:  2230,
-								EndPos:    2232,
+								StartPos:  2052,
+								EndPos:    2054,
 							},
 						},
 						Value: []byte("$a"),
@@ -6072,8 +5759,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 96,
 							EndLine:   96,
-							StartPos:  2236,
-							EndPos:    2238,
+							StartPos:  2058,
+							EndPos:    2060,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6081,8 +5768,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 96,
 								EndLine:   96,
-								StartPos:  2236,
-								EndPos:    2238,
+								StartPos:  2058,
+								EndPos:    2060,
 							},
 						},
 						Value: []byte("$k"),
@@ -6093,8 +5780,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 96,
 							EndLine:   96,
-							StartPos:  2242,
-							EndPos:    2245,
+							StartPos:  2064,
+							EndPos:    2067,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -6102,8 +5789,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 96,
 								EndLine:   96,
-								StartPos:  2243,
-								EndPos:    2245,
+								StartPos:  2065,
+								EndPos:    2067,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -6111,8 +5798,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 96,
 									EndLine:   96,
-									StartPos:  2243,
-									EndPos:    2245,
+									StartPos:  2065,
+									EndPos:    2067,
 								},
 							},
 							Value: []byte("$v"),
@@ -6124,8 +5811,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 96,
 							EndLine:   96,
-							StartPos:  2247,
-							EndPos:    2249,
+							StartPos:  2069,
+							EndPos:    2071,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -6136,8 +5823,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 97,
 						EndLine:   97,
-						StartPos:  2252,
-						EndPos:    2285,
+						StartPos:  2072,
+						EndPos:    2105,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -6145,8 +5832,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 97,
 							EndLine:   97,
-							StartPos:  2261,
-							EndPos:    2263,
+							StartPos:  2081,
+							EndPos:    2083,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6154,8 +5841,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 97,
 								EndLine:   97,
-								StartPos:  2261,
-								EndPos:    2263,
+								StartPos:  2081,
+								EndPos:    2083,
 							},
 						},
 						Value: []byte("$a"),
@@ -6166,8 +5853,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 97,
 							EndLine:   97,
-							StartPos:  2267,
-							EndPos:    2269,
+							StartPos:  2087,
+							EndPos:    2089,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6175,8 +5862,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 97,
 								EndLine:   97,
-								StartPos:  2267,
-								EndPos:    2269,
+								StartPos:  2087,
+								EndPos:    2089,
 							},
 						},
 						Value: []byte("$k"),
@@ -6187,8 +5874,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 97,
 							EndLine:   97,
-							StartPos:  2273,
-							EndPos:    2281,
+							StartPos:  2093,
+							EndPos:    2101,
 						},
 					},
 					Items: []ast.Vertex{
@@ -6197,8 +5884,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 97,
 									EndLine:   97,
-									StartPos:  2278,
-									EndPos:    2280,
+									StartPos:  2098,
+									EndPos:    2100,
 								},
 							},
 							Val: &ast.ExprVariable{
@@ -6206,8 +5893,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 97,
 										EndLine:   97,
-										StartPos:  2278,
-										EndPos:    2280,
+										StartPos:  2098,
+										EndPos:    2100,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -6215,8 +5902,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 97,
 											EndLine:   97,
-											StartPos:  2278,
-											EndPos:    2280,
+											StartPos:  2098,
+											EndPos:    2100,
 										},
 									},
 									Value: []byte("$v"),
@@ -6230,8 +5917,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 97,
 							EndLine:   97,
-							StartPos:  2283,
-							EndPos:    2285,
+							StartPos:  2103,
+							EndPos:    2105,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -6242,8 +5929,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 98,
 						EndLine:   98,
-						StartPos:  2288,
-						EndPos:    2317,
+						StartPos:  2106,
+						EndPos:    2135,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -6251,8 +5938,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 98,
 							EndLine:   98,
-							StartPos:  2297,
-							EndPos:    2299,
+							StartPos:  2115,
+							EndPos:    2117,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6260,8 +5947,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 98,
 								EndLine:   98,
-								StartPos:  2297,
-								EndPos:    2299,
+								StartPos:  2115,
+								EndPos:    2117,
 							},
 						},
 						Value: []byte("$a"),
@@ -6272,8 +5959,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 98,
 							EndLine:   98,
-							StartPos:  2303,
-							EndPos:    2305,
+							StartPos:  2121,
+							EndPos:    2123,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6281,8 +5968,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 98,
 								EndLine:   98,
-								StartPos:  2303,
-								EndPos:    2305,
+								StartPos:  2121,
+								EndPos:    2123,
 							},
 						},
 						Value: []byte("$k"),
@@ -6293,8 +5980,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 98,
 							EndLine:   98,
-							StartPos:  2309,
-							EndPos:    2313,
+							StartPos:  2127,
+							EndPos:    2131,
 						},
 					},
 					Items: []ast.Vertex{
@@ -6303,8 +5990,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 98,
 									EndLine:   98,
-									StartPos:  2310,
-									EndPos:    2312,
+									StartPos:  2128,
+									EndPos:    2130,
 								},
 							},
 							Val: &ast.ExprVariable{
@@ -6312,8 +5999,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 98,
 										EndLine:   98,
-										StartPos:  2310,
-										EndPos:    2312,
+										StartPos:  2128,
+										EndPos:    2130,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -6321,8 +6008,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 98,
 											EndLine:   98,
-											StartPos:  2310,
-											EndPos:    2312,
+											StartPos:  2128,
+											EndPos:    2130,
 										},
 									},
 									Value: []byte("$v"),
@@ -6336,8 +6023,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 98,
 							EndLine:   98,
-							StartPos:  2315,
-							EndPos:    2317,
+							StartPos:  2133,
+							EndPos:    2135,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -6348,18 +6035,17 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 99,
 						EndLine:   99,
-						StartPos:  2320,
-						EndPos:    2337,
+						StartPos:  2136,
+						EndPos:    2153,
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 99,
 							EndLine:   99,
-							StartPos:  2329,
-							EndPos:    2332,
+							StartPos:  2145,
+							EndPos:    2148,
 						},
 					},
 					Value: []byte("foo"),
@@ -6371,18 +6057,17 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 100,
 						EndLine:   100,
-						StartPos:  2340,
-						EndPos:    2364,
+						StartPos:  2154,
+						EndPos:    2178,
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 100,
 							EndLine:   100,
-							StartPos:  2349,
-							EndPos:    2352,
+							StartPos:  2163,
+							EndPos:    2166,
 						},
 					},
 					Value: []byte("foo"),
@@ -6393,8 +6078,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 100,
 								EndLine:   100,
-								StartPos:  2356,
-								EndPos:    2363,
+								StartPos:  2170,
+								EndPos:    2177,
 							},
 						},
 					},
@@ -6405,8 +6090,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 101,
 						EndLine:   101,
-						StartPos:  2367,
-						EndPos:    2394,
+						StartPos:  2179,
+						EndPos:    2206,
 					},
 				},
 				ReturnsRef: true,
@@ -6415,8 +6100,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 101,
 							EndLine:   101,
-							StartPos:  2377,
-							EndPos:    2380,
+							StartPos:  2189,
+							EndPos:    2192,
 						},
 					},
 					Value: []byte("foo"),
@@ -6427,8 +6112,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 101,
 								EndLine:   101,
-								StartPos:  2384,
-								EndPos:    2393,
+								StartPos:  2196,
+								EndPos:    2205,
 							},
 						},
 						Expr: &ast.ScalarLnumber{
@@ -6436,8 +6121,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 101,
 									EndLine:   101,
-									StartPos:  2391,
-									EndPos:    2392,
+									StartPos:  2203,
+									EndPos:    2204,
 								},
 							},
 							Value: []byte("1"),
@@ -6450,8 +6135,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 102,
 						EndLine:   102,
-						StartPos:  2397,
-						EndPos:    2421,
+						StartPos:  2207,
+						EndPos:    2231,
 					},
 				},
 				ReturnsRef: true,
@@ -6460,8 +6145,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 102,
 							EndLine:   102,
-							StartPos:  2407,
-							EndPos:    2410,
+							StartPos:  2217,
+							EndPos:    2220,
 						},
 					},
 					Value: []byte("foo"),
@@ -6471,8 +6156,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 102,
 							EndLine:   102,
-							StartPos:  2414,
-							EndPos:    2418,
+							StartPos:  2224,
+							EndPos:    2228,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -6481,8 +6166,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 102,
 									EndLine:   102,
-									StartPos:  2414,
-									EndPos:    2418,
+									StartPos:  2224,
+									EndPos:    2228,
 								},
 							},
 							Value: []byte("void"),
@@ -6496,8 +6181,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 103,
 						EndLine:   103,
-						StartPos:  2424,
-						EndPos:    2438,
+						StartPos:  2232,
+						EndPos:    2246,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -6506,8 +6191,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 103,
 								EndLine:   103,
-								StartPos:  2431,
-								EndPos:    2433,
+								StartPos:  2239,
+								EndPos:    2241,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -6515,8 +6200,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 103,
 									EndLine:   103,
-									StartPos:  2431,
-									EndPos:    2433,
+									StartPos:  2239,
+									EndPos:    2241,
 								},
 							},
 							Value: []byte("$a"),
@@ -6527,8 +6212,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 103,
 								EndLine:   103,
-								StartPos:  2435,
-								EndPos:    2437,
+								StartPos:  2243,
+								EndPos:    2245,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -6536,8 +6221,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 103,
 									EndLine:   103,
-									StartPos:  2435,
-									EndPos:    2437,
+									StartPos:  2243,
+									EndPos:    2245,
 								},
 							},
 							Value: []byte("$b"),
@@ -6550,8 +6235,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 104,
 						EndLine:   104,
-						StartPos:  2441,
-						EndPos:    2443,
+						StartPos:  2247,
+						EndPos:    2249,
 					},
 				},
 				LabelName: &ast.Identifier{
@@ -6559,8 +6244,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 104,
 							EndLine:   104,
-							StartPos:  2441,
-							EndPos:    2442,
+							StartPos:  2247,
+							EndPos:    2248,
 						},
 					},
 					Value: []byte("a"),
@@ -6571,8 +6256,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 105,
 						EndLine:   105,
-						StartPos:  2447,
-						EndPos:    2454,
+						StartPos:  2250,
+						EndPos:    2257,
 					},
 				},
 				Label: &ast.Identifier{
@@ -6580,8 +6265,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 105,
 							EndLine:   105,
-							StartPos:  2452,
-							EndPos:    2453,
+							StartPos:  2255,
+							EndPos:    2256,
 						},
 					},
 					Value: []byte("a"),
@@ -6592,8 +6277,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 106,
 						EndLine:   106,
-						StartPos:  2457,
-						EndPos:    2467,
+						StartPos:  2258,
+						EndPos:    2268,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -6601,8 +6286,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 106,
 							EndLine:   106,
-							StartPos:  2461,
-							EndPos:    2463,
+							StartPos:  2262,
+							EndPos:    2264,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6610,8 +6295,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 106,
 								EndLine:   106,
-								StartPos:  2461,
-								EndPos:    2463,
+								StartPos:  2262,
+								EndPos:    2264,
 							},
 						},
 						Value: []byte("$a"),
@@ -6622,8 +6307,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 106,
 							EndLine:   106,
-							StartPos:  2465,
-							EndPos:    2467,
+							StartPos:  2266,
+							EndPos:    2268,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -6634,8 +6319,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 107,
 						EndLine:   107,
-						StartPos:  2470,
-						EndPos:    2495,
+						StartPos:  2269,
+						EndPos:    2294,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -6643,8 +6328,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 107,
 							EndLine:   107,
-							StartPos:  2474,
-							EndPos:    2476,
+							StartPos:  2273,
+							EndPos:    2275,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6652,8 +6337,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 107,
 								EndLine:   107,
-								StartPos:  2474,
-								EndPos:    2476,
+								StartPos:  2273,
+								EndPos:    2275,
 							},
 						},
 						Value: []byte("$a"),
@@ -6664,8 +6349,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 107,
 							EndLine:   107,
-							StartPos:  2478,
-							EndPos:    2480,
+							StartPos:  2277,
+							EndPos:    2279,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -6676,8 +6361,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 107,
 								EndLine:   107,
-								StartPos:  2481,
-								EndPos:    2495,
+								StartPos:  2280,
+								EndPos:    2294,
 							},
 						},
 						Cond: &ast.ExprVariable{
@@ -6685,8 +6370,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 107,
 									EndLine:   107,
-									StartPos:  2489,
-									EndPos:    2491,
+									StartPos:  2288,
+									EndPos:    2290,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -6694,8 +6379,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 107,
 										EndLine:   107,
-										StartPos:  2489,
-										EndPos:    2491,
+										StartPos:  2288,
+										EndPos:    2290,
 									},
 								},
 								Value: []byte("$b"),
@@ -6706,8 +6391,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 107,
 									EndLine:   107,
-									StartPos:  2493,
-									EndPos:    2495,
+									StartPos:  2292,
+									EndPos:    2294,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -6720,8 +6405,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 108,
 						EndLine:   108,
-						StartPos:  2498,
-						EndPos:    2516,
+						StartPos:  2295,
+						EndPos:    2313,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -6729,8 +6414,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 108,
 							EndLine:   108,
-							StartPos:  2502,
-							EndPos:    2504,
+							StartPos:  2299,
+							EndPos:    2301,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6738,8 +6423,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 108,
 								EndLine:   108,
-								StartPos:  2502,
-								EndPos:    2504,
+								StartPos:  2299,
+								EndPos:    2301,
 							},
 						},
 						Value: []byte("$a"),
@@ -6750,8 +6435,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 108,
 							EndLine:   108,
-							StartPos:  2506,
-							EndPos:    2508,
+							StartPos:  2303,
+							EndPos:    2305,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -6761,8 +6446,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 108,
 							EndLine:   108,
-							StartPos:  2509,
-							EndPos:    2516,
+							StartPos:  2306,
+							EndPos:    2313,
 						},
 					},
 					Stmt: &ast.StmtStmtList{
@@ -6770,8 +6455,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 108,
 								EndLine:   108,
-								StartPos:  2514,
-								EndPos:    2516,
+								StartPos:  2311,
+								EndPos:    2313,
 							},
 						},
 						Stmts: []ast.Vertex{},
@@ -6783,8 +6468,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 109,
 						EndLine:   109,
-						StartPos:  2519,
-						EndPos:    2567,
+						StartPos:  2314,
+						EndPos:    2362,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -6792,8 +6477,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 109,
 							EndLine:   109,
-							StartPos:  2523,
-							EndPos:    2525,
+							StartPos:  2318,
+							EndPos:    2320,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6801,8 +6486,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 109,
 								EndLine:   109,
-								StartPos:  2523,
-								EndPos:    2525,
+								StartPos:  2318,
+								EndPos:    2320,
 							},
 						},
 						Value: []byte("$a"),
@@ -6813,8 +6498,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 109,
 							EndLine:   109,
-							StartPos:  2527,
-							EndPos:    2529,
+							StartPos:  2322,
+							EndPos:    2324,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -6825,8 +6510,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 109,
 								EndLine:   109,
-								StartPos:  2530,
-								EndPos:    2544,
+								StartPos:  2325,
+								EndPos:    2339,
 							},
 						},
 						Cond: &ast.ExprVariable{
@@ -6834,8 +6519,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 109,
 									EndLine:   109,
-									StartPos:  2538,
-									EndPos:    2540,
+									StartPos:  2333,
+									EndPos:    2335,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -6843,8 +6528,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 109,
 										EndLine:   109,
-										StartPos:  2538,
-										EndPos:    2540,
+										StartPos:  2333,
+										EndPos:    2335,
 									},
 								},
 								Value: []byte("$b"),
@@ -6855,8 +6540,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 109,
 									EndLine:   109,
-									StartPos:  2542,
-									EndPos:    2544,
+									StartPos:  2337,
+									EndPos:    2339,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -6867,8 +6552,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 109,
 								EndLine:   109,
-								StartPos:  2545,
-								EndPos:    2559,
+								StartPos:  2340,
+								EndPos:    2354,
 							},
 						},
 						Cond: &ast.ExprVariable{
@@ -6876,8 +6561,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 109,
 									EndLine:   109,
-									StartPos:  2553,
-									EndPos:    2555,
+									StartPos:  2348,
+									EndPos:    2350,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -6885,8 +6570,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 109,
 										EndLine:   109,
-										StartPos:  2553,
-										EndPos:    2555,
+										StartPos:  2348,
+										EndPos:    2350,
 									},
 								},
 								Value: []byte("$c"),
@@ -6897,8 +6582,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 109,
 									EndLine:   109,
-									StartPos:  2557,
-									EndPos:    2559,
+									StartPos:  2352,
+									EndPos:    2354,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -6910,8 +6595,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 109,
 							EndLine:   109,
-							StartPos:  2560,
-							EndPos:    2567,
+							StartPos:  2355,
+							EndPos:    2362,
 						},
 					},
 					Stmt: &ast.StmtStmtList{
@@ -6919,8 +6604,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 109,
 								EndLine:   109,
-								StartPos:  2565,
-								EndPos:    2567,
+								StartPos:  2360,
+								EndPos:    2362,
 							},
 						},
 						Stmts: []ast.Vertex{},
@@ -6932,8 +6617,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 110,
 						EndLine:   110,
-						StartPos:  2570,
-						EndPos:    2619,
+						StartPos:  2363,
+						EndPos:    2412,
 					},
 				},
 				Cond: &ast.ExprVariable{
@@ -6941,8 +6626,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 110,
 							EndLine:   110,
-							StartPos:  2574,
-							EndPos:    2576,
+							StartPos:  2367,
+							EndPos:    2369,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -6950,8 +6635,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 110,
 								EndLine:   110,
-								StartPos:  2574,
-								EndPos:    2576,
+								StartPos:  2367,
+								EndPos:    2369,
 							},
 						},
 						Value: []byte("$a"),
@@ -6962,8 +6647,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 110,
 							EndLine:   110,
-							StartPos:  2578,
-							EndPos:    2580,
+							StartPos:  2371,
+							EndPos:    2373,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -6974,8 +6659,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 110,
 								EndLine:   110,
-								StartPos:  2581,
-								EndPos:    2595,
+								StartPos:  2374,
+								EndPos:    2388,
 							},
 						},
 						Cond: &ast.ExprVariable{
@@ -6983,8 +6668,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 110,
 									EndLine:   110,
-									StartPos:  2589,
-									EndPos:    2591,
+									StartPos:  2382,
+									EndPos:    2384,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -6992,8 +6677,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 110,
 										EndLine:   110,
-										StartPos:  2589,
-										EndPos:    2591,
+										StartPos:  2382,
+										EndPos:    2384,
 									},
 								},
 								Value: []byte("$b"),
@@ -7004,8 +6689,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 110,
 									EndLine:   110,
-									StartPos:  2593,
-									EndPos:    2595,
+									StartPos:  2386,
+									EndPos:    2388,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -7017,8 +6702,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 110,
 							EndLine:   110,
-							StartPos:  2596,
-							EndPos:    2619,
+							StartPos:  2389,
+							EndPos:    2412,
 						},
 					},
 					Stmt: &ast.StmtIf{
@@ -7026,8 +6711,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 110,
 								EndLine:   110,
-								StartPos:  2601,
-								EndPos:    2619,
+								StartPos:  2394,
+								EndPos:    2412,
 							},
 						},
 						Cond: &ast.ExprVariable{
@@ -7035,8 +6720,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 110,
 									EndLine:   110,
-									StartPos:  2605,
-									EndPos:    2607,
+									StartPos:  2398,
+									EndPos:    2400,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -7044,8 +6729,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 110,
 										EndLine:   110,
-										StartPos:  2605,
-										EndPos:    2607,
+										StartPos:  2398,
+										EndPos:    2400,
 									},
 								},
 								Value: []byte("$c"),
@@ -7056,8 +6741,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 110,
 									EndLine:   110,
-									StartPos:  2609,
-									EndPos:    2611,
+									StartPos:  2402,
+									EndPos:    2404,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -7067,8 +6752,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 110,
 									EndLine:   110,
-									StartPos:  2612,
-									EndPos:    2619,
+									StartPos:  2405,
+									EndPos:    2412,
 								},
 							},
 							Stmt: &ast.StmtStmtList{
@@ -7076,8 +6761,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 110,
 										EndLine:   110,
-										StartPos:  2617,
-										EndPos:    2619,
+										StartPos:  2410,
+										EndPos:    2412,
 									},
 								},
 								Stmts: []ast.Vertex{},
@@ -7091,8 +6776,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 111,
 						EndLine:   111,
-						StartPos:  2622,
-						EndPos:    2624,
+						StartPos:  2413,
+						EndPos:    2415,
 					},
 				},
 			},
@@ -7101,8 +6786,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 111,
 						EndLine:   111,
-						StartPos:  2624,
-						EndPos:    2637,
+						StartPos:  2415,
+						EndPos:    2428,
 					},
 				},
 				Value: []byte(" <div></div> "),
@@ -7112,8 +6797,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 112,
 						EndLine:   112,
-						StartPos:  2642,
-						EndPos:    2658,
+						StartPos:  2431,
+						EndPos:    2447,
 					},
 				},
 				InterfaceName: &ast.Identifier{
@@ -7121,8 +6806,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 112,
 							EndLine:   112,
-							StartPos:  2652,
-							EndPos:    2655,
+							StartPos:  2441,
+							EndPos:    2444,
 						},
 					},
 					Value: []byte("Foo"),
@@ -7134,8 +6819,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 113,
 						EndLine:   113,
-						StartPos:  2661,
-						EndPos:    2689,
+						StartPos:  2448,
+						EndPos:    2476,
 					},
 				},
 				InterfaceName: &ast.Identifier{
@@ -7143,8 +6828,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 113,
 							EndLine:   113,
-							StartPos:  2671,
-							EndPos:    2674,
+							StartPos:  2458,
+							EndPos:    2461,
 						},
 					},
 					Value: []byte("Foo"),
@@ -7154,8 +6839,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 113,
 							EndLine:   113,
-							StartPos:  2675,
-							EndPos:    2686,
+							StartPos:  2462,
+							EndPos:    2473,
 						},
 					},
 					InterfaceNames: []ast.Vertex{
@@ -7164,8 +6849,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 113,
 									EndLine:   113,
-									StartPos:  2683,
-									EndPos:    2686,
+									StartPos:  2470,
+									EndPos:    2473,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -7174,8 +6859,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 113,
 											EndLine:   113,
-											StartPos:  2683,
-											EndPos:    2686,
+											StartPos:  2470,
+											EndPos:    2473,
 										},
 									},
 									Value: []byte("Bar"),
@@ -7191,8 +6876,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 114,
 						EndLine:   114,
-						StartPos:  2692,
-						EndPos:    2725,
+						StartPos:  2477,
+						EndPos:    2510,
 					},
 				},
 				InterfaceName: &ast.Identifier{
@@ -7200,8 +6885,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 114,
 							EndLine:   114,
-							StartPos:  2702,
-							EndPos:    2705,
+							StartPos:  2487,
+							EndPos:    2490,
 						},
 					},
 					Value: []byte("Foo"),
@@ -7211,8 +6896,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 114,
 							EndLine:   114,
-							StartPos:  2706,
-							EndPos:    2722,
+							StartPos:  2491,
+							EndPos:    2507,
 						},
 					},
 					InterfaceNames: []ast.Vertex{
@@ -7221,8 +6906,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 114,
 									EndLine:   114,
-									StartPos:  2714,
-									EndPos:    2717,
+									StartPos:  2499,
+									EndPos:    2502,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -7231,8 +6916,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 114,
 											EndLine:   114,
-											StartPos:  2714,
-											EndPos:    2717,
+											StartPos:  2499,
+											EndPos:    2502,
 										},
 									},
 									Value: []byte("Bar"),
@@ -7244,8 +6929,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 114,
 									EndLine:   114,
-									StartPos:  2719,
-									EndPos:    2722,
+									StartPos:  2504,
+									EndPos:    2507,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -7254,8 +6939,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 114,
 											EndLine:   114,
-											StartPos:  2719,
-											EndPos:    2722,
+											StartPos:  2504,
+											EndPos:    2507,
 										},
 									},
 									Value: []byte("Baz"),
@@ -7271,8 +6956,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 115,
 						EndLine:   115,
-						StartPos:  2728,
-						EndPos:    2742,
+						StartPos:  2511,
+						EndPos:    2525,
 					},
 				},
 				NamespaceName: &ast.NameName{
@@ -7280,8 +6965,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 115,
 							EndLine:   115,
-							StartPos:  2738,
-							EndPos:    2741,
+							StartPos:  2521,
+							EndPos:    2524,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -7290,8 +6975,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 115,
 									EndLine:   115,
-									StartPos:  2738,
-									EndPos:    2741,
+									StartPos:  2521,
+									EndPos:    2524,
 								},
 							},
 							Value: []byte("Foo"),
@@ -7304,8 +6989,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 116,
 						EndLine:   116,
-						StartPos:  2745,
-						EndPos:    2761,
+						StartPos:  2526,
+						EndPos:    2542,
 					},
 				},
 				NamespaceName: &ast.NameName{
@@ -7313,8 +6998,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 116,
 							EndLine:   116,
-							StartPos:  2755,
-							EndPos:    2758,
+							StartPos:  2536,
+							EndPos:    2539,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -7323,8 +7008,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 116,
 									EndLine:   116,
-									StartPos:  2755,
-									EndPos:    2758,
+									StartPos:  2536,
+									EndPos:    2539,
 								},
 							},
 							Value: []byte("Foo"),
@@ -7338,8 +7023,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 117,
 						EndLine:   117,
-						StartPos:  2764,
-						EndPos:    2776,
+						StartPos:  2543,
+						EndPos:    2555,
 					},
 				},
 				Stmts: []ast.Vertex{},
@@ -7349,8 +7034,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 118,
 						EndLine:   118,
-						StartPos:  2779,
-						EndPos:    2798,
+						StartPos:  2556,
+						EndPos:    2575,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -7358,8 +7043,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 118,
 							EndLine:   118,
-							StartPos:  2785,
-							EndPos:    2788,
+							StartPos:  2562,
+							EndPos:    2565,
 						},
 					},
 					Value: []byte("foo"),
@@ -7370,8 +7055,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 118,
 								EndLine:   118,
-								StartPos:  2790,
-								EndPos:    2797,
+								StartPos:  2567,
+								EndPos:    2574,
 							},
 						},
 						Modifiers: []ast.Vertex{
@@ -7380,8 +7065,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 118,
 										EndLine:   118,
-										StartPos:  2790,
-										EndPos:    2793,
+										StartPos:  2567,
+										EndPos:    2570,
 									},
 								},
 								Value: []byte("var"),
@@ -7393,8 +7078,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 118,
 										EndLine:   118,
-										StartPos:  2794,
-										EndPos:    2796,
+										StartPos:  2571,
+										EndPos:    2573,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -7402,8 +7087,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 118,
 											EndLine:   118,
-											StartPos:  2794,
-											EndPos:    2796,
+											StartPos:  2571,
+											EndPos:    2573,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -7411,8 +7096,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 118,
 												EndLine:   118,
-												StartPos:  2794,
-												EndPos:    2796,
+												StartPos:  2571,
+												EndPos:    2573,
 											},
 										},
 										Value: []byte("$a"),
@@ -7428,8 +7113,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 119,
 						EndLine:   119,
-						StartPos:  2801,
-						EndPos:    2838,
+						StartPos:  2576,
+						EndPos:    2613,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -7437,8 +7122,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 119,
 							EndLine:   119,
-							StartPos:  2807,
-							EndPos:    2810,
+							StartPos:  2582,
+							EndPos:    2585,
 						},
 					},
 					Value: []byte("foo"),
@@ -7449,8 +7134,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 119,
 								EndLine:   119,
-								StartPos:  2812,
-								EndPos:    2837,
+								StartPos:  2587,
+								EndPos:    2612,
 							},
 						},
 						Modifiers: []ast.Vertex{
@@ -7459,8 +7144,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 119,
 										EndLine:   119,
-										StartPos:  2812,
-										EndPos:    2818,
+										StartPos:  2587,
+										EndPos:    2593,
 									},
 								},
 								Value: []byte("public"),
@@ -7470,8 +7155,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 119,
 										EndLine:   119,
-										StartPos:  2819,
-										EndPos:    2825,
+										StartPos:  2594,
+										EndPos:    2600,
 									},
 								},
 								Value: []byte("static"),
@@ -7483,8 +7168,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 119,
 										EndLine:   119,
-										StartPos:  2826,
-										EndPos:    2828,
+										StartPos:  2601,
+										EndPos:    2603,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -7492,8 +7177,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 119,
 											EndLine:   119,
-											StartPos:  2826,
-											EndPos:    2828,
+											StartPos:  2601,
+											EndPos:    2603,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -7501,8 +7186,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 119,
 												EndLine:   119,
-												StartPos:  2826,
-												EndPos:    2828,
+												StartPos:  2601,
+												EndPos:    2603,
 											},
 										},
 										Value: []byte("$a"),
@@ -7514,8 +7199,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 119,
 										EndLine:   119,
-										StartPos:  2830,
-										EndPos:    2836,
+										StartPos:  2605,
+										EndPos:    2611,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -7523,8 +7208,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 119,
 											EndLine:   119,
-											StartPos:  2830,
-											EndPos:    2832,
+											StartPos:  2605,
+											EndPos:    2607,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -7532,8 +7217,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 119,
 												EndLine:   119,
-												StartPos:  2830,
-												EndPos:    2832,
+												StartPos:  2605,
+												EndPos:    2607,
 											},
 										},
 										Value: []byte("$b"),
@@ -7544,8 +7229,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 119,
 											EndLine:   119,
-											StartPos:  2835,
-											EndPos:    2836,
+											StartPos:  2610,
+											EndPos:    2611,
 										},
 									},
 									Value: []byte("1"),
@@ -7560,8 +7245,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 120,
 						EndLine:   120,
-						StartPos:  2841,
-						EndPos:    2859,
+						StartPos:  2614,
+						EndPos:    2632,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -7570,8 +7255,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 120,
 								EndLine:   120,
-								StartPos:  2848,
-								EndPos:    2850,
+								StartPos:  2621,
+								EndPos:    2623,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -7579,8 +7264,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 120,
 									EndLine:   120,
-									StartPos:  2848,
-									EndPos:    2850,
+									StartPos:  2621,
+									EndPos:    2623,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -7588,8 +7273,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 120,
 										EndLine:   120,
-										StartPos:  2848,
-										EndPos:    2850,
+										StartPos:  2621,
+										EndPos:    2623,
 									},
 								},
 								Value: []byte("$a"),
@@ -7601,8 +7286,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 120,
 								EndLine:   120,
-								StartPos:  2852,
-								EndPos:    2858,
+								StartPos:  2625,
+								EndPos:    2631,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -7610,8 +7295,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 120,
 									EndLine:   120,
-									StartPos:  2852,
-									EndPos:    2854,
+									StartPos:  2625,
+									EndPos:    2627,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -7619,8 +7304,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 120,
 										EndLine:   120,
-										StartPos:  2852,
-										EndPos:    2854,
+										StartPos:  2625,
+										EndPos:    2627,
 									},
 								},
 								Value: []byte("$b"),
@@ -7631,8 +7316,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 120,
 									EndLine:   120,
-									StartPos:  2857,
-									EndPos:    2858,
+									StartPos:  2630,
+									EndPos:    2631,
 								},
 							},
 							Value: []byte("1"),
@@ -7645,8 +7330,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 122,
 						EndLine:   126,
-						StartPos:  2863,
-						EndPos:    2922,
+						StartPos:  2634,
+						EndPos:    2694,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -7654,8 +7339,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 122,
 							EndLine:   122,
-							StartPos:  2871,
-							EndPos:    2872,
+							StartPos:  2642,
+							EndPos:    2643,
 						},
 					},
 					Value: []byte("1"),
@@ -7665,7 +7350,7 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 123,
 							EndLine:   -1,
-							StartPos:  2879,
+							StartPos:  2651,
 							EndPos:    -1,
 						},
 					},
@@ -7675,7 +7360,7 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 123,
 									EndLine:   -1,
-									StartPos:  2879,
+									StartPos:  2651,
 									EndPos:    -1,
 								},
 							},
@@ -7684,8 +7369,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 123,
 										EndLine:   123,
-										StartPos:  2884,
-										EndPos:    2885,
+										StartPos:  2656,
+										EndPos:    2657,
 									},
 								},
 								Value: []byte("1"),
@@ -7697,7 +7382,7 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 124,
 									EndLine:   -1,
-									StartPos:  2890,
+									StartPos:  2663,
 									EndPos:    -1,
 								},
 							},
@@ -7708,7 +7393,7 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 125,
 									EndLine:   -1,
-									StartPos:  2902,
+									StartPos:  2676,
 									EndPos:    -1,
 								},
 							},
@@ -7717,8 +7402,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 125,
 										EndLine:   125,
-										StartPos:  2907,
-										EndPos:    2908,
+										StartPos:  2681,
+										EndPos:    2682,
 									},
 								},
 								Value: []byte("2"),
@@ -7733,8 +7418,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 128,
 						EndLine:   131,
-						StartPos:  2926,
-						EndPos:    2974,
+						StartPos:  2696,
+						EndPos:    2744,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -7742,8 +7427,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 128,
 							EndLine:   128,
-							StartPos:  2934,
-							EndPos:    2935,
+							StartPos:  2704,
+							EndPos:    2705,
 						},
 					},
 					Value: []byte("1"),
@@ -7753,7 +7438,7 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 129,
 							EndLine:   -1,
-							StartPos:  2943,
+							StartPos:  2714,
 							EndPos:    -1,
 						},
 					},
@@ -7763,7 +7448,7 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 129,
 									EndLine:   -1,
-									StartPos:  2943,
+									StartPos:  2714,
 									EndPos:    -1,
 								},
 							},
@@ -7772,8 +7457,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 129,
 										EndLine:   129,
-										StartPos:  2948,
-										EndPos:    2949,
+										StartPos:  2719,
+										EndPos:    2720,
 									},
 								},
 								Value: []byte("1"),
@@ -7785,7 +7470,7 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 130,
 									EndLine:   -1,
-									StartPos:  2954,
+									StartPos:  2726,
 									EndPos:    -1,
 								},
 							},
@@ -7794,8 +7479,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 130,
 										EndLine:   130,
-										StartPos:  2959,
-										EndPos:    2960,
+										StartPos:  2731,
+										EndPos:    2732,
 									},
 								},
 								Value: []byte("2"),
@@ -7810,8 +7495,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 133,
 						EndLine:   136,
-						StartPos:  2980,
-						EndPos:    3032,
+						StartPos:  2746,
+						EndPos:    2798,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -7819,8 +7504,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 133,
 							EndLine:   133,
-							StartPos:  2988,
-							EndPos:    2989,
+							StartPos:  2754,
+							EndPos:    2755,
 						},
 					},
 					Value: []byte("1"),
@@ -7830,8 +7515,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 133,
 							EndLine:   136,
-							StartPos:  2991,
-							EndPos:    3032,
+							StartPos:  2757,
+							EndPos:    2798,
 						},
 					},
 					Cases: []ast.Vertex{
@@ -7840,8 +7525,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 134,
 									EndLine:   134,
-									StartPos:  2996,
-									EndPos:    3010,
+									StartPos:  2763,
+									EndPos:    2777,
 								},
 							},
 							Cond: &ast.ScalarLnumber{
@@ -7849,8 +7534,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 134,
 										EndLine:   134,
-										StartPos:  3001,
-										EndPos:    3002,
+										StartPos:  2768,
+										EndPos:    2769,
 									},
 								},
 								Value: []byte("1"),
@@ -7861,8 +7546,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 134,
 											EndLine:   134,
-											StartPos:  3004,
-											EndPos:    3010,
+											StartPos:  2771,
+											EndPos:    2777,
 										},
 									},
 								},
@@ -7873,8 +7558,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 135,
 									EndLine:   135,
-									StartPos:  3014,
-									EndPos:    3028,
+									StartPos:  2782,
+									EndPos:    2796,
 								},
 							},
 							Cond: &ast.ScalarLnumber{
@@ -7882,8 +7567,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 135,
 										EndLine:   135,
-										StartPos:  3019,
-										EndPos:    3020,
+										StartPos:  2787,
+										EndPos:    2788,
 									},
 								},
 								Value: []byte("2"),
@@ -7894,8 +7579,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 135,
 											EndLine:   135,
-											StartPos:  3022,
-											EndPos:    3028,
+											StartPos:  2790,
+											EndPos:    2796,
 										},
 									},
 								},
@@ -7909,8 +7594,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 138,
 						EndLine:   141,
-						StartPos:  3038,
-						EndPos:    3091,
+						StartPos:  2800,
+						EndPos:    2853,
 					},
 				},
 				Cond: &ast.ScalarLnumber{
@@ -7918,8 +7603,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 138,
 							EndLine:   138,
-							StartPos:  3046,
-							EndPos:    3047,
+							StartPos:  2808,
+							EndPos:    2809,
 						},
 					},
 					Value: []byte("1"),
@@ -7929,8 +7614,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 138,
 							EndLine:   141,
-							StartPos:  3049,
-							EndPos:    3091,
+							StartPos:  2811,
+							EndPos:    2853,
 						},
 					},
 					Cases: []ast.Vertex{
@@ -7939,8 +7624,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 139,
 									EndLine:   139,
-									StartPos:  3055,
-									EndPos:    3069,
+									StartPos:  2818,
+									EndPos:    2832,
 								},
 							},
 							Cond: &ast.ScalarLnumber{
@@ -7948,8 +7633,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 139,
 										EndLine:   139,
-										StartPos:  3060,
-										EndPos:    3061,
+										StartPos:  2823,
+										EndPos:    2824,
 									},
 								},
 								Value: []byte("1"),
@@ -7960,8 +7645,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 139,
 											EndLine:   139,
-											StartPos:  3063,
-											EndPos:    3069,
+											StartPos:  2826,
+											EndPos:    2832,
 										},
 									},
 								},
@@ -7972,8 +7657,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 140,
 									EndLine:   140,
-									StartPos:  3073,
-									EndPos:    3087,
+									StartPos:  2837,
+									EndPos:    2851,
 								},
 							},
 							Cond: &ast.ScalarLnumber{
@@ -7981,8 +7666,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 140,
 										EndLine:   140,
-										StartPos:  3078,
-										EndPos:    3079,
+										StartPos:  2842,
+										EndPos:    2843,
 									},
 								},
 								Value: []byte("2"),
@@ -7993,8 +7678,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 140,
 											EndLine:   140,
-											StartPos:  3081,
-											EndPos:    3087,
+											StartPos:  2845,
+											EndPos:    2851,
 										},
 									},
 								},
@@ -8008,8 +7693,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 143,
 						EndLine:   143,
-						StartPos:  3095,
-						EndPos:    3104,
+						StartPos:  2855,
+						EndPos:    2864,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -8017,8 +7702,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 143,
 							EndLine:   143,
-							StartPos:  3101,
-							EndPos:    3103,
+							StartPos:  2861,
+							EndPos:    2863,
 						},
 					},
 					VarName: &ast.Identifier{
@@ -8026,8 +7711,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 143,
 								EndLine:   143,
-								StartPos:  3101,
-								EndPos:    3103,
+								StartPos:  2861,
+								EndPos:    2863,
 							},
 						},
 						Value: []byte("$e"),
@@ -8039,8 +7724,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 145,
 						EndLine:   145,
-						StartPos:  3108,
-						EndPos:    3120,
+						StartPos:  2866,
+						EndPos:    2878,
 					},
 				},
 				TraitName: &ast.Identifier{
@@ -8048,8 +7733,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 145,
 							EndLine:   145,
-							StartPos:  3114,
-							EndPos:    3117,
+							StartPos:  2872,
+							EndPos:    2875,
 						},
 					},
 					Value: []byte("Foo"),
@@ -8061,8 +7746,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 146,
 						EndLine:   146,
-						StartPos:  3123,
-						EndPos:    3145,
+						StartPos:  2879,
+						EndPos:    2901,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -8070,8 +7755,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 146,
 							EndLine:   146,
-							StartPos:  3129,
-							EndPos:    3132,
+							StartPos:  2885,
+							EndPos:    2888,
 						},
 					},
 					Value: []byte("Foo"),
@@ -8082,8 +7767,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 146,
 								EndLine:   146,
-								StartPos:  3135,
-								EndPos:    3143,
+								StartPos:  2891,
+								EndPos:    2899,
 							},
 						},
 						Traits: []ast.Vertex{
@@ -8092,8 +7777,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 146,
 										EndLine:   146,
-										StartPos:  3139,
-										EndPos:    3142,
+										StartPos:  2895,
+										EndPos:    2898,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8102,8 +7787,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 146,
 												EndLine:   146,
-												StartPos:  3139,
-												EndPos:    3142,
+												StartPos:  2895,
+												EndPos:    2898,
 											},
 										},
 										Value: []byte("Bar"),
@@ -8116,8 +7801,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 146,
 									EndLine:   146,
-									StartPos:  3142,
-									EndPos:    3143,
+									StartPos:  2898,
+									EndPos:    2899,
 								},
 							},
 						},
@@ -8129,8 +7814,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 147,
 						EndLine:   147,
-						StartPos:  3148,
-						EndPos:    3177,
+						StartPos:  2902,
+						EndPos:    2931,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -8138,8 +7823,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 147,
 							EndLine:   147,
-							StartPos:  3154,
-							EndPos:    3157,
+							StartPos:  2908,
+							EndPos:    2911,
 						},
 					},
 					Value: []byte("Foo"),
@@ -8150,8 +7835,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 147,
 								EndLine:   147,
-								StartPos:  3160,
-								EndPos:    3175,
+								StartPos:  2914,
+								EndPos:    2929,
 							},
 						},
 						Traits: []ast.Vertex{
@@ -8160,8 +7845,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 147,
 										EndLine:   147,
-										StartPos:  3164,
-										EndPos:    3167,
+										StartPos:  2918,
+										EndPos:    2921,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8170,8 +7855,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 147,
 												EndLine:   147,
-												StartPos:  3164,
-												EndPos:    3167,
+												StartPos:  2918,
+												EndPos:    2921,
 											},
 										},
 										Value: []byte("Bar"),
@@ -8183,8 +7868,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 147,
 										EndLine:   147,
-										StartPos:  3169,
-										EndPos:    3172,
+										StartPos:  2923,
+										EndPos:    2926,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8193,8 +7878,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 147,
 												EndLine:   147,
-												StartPos:  3169,
-												EndPos:    3172,
+												StartPos:  2923,
+												EndPos:    2926,
 											},
 										},
 										Value: []byte("Baz"),
@@ -8207,8 +7892,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 147,
 									EndLine:   147,
-									StartPos:  3173,
-									EndPos:    3175,
+									StartPos:  2927,
+									EndPos:    2929,
 								},
 							},
 						},
@@ -8220,8 +7905,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 148,
 						EndLine:   148,
-						StartPos:  3180,
-						EndPos:    3226,
+						StartPos:  2932,
+						EndPos:    2978,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -8229,8 +7914,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 148,
 							EndLine:   148,
-							StartPos:  3186,
-							EndPos:    3189,
+							StartPos:  2938,
+							EndPos:    2941,
 						},
 					},
 					Value: []byte("Foo"),
@@ -8241,8 +7926,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 148,
 								EndLine:   148,
-								StartPos:  3192,
-								EndPos:    3224,
+								StartPos:  2944,
+								EndPos:    2976,
 							},
 						},
 						Traits: []ast.Vertex{
@@ -8251,8 +7936,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 148,
 										EndLine:   148,
-										StartPos:  3196,
-										EndPos:    3199,
+										StartPos:  2948,
+										EndPos:    2951,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8261,8 +7946,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 148,
 												EndLine:   148,
-												StartPos:  3196,
-												EndPos:    3199,
+												StartPos:  2948,
+												EndPos:    2951,
 											},
 										},
 										Value: []byte("Bar"),
@@ -8274,8 +7959,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 148,
 										EndLine:   148,
-										StartPos:  3201,
-										EndPos:    3204,
+										StartPos:  2953,
+										EndPos:    2956,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8284,8 +7969,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 148,
 												EndLine:   148,
-												StartPos:  3201,
-												EndPos:    3204,
+												StartPos:  2953,
+												EndPos:    2956,
 											},
 										},
 										Value: []byte("Baz"),
@@ -8298,8 +7983,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 148,
 									EndLine:   148,
-									StartPos:  3205,
-									EndPos:    3224,
+									StartPos:  2957,
+									EndPos:    2976,
 								},
 							},
 							Adaptations: []ast.Vertex{
@@ -8308,8 +7993,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 148,
 											EndLine:   148,
-											StartPos:  3207,
-											EndPos:    3221,
+											StartPos:  2959,
+											EndPos:    2973,
 										},
 									},
 									Ref: &ast.StmtTraitMethodRef{
@@ -8317,8 +8002,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 148,
 												EndLine:   148,
-												StartPos:  3207,
-												EndPos:    3210,
+												StartPos:  2959,
+												EndPos:    2962,
 											},
 										},
 										Method: &ast.Identifier{
@@ -8326,8 +8011,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 148,
 													EndLine:   148,
-													StartPos:  3207,
-													EndPos:    3210,
+													StartPos:  2959,
+													EndPos:    2962,
 												},
 											},
 											Value: []byte("one"),
@@ -8338,8 +8023,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 148,
 												EndLine:   148,
-												StartPos:  3214,
-												EndPos:    3221,
+												StartPos:  2966,
+												EndPos:    2973,
 											},
 										},
 										Value: []byte("include"),
@@ -8355,8 +8040,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 149,
 						EndLine:   149,
-						StartPos:  3229,
-						EndPos:    3274,
+						StartPos:  2979,
+						EndPos:    3024,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -8364,8 +8049,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 149,
 							EndLine:   149,
-							StartPos:  3235,
-							EndPos:    3238,
+							StartPos:  2985,
+							EndPos:    2988,
 						},
 					},
 					Value: []byte("Foo"),
@@ -8376,8 +8061,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 149,
 								EndLine:   149,
-								StartPos:  3241,
-								EndPos:    3272,
+								StartPos:  2991,
+								EndPos:    3022,
 							},
 						},
 						Traits: []ast.Vertex{
@@ -8386,8 +8071,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 149,
 										EndLine:   149,
-										StartPos:  3245,
-										EndPos:    3248,
+										StartPos:  2995,
+										EndPos:    2998,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8396,8 +8081,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 149,
 												EndLine:   149,
-												StartPos:  3245,
-												EndPos:    3248,
+												StartPos:  2995,
+												EndPos:    2998,
 											},
 										},
 										Value: []byte("Bar"),
@@ -8409,8 +8094,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 149,
 										EndLine:   149,
-										StartPos:  3250,
-										EndPos:    3253,
+										StartPos:  3000,
+										EndPos:    3003,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8419,8 +8104,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 149,
 												EndLine:   149,
-												StartPos:  3250,
-												EndPos:    3253,
+												StartPos:  3000,
+												EndPos:    3003,
 											},
 										},
 										Value: []byte("Baz"),
@@ -8433,8 +8118,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 149,
 									EndLine:   149,
-									StartPos:  3254,
-									EndPos:    3272,
+									StartPos:  3004,
+									EndPos:    3022,
 								},
 							},
 							Adaptations: []ast.Vertex{
@@ -8443,8 +8128,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 149,
 											EndLine:   149,
-											StartPos:  3256,
-											EndPos:    3269,
+											StartPos:  3006,
+											EndPos:    3019,
 										},
 									},
 									Ref: &ast.StmtTraitMethodRef{
@@ -8452,8 +8137,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 149,
 												EndLine:   149,
-												StartPos:  3256,
-												EndPos:    3259,
+												StartPos:  3006,
+												EndPos:    3009,
 											},
 										},
 										Method: &ast.Identifier{
@@ -8461,8 +8146,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 149,
 													EndLine:   149,
-													StartPos:  3256,
-													EndPos:    3259,
+													StartPos:  3006,
+													EndPos:    3009,
 												},
 											},
 											Value: []byte("one"),
@@ -8473,8 +8158,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 149,
 												EndLine:   149,
-												StartPos:  3263,
-												EndPos:    3269,
+												StartPos:  3013,
+												EndPos:    3019,
 											},
 										},
 										Value: []byte("public"),
@@ -8490,8 +8175,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 150,
 						EndLine:   150,
-						StartPos:  3277,
-						EndPos:    3326,
+						StartPos:  3025,
+						EndPos:    3074,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -8499,8 +8184,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 150,
 							EndLine:   150,
-							StartPos:  3283,
-							EndPos:    3286,
+							StartPos:  3031,
+							EndPos:    3034,
 						},
 					},
 					Value: []byte("Foo"),
@@ -8511,8 +8196,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 150,
 								EndLine:   150,
-								StartPos:  3289,
-								EndPos:    3324,
+								StartPos:  3037,
+								EndPos:    3072,
 							},
 						},
 						Traits: []ast.Vertex{
@@ -8521,8 +8206,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 150,
 										EndLine:   150,
-										StartPos:  3293,
-										EndPos:    3296,
+										StartPos:  3041,
+										EndPos:    3044,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8531,8 +8216,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 150,
 												EndLine:   150,
-												StartPos:  3293,
-												EndPos:    3296,
+												StartPos:  3041,
+												EndPos:    3044,
 											},
 										},
 										Value: []byte("Bar"),
@@ -8544,8 +8229,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 150,
 										EndLine:   150,
-										StartPos:  3298,
-										EndPos:    3301,
+										StartPos:  3046,
+										EndPos:    3049,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8554,8 +8239,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 150,
 												EndLine:   150,
-												StartPos:  3298,
-												EndPos:    3301,
+												StartPos:  3046,
+												EndPos:    3049,
 											},
 										},
 										Value: []byte("Baz"),
@@ -8568,8 +8253,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 150,
 									EndLine:   150,
-									StartPos:  3302,
-									EndPos:    3324,
+									StartPos:  3050,
+									EndPos:    3072,
 								},
 							},
 							Adaptations: []ast.Vertex{
@@ -8578,8 +8263,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 150,
 											EndLine:   150,
-											StartPos:  3304,
-											EndPos:    3321,
+											StartPos:  3052,
+											EndPos:    3069,
 										},
 									},
 									Ref: &ast.StmtTraitMethodRef{
@@ -8587,8 +8272,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 150,
 												EndLine:   150,
-												StartPos:  3304,
-												EndPos:    3307,
+												StartPos:  3052,
+												EndPos:    3055,
 											},
 										},
 										Method: &ast.Identifier{
@@ -8596,8 +8281,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 150,
 													EndLine:   150,
-													StartPos:  3304,
-													EndPos:    3307,
+													StartPos:  3052,
+													EndPos:    3055,
 												},
 											},
 											Value: []byte("one"),
@@ -8608,8 +8293,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 150,
 												EndLine:   150,
-												StartPos:  3311,
-												EndPos:    3317,
+												StartPos:  3059,
+												EndPos:    3065,
 											},
 										},
 										Value: []byte("public"),
@@ -8619,8 +8304,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 150,
 												EndLine:   150,
-												StartPos:  3318,
-												EndPos:    3321,
+												StartPos:  3066,
+												EndPos:    3069,
 											},
 										},
 										Value: []byte("two"),
@@ -8636,8 +8321,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 151,
 						EndLine:   151,
-						StartPos:  3329,
-						EndPos:    3406,
+						StartPos:  3075,
+						EndPos:    3152,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -8645,8 +8330,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 151,
 							EndLine:   151,
-							StartPos:  3335,
-							EndPos:    3338,
+							StartPos:  3081,
+							EndPos:    3084,
 						},
 					},
 					Value: []byte("Foo"),
@@ -8657,8 +8342,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 151,
 								EndLine:   151,
-								StartPos:  3341,
-								EndPos:    3404,
+								StartPos:  3087,
+								EndPos:    3150,
 							},
 						},
 						Traits: []ast.Vertex{
@@ -8667,8 +8352,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 151,
 										EndLine:   151,
-										StartPos:  3345,
-										EndPos:    3348,
+										StartPos:  3091,
+										EndPos:    3094,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8677,8 +8362,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 151,
 												EndLine:   151,
-												StartPos:  3345,
-												EndPos:    3348,
+												StartPos:  3091,
+												EndPos:    3094,
 											},
 										},
 										Value: []byte("Bar"),
@@ -8690,8 +8375,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 151,
 										EndLine:   151,
-										StartPos:  3350,
-										EndPos:    3353,
+										StartPos:  3096,
+										EndPos:    3099,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8700,8 +8385,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 151,
 												EndLine:   151,
-												StartPos:  3350,
-												EndPos:    3353,
+												StartPos:  3096,
+												EndPos:    3099,
 											},
 										},
 										Value: []byte("Baz"),
@@ -8714,8 +8399,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 151,
 									EndLine:   151,
-									StartPos:  3354,
-									EndPos:    3404,
+									StartPos:  3100,
+									EndPos:    3150,
 								},
 							},
 							Adaptations: []ast.Vertex{
@@ -8724,8 +8409,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 151,
 											EndLine:   151,
-											StartPos:  3356,
-											EndPos:    3384,
+											StartPos:  3102,
+											EndPos:    3130,
 										},
 									},
 									Ref: &ast.StmtTraitMethodRef{
@@ -8733,8 +8418,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 151,
 												EndLine:   151,
-												StartPos:  3356,
-												EndPos:    3364,
+												StartPos:  3102,
+												EndPos:    3110,
 											},
 										},
 										Trait: &ast.NameName{
@@ -8742,8 +8427,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 151,
 													EndLine:   151,
-													StartPos:  3356,
-													EndPos:    3359,
+													StartPos:  3102,
+													EndPos:    3105,
 												},
 											},
 											Parts: []ast.Vertex{
@@ -8752,8 +8437,8 @@ func TestPhp7(t *testing.T) {
 														Position: &position.Position{
 															StartLine: 151,
 															EndLine:   151,
-															StartPos:  3356,
-															EndPos:    3359,
+															StartPos:  3102,
+															EndPos:    3105,
 														},
 													},
 													Value: []byte("Bar"),
@@ -8765,8 +8450,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 151,
 													EndLine:   151,
-													StartPos:  3361,
-													EndPos:    3364,
+													StartPos:  3107,
+													EndPos:    3110,
 												},
 											},
 											Value: []byte("one"),
@@ -8778,8 +8463,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 151,
 													EndLine:   151,
-													StartPos:  3375,
-													EndPos:    3378,
+													StartPos:  3121,
+													EndPos:    3124,
 												},
 											},
 											Parts: []ast.Vertex{
@@ -8788,8 +8473,8 @@ func TestPhp7(t *testing.T) {
 														Position: &position.Position{
 															StartLine: 151,
 															EndLine:   151,
-															StartPos:  3375,
-															EndPos:    3378,
+															StartPos:  3121,
+															EndPos:    3124,
 														},
 													},
 													Value: []byte("Baz"),
@@ -8801,8 +8486,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 151,
 													EndLine:   151,
-													StartPos:  3380,
-													EndPos:    3384,
+													StartPos:  3126,
+													EndPos:    3130,
 												},
 											},
 											Parts: []ast.Vertex{
@@ -8811,8 +8496,8 @@ func TestPhp7(t *testing.T) {
 														Position: &position.Position{
 															StartLine: 151,
 															EndLine:   151,
-															StartPos:  3380,
-															EndPos:    3384,
+															StartPos:  3126,
+															EndPos:    3130,
 														},
 													},
 													Value: []byte("Quux"),
@@ -8826,8 +8511,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 151,
 											EndLine:   151,
-											StartPos:  3386,
-											EndPos:    3401,
+											StartPos:  3132,
+											EndPos:    3147,
 										},
 									},
 									Ref: &ast.StmtTraitMethodRef{
@@ -8835,8 +8520,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 151,
 												EndLine:   151,
-												StartPos:  3386,
-												EndPos:    3394,
+												StartPos:  3132,
+												EndPos:    3140,
 											},
 										},
 										Trait: &ast.NameName{
@@ -8844,8 +8529,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 151,
 													EndLine:   151,
-													StartPos:  3386,
-													EndPos:    3389,
+													StartPos:  3132,
+													EndPos:    3135,
 												},
 											},
 											Parts: []ast.Vertex{
@@ -8854,8 +8539,8 @@ func TestPhp7(t *testing.T) {
 														Position: &position.Position{
 															StartLine: 151,
 															EndLine:   151,
-															StartPos:  3386,
-															EndPos:    3389,
+															StartPos:  3132,
+															EndPos:    3135,
 														},
 													},
 													Value: []byte("Baz"),
@@ -8867,8 +8552,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 151,
 													EndLine:   151,
-													StartPos:  3391,
-													EndPos:    3394,
+													StartPos:  3137,
+													EndPos:    3140,
 												},
 											},
 											Value: []byte("one"),
@@ -8879,8 +8564,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 151,
 												EndLine:   151,
-												StartPos:  3398,
-												EndPos:    3401,
+												StartPos:  3144,
+												EndPos:    3147,
 											},
 										},
 										Value: []byte("two"),
@@ -8896,7 +8581,7 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 153,
 						EndLine:   -1,
-						StartPos:  3410,
+						StartPos:  3154,
 						EndPos:    -1,
 					},
 				},
@@ -8908,8 +8593,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 154,
 						EndLine:   154,
-						StartPos:  3419,
-						EndPos:    3449,
+						StartPos:  3161,
+						EndPos:    3191,
 					},
 				},
 				Stmts: []ast.Vertex{},
@@ -8919,8 +8604,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 154,
 								EndLine:   154,
-								StartPos:  3426,
-								EndPos:    3449,
+								StartPos:  3168,
+								EndPos:    3191,
 							},
 						},
 						Types: []ast.Vertex{
@@ -8929,8 +8614,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 154,
 										EndLine:   154,
-										StartPos:  3433,
-										EndPos:    3442,
+										StartPos:  3175,
+										EndPos:    3184,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -8939,8 +8624,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 154,
 												EndLine:   154,
-												StartPos:  3433,
-												EndPos:    3442,
+												StartPos:  3175,
+												EndPos:    3184,
 											},
 										},
 										Value: []byte("Exception"),
@@ -8953,8 +8638,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 154,
 									EndLine:   154,
-									StartPos:  3443,
-									EndPos:    3445,
+									StartPos:  3185,
+									EndPos:    3187,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -8962,8 +8647,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 154,
 										EndLine:   154,
-										StartPos:  3443,
-										EndPos:    3445,
+										StartPos:  3185,
+										EndPos:    3187,
 									},
 								},
 								Value: []byte("$e"),
@@ -8978,8 +8663,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 155,
 						EndLine:   155,
-						StartPos:  3452,
-						EndPos:    3499,
+						StartPos:  3192,
+						EndPos:    3239,
 					},
 				},
 				Stmts: []ast.Vertex{},
@@ -8989,8 +8674,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 155,
 								EndLine:   155,
-								StartPos:  3459,
-								EndPos:    3499,
+								StartPos:  3199,
+								EndPos:    3239,
 							},
 						},
 						Types: []ast.Vertex{
@@ -8999,8 +8684,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 155,
 										EndLine:   155,
-										StartPos:  3466,
-										EndPos:    3475,
+										StartPos:  3206,
+										EndPos:    3215,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -9009,8 +8694,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 155,
 												EndLine:   155,
-												StartPos:  3466,
-												EndPos:    3475,
+												StartPos:  3206,
+												EndPos:    3215,
 											},
 										},
 										Value: []byte("Exception"),
@@ -9022,8 +8707,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 155,
 										EndLine:   155,
-										StartPos:  3476,
-										EndPos:    3492,
+										StartPos:  3216,
+										EndPos:    3232,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -9032,8 +8717,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 155,
 												EndLine:   155,
-												StartPos:  3476,
-												EndPos:    3492,
+												StartPos:  3216,
+												EndPos:    3232,
 											},
 										},
 										Value: []byte("RuntimeException"),
@@ -9046,8 +8731,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 155,
 									EndLine:   155,
-									StartPos:  3493,
-									EndPos:    3495,
+									StartPos:  3233,
+									EndPos:    3235,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -9055,8 +8740,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 155,
 										EndLine:   155,
-										StartPos:  3493,
-										EndPos:    3495,
+										StartPos:  3233,
+										EndPos:    3235,
 									},
 								},
 								Value: []byte("$e"),
@@ -9071,8 +8756,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 156,
 						EndLine:   156,
-						StartPos:  3502,
-						EndPos:    3563,
+						StartPos:  3240,
+						EndPos:    3301,
 					},
 				},
 				Stmts: []ast.Vertex{},
@@ -9082,8 +8767,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 156,
 								EndLine:   156,
-								StartPos:  3509,
-								EndPos:    3532,
+								StartPos:  3247,
+								EndPos:    3270,
 							},
 						},
 						Types: []ast.Vertex{
@@ -9092,8 +8777,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 156,
 										EndLine:   156,
-										StartPos:  3516,
-										EndPos:    3525,
+										StartPos:  3254,
+										EndPos:    3263,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -9102,8 +8787,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 156,
 												EndLine:   156,
-												StartPos:  3516,
-												EndPos:    3525,
+												StartPos:  3254,
+												EndPos:    3263,
 											},
 										},
 										Value: []byte("Exception"),
@@ -9116,8 +8801,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 156,
 									EndLine:   156,
-									StartPos:  3526,
-									EndPos:    3528,
+									StartPos:  3264,
+									EndPos:    3266,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -9125,8 +8810,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 156,
 										EndLine:   156,
-										StartPos:  3526,
-										EndPos:    3528,
+										StartPos:  3264,
+										EndPos:    3266,
 									},
 								},
 								Value: []byte("$e"),
@@ -9139,8 +8824,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 156,
 								EndLine:   156,
-								StartPos:  3533,
-								EndPos:    3563,
+								StartPos:  3271,
+								EndPos:    3301,
 							},
 						},
 						Types: []ast.Vertex{
@@ -9149,8 +8834,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 156,
 										EndLine:   156,
-										StartPos:  3540,
-										EndPos:    3556,
+										StartPos:  3278,
+										EndPos:    3294,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -9159,8 +8844,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 156,
 												EndLine:   156,
-												StartPos:  3540,
-												EndPos:    3556,
+												StartPos:  3278,
+												EndPos:    3294,
 											},
 										},
 										Value: []byte("RuntimeException"),
@@ -9173,8 +8858,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 156,
 									EndLine:   156,
-									StartPos:  3557,
-									EndPos:    3559,
+									StartPos:  3295,
+									EndPos:    3297,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -9182,8 +8867,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 156,
 										EndLine:   156,
-										StartPos:  3557,
-										EndPos:    3559,
+										StartPos:  3295,
+										EndPos:    3297,
 									},
 								},
 								Value: []byte("$e"),
@@ -9198,8 +8883,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 157,
 						EndLine:   157,
-						StartPos:  3566,
-						EndPos:    3607,
+						StartPos:  3302,
+						EndPos:    3343,
 					},
 				},
 				Stmts: []ast.Vertex{},
@@ -9209,8 +8894,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 157,
 								EndLine:   157,
-								StartPos:  3573,
-								EndPos:    3596,
+								StartPos:  3309,
+								EndPos:    3332,
 							},
 						},
 						Types: []ast.Vertex{
@@ -9219,8 +8904,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 157,
 										EndLine:   157,
-										StartPos:  3580,
-										EndPos:    3589,
+										StartPos:  3316,
+										EndPos:    3325,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -9229,8 +8914,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 157,
 												EndLine:   157,
-												StartPos:  3580,
-												EndPos:    3589,
+												StartPos:  3316,
+												EndPos:    3325,
 											},
 										},
 										Value: []byte("Exception"),
@@ -9243,8 +8928,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 157,
 									EndLine:   157,
-									StartPos:  3590,
-									EndPos:    3592,
+									StartPos:  3326,
+									EndPos:    3328,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -9252,8 +8937,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 157,
 										EndLine:   157,
-										StartPos:  3590,
-										EndPos:    3592,
+										StartPos:  3326,
+										EndPos:    3328,
 									},
 								},
 								Value: []byte("$e"),
@@ -9267,8 +8952,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 157,
 							EndLine:   157,
-							StartPos:  3597,
-							EndPos:    3607,
+							StartPos:  3333,
+							EndPos:    3343,
 						},
 					},
 					Stmts: []ast.Vertex{},
@@ -9279,8 +8964,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 159,
 						EndLine:   159,
-						StartPos:  3611,
-						EndPos:    3626,
+						StartPos:  3345,
+						EndPos:    3360,
 					},
 				},
 				Vars: []ast.Vertex{
@@ -9289,8 +8974,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 159,
 								EndLine:   159,
-								StartPos:  3617,
-								EndPos:    3619,
+								StartPos:  3351,
+								EndPos:    3353,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -9298,8 +8983,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 159,
 									EndLine:   159,
-									StartPos:  3617,
-									EndPos:    3619,
+									StartPos:  3351,
+									EndPos:    3353,
 								},
 							},
 							Value: []byte("$a"),
@@ -9310,8 +8995,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 159,
 								EndLine:   159,
-								StartPos:  3621,
-								EndPos:    3623,
+								StartPos:  3355,
+								EndPos:    3357,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -9319,8 +9004,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 159,
 									EndLine:   159,
-									StartPos:  3621,
-									EndPos:    3623,
+									StartPos:  3355,
+									EndPos:    3357,
 								},
 							},
 							Value: []byte("$b"),
@@ -9333,8 +9018,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 161,
 						EndLine:   161,
-						StartPos:  3630,
-						EndPos:    3638,
+						StartPos:  3362,
+						EndPos:    3370,
 					},
 				},
 				Uses: []ast.Vertex{
@@ -9343,8 +9028,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 161,
 								EndLine:   161,
-								StartPos:  3634,
-								EndPos:    3637,
+								StartPos:  3366,
+								EndPos:    3369,
 							},
 						},
 						Use: &ast.NameName{
@@ -9352,8 +9037,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 161,
 									EndLine:   161,
-									StartPos:  3634,
-									EndPos:    3637,
+									StartPos:  3366,
+									EndPos:    3369,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9362,8 +9047,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 161,
 											EndLine:   161,
-											StartPos:  3634,
-											EndPos:    3637,
+											StartPos:  3366,
+											EndPos:    3369,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9378,8 +9063,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 162,
 						EndLine:   162,
-						StartPos:  3641,
-						EndPos:    3650,
+						StartPos:  3371,
+						EndPos:    3380,
 					},
 				},
 				Uses: []ast.Vertex{
@@ -9388,8 +9073,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 162,
 								EndLine:   162,
-								StartPos:  3646,
-								EndPos:    3649,
+								StartPos:  3376,
+								EndPos:    3379,
 							},
 						},
 						Use: &ast.NameName{
@@ -9397,8 +9082,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 162,
 									EndLine:   162,
-									StartPos:  3646,
-									EndPos:    3649,
+									StartPos:  3376,
+									EndPos:    3379,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9407,8 +9092,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 162,
 											EndLine:   162,
-											StartPos:  3646,
-											EndPos:    3649,
+											StartPos:  3376,
+											EndPos:    3379,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9423,8 +9108,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 163,
 						EndLine:   163,
-						StartPos:  3653,
-						EndPos:    3669,
+						StartPos:  3381,
+						EndPos:    3397,
 					},
 				},
 				Uses: []ast.Vertex{
@@ -9433,8 +9118,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 163,
 								EndLine:   163,
-								StartPos:  3658,
-								EndPos:    3668,
+								StartPos:  3386,
+								EndPos:    3396,
 							},
 						},
 						Use: &ast.NameName{
@@ -9442,8 +9127,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 163,
 									EndLine:   163,
-									StartPos:  3658,
-									EndPos:    3661,
+									StartPos:  3386,
+									EndPos:    3389,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9452,8 +9137,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 163,
 											EndLine:   163,
-											StartPos:  3658,
-											EndPos:    3661,
+											StartPos:  3386,
+											EndPos:    3389,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9465,8 +9150,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 163,
 									EndLine:   163,
-									StartPos:  3665,
-									EndPos:    3668,
+									StartPos:  3393,
+									EndPos:    3396,
 								},
 							},
 							Value: []byte("Bar"),
@@ -9479,8 +9164,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 164,
 						EndLine:   164,
-						StartPos:  3672,
-						EndPos:    3685,
+						StartPos:  3398,
+						EndPos:    3411,
 					},
 				},
 				Uses: []ast.Vertex{
@@ -9489,8 +9174,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 164,
 								EndLine:   164,
-								StartPos:  3676,
-								EndPos:    3679,
+								StartPos:  3402,
+								EndPos:    3405,
 							},
 						},
 						Use: &ast.NameName{
@@ -9498,8 +9183,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 164,
 									EndLine:   164,
-									StartPos:  3676,
-									EndPos:    3679,
+									StartPos:  3402,
+									EndPos:    3405,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9508,8 +9193,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 164,
 											EndLine:   164,
-											StartPos:  3676,
-											EndPos:    3679,
+											StartPos:  3402,
+											EndPos:    3405,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9522,8 +9207,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 164,
 								EndLine:   164,
-								StartPos:  3681,
-								EndPos:    3684,
+								StartPos:  3407,
+								EndPos:    3410,
 							},
 						},
 						Use: &ast.NameName{
@@ -9531,8 +9216,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 164,
 									EndLine:   164,
-									StartPos:  3681,
-									EndPos:    3684,
+									StartPos:  3407,
+									EndPos:    3410,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9541,8 +9226,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 164,
 											EndLine:   164,
-											StartPos:  3681,
-											EndPos:    3684,
+											StartPos:  3407,
+											EndPos:    3410,
 										},
 									},
 									Value: []byte("Bar"),
@@ -9557,8 +9242,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 165,
 						EndLine:   165,
-						StartPos:  3688,
-						EndPos:    3708,
+						StartPos:  3412,
+						EndPos:    3432,
 					},
 				},
 				Uses: []ast.Vertex{
@@ -9567,8 +9252,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 165,
 								EndLine:   165,
-								StartPos:  3692,
-								EndPos:    3695,
+								StartPos:  3416,
+								EndPos:    3419,
 							},
 						},
 						Use: &ast.NameName{
@@ -9576,8 +9261,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 165,
 									EndLine:   165,
-									StartPos:  3692,
-									EndPos:    3695,
+									StartPos:  3416,
+									EndPos:    3419,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9586,8 +9271,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 165,
 											EndLine:   165,
-											StartPos:  3692,
-											EndPos:    3695,
+											StartPos:  3416,
+											EndPos:    3419,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9600,8 +9285,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 165,
 								EndLine:   165,
-								StartPos:  3697,
-								EndPos:    3707,
+								StartPos:  3421,
+								EndPos:    3431,
 							},
 						},
 						Use: &ast.NameName{
@@ -9609,8 +9294,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 165,
 									EndLine:   165,
-									StartPos:  3697,
-									EndPos:    3700,
+									StartPos:  3421,
+									EndPos:    3424,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9619,8 +9304,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 165,
 											EndLine:   165,
-											StartPos:  3697,
-											EndPos:    3700,
+											StartPos:  3421,
+											EndPos:    3424,
 										},
 									},
 									Value: []byte("Bar"),
@@ -9632,8 +9317,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 165,
 									EndLine:   165,
-									StartPos:  3704,
-									EndPos:    3707,
+									StartPos:  3428,
+									EndPos:    3431,
 								},
 							},
 							Value: []byte("Baz"),
@@ -9646,8 +9331,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 166,
 						EndLine:   166,
-						StartPos:  3711,
-						EndPos:    3734,
+						StartPos:  3433,
+						EndPos:    3456,
 					},
 				},
 				UseType: &ast.Identifier{
@@ -9655,8 +9340,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 166,
 							EndLine:   166,
-							StartPos:  3715,
-							EndPos:    3723,
+							StartPos:  3437,
+							EndPos:    3445,
 						},
 					},
 					Value: []byte("function"),
@@ -9667,8 +9352,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 166,
 								EndLine:   166,
-								StartPos:  3724,
-								EndPos:    3727,
+								StartPos:  3446,
+								EndPos:    3449,
 							},
 						},
 						Use: &ast.NameName{
@@ -9676,8 +9361,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 166,
 									EndLine:   166,
-									StartPos:  3724,
-									EndPos:    3727,
+									StartPos:  3446,
+									EndPos:    3449,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9686,8 +9371,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 166,
 											EndLine:   166,
-											StartPos:  3724,
-											EndPos:    3727,
+											StartPos:  3446,
+											EndPos:    3449,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9700,8 +9385,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 166,
 								EndLine:   166,
-								StartPos:  3730,
-								EndPos:    3733,
+								StartPos:  3452,
+								EndPos:    3455,
 							},
 						},
 						Use: &ast.NameName{
@@ -9709,8 +9394,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 166,
 									EndLine:   166,
-									StartPos:  3730,
-									EndPos:    3733,
+									StartPos:  3452,
+									EndPos:    3455,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9719,8 +9404,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 166,
 											EndLine:   166,
-											StartPos:  3730,
-											EndPos:    3733,
+											StartPos:  3452,
+											EndPos:    3455,
 										},
 									},
 									Value: []byte("Bar"),
@@ -9735,8 +9420,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 167,
 						EndLine:   167,
-						StartPos:  3737,
-						EndPos:    3774,
+						StartPos:  3457,
+						EndPos:    3494,
 					},
 				},
 				UseType: &ast.Identifier{
@@ -9744,8 +9429,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 167,
 							EndLine:   167,
-							StartPos:  3741,
-							EndPos:    3749,
+							StartPos:  3461,
+							EndPos:    3469,
 						},
 					},
 					Value: []byte("function"),
@@ -9756,8 +9441,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 167,
 								EndLine:   167,
-								StartPos:  3750,
-								EndPos:    3760,
+								StartPos:  3470,
+								EndPos:    3480,
 							},
 						},
 						Use: &ast.NameName{
@@ -9765,8 +9450,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 167,
 									EndLine:   167,
-									StartPos:  3750,
-									EndPos:    3753,
+									StartPos:  3470,
+									EndPos:    3473,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9775,8 +9460,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 167,
 											EndLine:   167,
-											StartPos:  3750,
-											EndPos:    3753,
+											StartPos:  3470,
+											EndPos:    3473,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9788,8 +9473,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 167,
 									EndLine:   167,
-									StartPos:  3757,
-									EndPos:    3760,
+									StartPos:  3477,
+									EndPos:    3480,
 								},
 							},
 							Value: []byte("foo"),
@@ -9800,8 +9485,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 167,
 								EndLine:   167,
-								StartPos:  3763,
-								EndPos:    3773,
+								StartPos:  3483,
+								EndPos:    3493,
 							},
 						},
 						Use: &ast.NameName{
@@ -9809,8 +9494,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 167,
 									EndLine:   167,
-									StartPos:  3763,
-									EndPos:    3766,
+									StartPos:  3483,
+									EndPos:    3486,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9819,8 +9504,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 167,
 											EndLine:   167,
-											StartPos:  3763,
-											EndPos:    3766,
+											StartPos:  3483,
+											EndPos:    3486,
 										},
 									},
 									Value: []byte("Bar"),
@@ -9832,8 +9517,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 167,
 									EndLine:   167,
-									StartPos:  3770,
-									EndPos:    3773,
+									StartPos:  3490,
+									EndPos:    3493,
 								},
 							},
 							Value: []byte("bar"),
@@ -9846,8 +9531,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 168,
 						EndLine:   168,
-						StartPos:  3777,
-						EndPos:    3797,
+						StartPos:  3495,
+						EndPos:    3515,
 					},
 				},
 				UseType: &ast.Identifier{
@@ -9855,8 +9540,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 168,
 							EndLine:   168,
-							StartPos:  3781,
-							EndPos:    3786,
+							StartPos:  3499,
+							EndPos:    3504,
 						},
 					},
 					Value: []byte("const"),
@@ -9867,8 +9552,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 168,
 								EndLine:   168,
-								StartPos:  3787,
-								EndPos:    3790,
+								StartPos:  3505,
+								EndPos:    3508,
 							},
 						},
 						Use: &ast.NameName{
@@ -9876,8 +9561,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 168,
 									EndLine:   168,
-									StartPos:  3787,
-									EndPos:    3790,
+									StartPos:  3505,
+									EndPos:    3508,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9886,8 +9571,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 168,
 											EndLine:   168,
-											StartPos:  3787,
-											EndPos:    3790,
+											StartPos:  3505,
+											EndPos:    3508,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9900,8 +9585,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 168,
 								EndLine:   168,
-								StartPos:  3793,
-								EndPos:    3796,
+								StartPos:  3511,
+								EndPos:    3514,
 							},
 						},
 						Use: &ast.NameName{
@@ -9909,8 +9594,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 168,
 									EndLine:   168,
-									StartPos:  3793,
-									EndPos:    3796,
+									StartPos:  3511,
+									EndPos:    3514,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9919,8 +9604,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 168,
 											EndLine:   168,
-											StartPos:  3793,
-											EndPos:    3796,
+											StartPos:  3511,
+											EndPos:    3514,
 										},
 									},
 									Value: []byte("Bar"),
@@ -9935,8 +9620,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 169,
 						EndLine:   169,
-						StartPos:  3800,
-						EndPos:    3834,
+						StartPos:  3516,
+						EndPos:    3550,
 					},
 				},
 				UseType: &ast.Identifier{
@@ -9944,8 +9629,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 169,
 							EndLine:   169,
-							StartPos:  3804,
-							EndPos:    3809,
+							StartPos:  3520,
+							EndPos:    3525,
 						},
 					},
 					Value: []byte("const"),
@@ -9956,8 +9641,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 169,
 								EndLine:   169,
-								StartPos:  3810,
-								EndPos:    3820,
+								StartPos:  3526,
+								EndPos:    3536,
 							},
 						},
 						Use: &ast.NameName{
@@ -9965,8 +9650,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 169,
 									EndLine:   169,
-									StartPos:  3810,
-									EndPos:    3813,
+									StartPos:  3526,
+									EndPos:    3529,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -9975,8 +9660,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 169,
 											EndLine:   169,
-											StartPos:  3810,
-											EndPos:    3813,
+											StartPos:  3526,
+											EndPos:    3529,
 										},
 									},
 									Value: []byte("Foo"),
@@ -9988,8 +9673,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 169,
 									EndLine:   169,
-									StartPos:  3817,
-									EndPos:    3820,
+									StartPos:  3533,
+									EndPos:    3536,
 								},
 							},
 							Value: []byte("foo"),
@@ -10000,8 +9685,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 169,
 								EndLine:   169,
-								StartPos:  3823,
-								EndPos:    3833,
+								StartPos:  3539,
+								EndPos:    3549,
 							},
 						},
 						Use: &ast.NameName{
@@ -10009,8 +9694,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 169,
 									EndLine:   169,
-									StartPos:  3823,
-									EndPos:    3826,
+									StartPos:  3539,
+									EndPos:    3542,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -10019,8 +9704,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 169,
 											EndLine:   169,
-											StartPos:  3823,
-											EndPos:    3826,
+											StartPos:  3539,
+											EndPos:    3542,
 										},
 									},
 									Value: []byte("Bar"),
@@ -10032,8 +9717,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 169,
 									EndLine:   169,
-									StartPos:  3830,
-									EndPos:    3833,
+									StartPos:  3546,
+									EndPos:    3549,
 								},
 							},
 							Value: []byte("bar"),
@@ -10046,8 +9731,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 171,
 						EndLine:   171,
-						StartPos:  3838,
-						EndPos:    3858,
+						StartPos:  3552,
+						EndPos:    3572,
 					},
 				},
 				Prefix: &ast.NameName{
@@ -10055,8 +9740,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 171,
 							EndLine:   171,
-							StartPos:  3843,
-							EndPos:    3846,
+							StartPos:  3557,
+							EndPos:    3560,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -10065,8 +9750,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 171,
 									EndLine:   171,
-									StartPos:  3843,
-									EndPos:    3846,
+									StartPos:  3557,
+									EndPos:    3560,
 								},
 							},
 							Value: []byte("Foo"),
@@ -10079,8 +9764,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 171,
 								EndLine:   171,
-								StartPos:  3848,
-								EndPos:    3851,
+								StartPos:  3562,
+								EndPos:    3565,
 							},
 						},
 						Use: &ast.NameName{
@@ -10088,8 +9773,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 171,
 									EndLine:   171,
-									StartPos:  3848,
-									EndPos:    3851,
+									StartPos:  3562,
+									EndPos:    3565,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -10098,8 +9783,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 171,
 											EndLine:   171,
-											StartPos:  3848,
-											EndPos:    3851,
+											StartPos:  3562,
+											EndPos:    3565,
 										},
 									},
 									Value: []byte("Bar"),
@@ -10112,8 +9797,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 171,
 								EndLine:   171,
-								StartPos:  3853,
-								EndPos:    3856,
+								StartPos:  3567,
+								EndPos:    3570,
 							},
 						},
 						Use: &ast.NameName{
@@ -10121,8 +9806,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 171,
 									EndLine:   171,
-									StartPos:  3853,
-									EndPos:    3856,
+									StartPos:  3567,
+									EndPos:    3570,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -10131,8 +9816,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 171,
 											EndLine:   171,
-											StartPos:  3853,
-											EndPos:    3856,
+											StartPos:  3567,
+											EndPos:    3570,
 										},
 									},
 									Value: []byte("Baz"),
@@ -10147,8 +9832,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 172,
 						EndLine:   172,
-						StartPos:  3861,
-						EndPos:    3888,
+						StartPos:  3573,
+						EndPos:    3600,
 					},
 				},
 				Prefix: &ast.NameName{
@@ -10156,8 +9841,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 172,
 							EndLine:   172,
-							StartPos:  3865,
-							EndPos:    3868,
+							StartPos:  3577,
+							EndPos:    3580,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -10166,8 +9851,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 172,
 									EndLine:   172,
-									StartPos:  3865,
-									EndPos:    3868,
+									StartPos:  3577,
+									EndPos:    3580,
 								},
 							},
 							Value: []byte("Foo"),
@@ -10180,8 +9865,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 172,
 								EndLine:   172,
-								StartPos:  3870,
-								EndPos:    3873,
+								StartPos:  3582,
+								EndPos:    3585,
 							},
 						},
 						Use: &ast.NameName{
@@ -10189,8 +9874,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 172,
 									EndLine:   172,
-									StartPos:  3870,
-									EndPos:    3873,
+									StartPos:  3582,
+									EndPos:    3585,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -10199,8 +9884,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 172,
 											EndLine:   172,
-											StartPos:  3870,
-											EndPos:    3873,
+											StartPos:  3582,
+											EndPos:    3585,
 										},
 									},
 									Value: []byte("Bar"),
@@ -10213,8 +9898,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 172,
 								EndLine:   172,
-								StartPos:  3875,
-								EndPos:    3886,
+								StartPos:  3587,
+								EndPos:    3598,
 							},
 						},
 						Use: &ast.NameName{
@@ -10222,8 +9907,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 172,
 									EndLine:   172,
-									StartPos:  3875,
-									EndPos:    3878,
+									StartPos:  3587,
+									EndPos:    3590,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -10232,8 +9917,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 172,
 											EndLine:   172,
-											StartPos:  3875,
-											EndPos:    3878,
+											StartPos:  3587,
+											EndPos:    3590,
 										},
 									},
 									Value: []byte("Baz"),
@@ -10245,8 +9930,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 172,
 									EndLine:   172,
-									StartPos:  3882,
-									EndPos:    3886,
+									StartPos:  3594,
+									EndPos:    3598,
 								},
 							},
 							Value: []byte("quux"),
@@ -10259,8 +9944,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 173,
 						EndLine:   173,
-						StartPos:  3891,
-						EndPos:    3919,
+						StartPos:  3601,
+						EndPos:    3629,
 					},
 				},
 				UseType: &ast.Identifier{
@@ -10268,8 +9953,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 173,
 							EndLine:   173,
-							StartPos:  3895,
-							EndPos:    3903,
+							StartPos:  3605,
+							EndPos:    3613,
 						},
 					},
 					Value: []byte("function"),
@@ -10279,8 +9964,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 173,
 							EndLine:   173,
-							StartPos:  3904,
-							EndPos:    3907,
+							StartPos:  3614,
+							EndPos:    3617,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -10289,8 +9974,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 173,
 									EndLine:   173,
-									StartPos:  3904,
-									EndPos:    3907,
+									StartPos:  3614,
+									EndPos:    3617,
 								},
 							},
 							Value: []byte("Foo"),
@@ -10303,8 +9988,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 173,
 								EndLine:   173,
-								StartPos:  3909,
-								EndPos:    3912,
+								StartPos:  3619,
+								EndPos:    3622,
 							},
 						},
 						Use: &ast.NameName{
@@ -10312,8 +9997,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 173,
 									EndLine:   173,
-									StartPos:  3909,
-									EndPos:    3912,
+									StartPos:  3619,
+									EndPos:    3622,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -10322,8 +10007,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 173,
 											EndLine:   173,
-											StartPos:  3909,
-											EndPos:    3912,
+											StartPos:  3619,
+											EndPos:    3622,
 										},
 									},
 									Value: []byte("Bar"),
@@ -10336,8 +10021,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 173,
 								EndLine:   173,
-								StartPos:  3914,
-								EndPos:    3917,
+								StartPos:  3624,
+								EndPos:    3627,
 							},
 						},
 						Use: &ast.NameName{
@@ -10345,8 +10030,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 173,
 									EndLine:   173,
-									StartPos:  3914,
-									EndPos:    3917,
+									StartPos:  3624,
+									EndPos:    3627,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -10355,8 +10040,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 173,
 											EndLine:   173,
-											StartPos:  3914,
-											EndPos:    3917,
+											StartPos:  3624,
+											EndPos:    3627,
 										},
 									},
 									Value: []byte("Baz"),
@@ -10371,8 +10056,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 174,
 						EndLine:   174,
-						StartPos:  3922,
-						EndPos:    3948,
+						StartPos:  3630,
+						EndPos:    3656,
 					},
 				},
 				UseType: &ast.Identifier{
@@ -10380,8 +10065,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 174,
 							EndLine:   174,
-							StartPos:  3926,
-							EndPos:    3931,
+							StartPos:  3634,
+							EndPos:    3639,
 						},
 					},
 					Value: []byte("const"),
@@ -10391,8 +10076,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 174,
 							EndLine:   174,
-							StartPos:  3933,
-							EndPos:    3936,
+							StartPos:  3641,
+							EndPos:    3644,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -10401,8 +10086,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 174,
 									EndLine:   174,
-									StartPos:  3933,
-									EndPos:    3936,
+									StartPos:  3641,
+									EndPos:    3644,
 								},
 							},
 							Value: []byte("Foo"),
@@ -10415,8 +10100,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 174,
 								EndLine:   174,
-								StartPos:  3938,
-								EndPos:    3941,
+								StartPos:  3646,
+								EndPos:    3649,
 							},
 						},
 						Use: &ast.NameName{
@@ -10424,8 +10109,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 174,
 									EndLine:   174,
-									StartPos:  3938,
-									EndPos:    3941,
+									StartPos:  3646,
+									EndPos:    3649,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -10434,8 +10119,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 174,
 											EndLine:   174,
-											StartPos:  3938,
-											EndPos:    3941,
+											StartPos:  3646,
+											EndPos:    3649,
 										},
 									},
 									Value: []byte("Bar"),
@@ -10448,8 +10133,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 174,
 								EndLine:   174,
-								StartPos:  3943,
-								EndPos:    3946,
+								StartPos:  3651,
+								EndPos:    3654,
 							},
 						},
 						Use: &ast.NameName{
@@ -10457,8 +10142,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 174,
 									EndLine:   174,
-									StartPos:  3943,
-									EndPos:    3946,
+									StartPos:  3651,
+									EndPos:    3654,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -10467,8 +10152,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 174,
 											EndLine:   174,
-											StartPos:  3943,
-											EndPos:    3946,
+											StartPos:  3651,
+											EndPos:    3654,
 										},
 									},
 									Value: []byte("Baz"),
@@ -10483,8 +10168,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 175,
 						EndLine:   175,
-						StartPos:  3951,
-						EndPos:    3985,
+						StartPos:  3657,
+						EndPos:    3691,
 					},
 				},
 				Prefix: &ast.NameName{
@@ -10492,8 +10177,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 175,
 							EndLine:   175,
-							StartPos:  3955,
-							EndPos:    3958,
+							StartPos:  3661,
+							EndPos:    3664,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -10502,8 +10187,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 175,
 									EndLine:   175,
-									StartPos:  3955,
-									EndPos:    3958,
+									StartPos:  3661,
+									EndPos:    3664,
 								},
 							},
 							Value: []byte("Foo"),
@@ -10516,8 +10201,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 175,
 								EndLine:   175,
-								StartPos:  3966,
-								EndPos:    3969,
+								StartPos:  3672,
+								EndPos:    3675,
 							},
 						},
 						UseType: &ast.Identifier{
@@ -10525,8 +10210,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 175,
 									EndLine:   175,
-									StartPos:  3960,
-									EndPos:    3965,
+									StartPos:  3666,
+									EndPos:    3671,
 								},
 							},
 							Value: []byte("const"),
@@ -10536,8 +10221,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 175,
 									EndLine:   175,
-									StartPos:  3966,
-									EndPos:    3969,
+									StartPos:  3672,
+									EndPos:    3675,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -10546,8 +10231,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 175,
 											EndLine:   175,
-											StartPos:  3966,
-											EndPos:    3969,
+											StartPos:  3672,
+											EndPos:    3675,
 										},
 									},
 									Value: []byte("Bar"),
@@ -10560,8 +10245,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 175,
 								EndLine:   175,
-								StartPos:  3980,
-								EndPos:    3983,
+								StartPos:  3686,
+								EndPos:    3689,
 							},
 						},
 						UseType: &ast.Identifier{
@@ -10569,8 +10254,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 175,
 									EndLine:   175,
-									StartPos:  3971,
-									EndPos:    3979,
+									StartPos:  3677,
+									EndPos:    3685,
 								},
 							},
 							Value: []byte("function"),
@@ -10580,8 +10265,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 175,
 									EndLine:   175,
-									StartPos:  3980,
-									EndPos:    3983,
+									StartPos:  3686,
+									EndPos:    3689,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -10590,8 +10275,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 175,
 											EndLine:   175,
-											StartPos:  3980,
-											EndPos:    3983,
+											StartPos:  3686,
+											EndPos:    3689,
 										},
 									},
 									Value: []byte("Baz"),
@@ -10606,8 +10291,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 177,
 						EndLine:   177,
-						StartPos:  3989,
-						EndPos:    3995,
+						StartPos:  3693,
+						EndPos:    3699,
 					},
 				},
 				Expr: &ast.ExprArrayDimFetch{
@@ -10615,8 +10300,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 177,
 							EndLine:   177,
-							StartPos:  3989,
-							EndPos:    3994,
+							StartPos:  3693,
+							EndPos:    3698,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -10624,8 +10309,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 177,
 								EndLine:   177,
-								StartPos:  3989,
-								EndPos:    3991,
+								StartPos:  3693,
+								EndPos:    3695,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -10633,8 +10318,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 177,
 									EndLine:   177,
-									StartPos:  3989,
-									EndPos:    3991,
+									StartPos:  3693,
+									EndPos:    3695,
 								},
 							},
 							Value: []byte("$a"),
@@ -10645,8 +10330,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 177,
 								EndLine:   177,
-								StartPos:  3992,
-								EndPos:    3993,
+								StartPos:  3696,
+								EndPos:    3697,
 							},
 						},
 						Value: []byte("1"),
@@ -10658,8 +10343,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 178,
 						EndLine:   178,
-						StartPos:  3998,
-						EndPos:    4007,
+						StartPos:  3700,
+						EndPos:    3709,
 					},
 				},
 				Expr: &ast.ExprArrayDimFetch{
@@ -10667,8 +10352,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 178,
 							EndLine:   178,
-							StartPos:  3998,
-							EndPos:    4006,
+							StartPos:  3700,
+							EndPos:    3708,
 						},
 					},
 					Var: &ast.ExprArrayDimFetch{
@@ -10676,8 +10361,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 178,
 								EndLine:   178,
-								StartPos:  3998,
-								EndPos:    4003,
+								StartPos:  3700,
+								EndPos:    3705,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -10685,8 +10370,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 178,
 									EndLine:   178,
-									StartPos:  3998,
-									EndPos:    4000,
+									StartPos:  3700,
+									EndPos:    3702,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -10694,8 +10379,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 178,
 										EndLine:   178,
-										StartPos:  3998,
-										EndPos:    4000,
+										StartPos:  3700,
+										EndPos:    3702,
 									},
 								},
 								Value: []byte("$a"),
@@ -10706,8 +10391,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 178,
 									EndLine:   178,
-									StartPos:  4001,
-									EndPos:    4002,
+									StartPos:  3703,
+									EndPos:    3704,
 								},
 							},
 							Value: []byte("1"),
@@ -10718,8 +10403,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 178,
 								EndLine:   178,
-								StartPos:  4004,
-								EndPos:    4005,
+								StartPos:  3706,
+								EndPos:    3707,
 							},
 						},
 						Value: []byte("2"),
@@ -10731,8 +10416,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 179,
 						EndLine:   179,
-						StartPos:  4010,
-						EndPos:    4018,
+						StartPos:  3710,
+						EndPos:    3718,
 					},
 				},
 				Expr: &ast.ExprArray{
@@ -10740,8 +10425,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 179,
 							EndLine:   179,
-							StartPos:  4010,
-							EndPos:    4017,
+							StartPos:  3710,
+							EndPos:    3717,
 						},
 					},
 					Items: []ast.Vertex{},
@@ -10752,8 +10437,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 180,
 						EndLine:   180,
-						StartPos:  4021,
-						EndPos:    4030,
+						StartPos:  3719,
+						EndPos:    3728,
 					},
 				},
 				Expr: &ast.ExprArray{
@@ -10761,8 +10446,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 180,
 							EndLine:   180,
-							StartPos:  4021,
-							EndPos:    4029,
+							StartPos:  3719,
+							EndPos:    3727,
 						},
 					},
 					Items: []ast.Vertex{
@@ -10771,8 +10456,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 180,
 									EndLine:   180,
-									StartPos:  4027,
-									EndPos:    4028,
+									StartPos:  3725,
+									EndPos:    3726,
 								},
 							},
 							Val: &ast.ScalarLnumber{
@@ -10780,8 +10465,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 180,
 										EndLine:   180,
-										StartPos:  4027,
-										EndPos:    4028,
+										StartPos:  3725,
+										EndPos:    3726,
 									},
 								},
 								Value: []byte("1"),
@@ -10795,8 +10480,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 181,
 						EndLine:   181,
-						StartPos:  4033,
-						EndPos:    4051,
+						StartPos:  3729,
+						EndPos:    3747,
 					},
 				},
 				Expr: &ast.ExprArray{
@@ -10804,8 +10489,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 181,
 							EndLine:   181,
-							StartPos:  4033,
-							EndPos:    4050,
+							StartPos:  3729,
+							EndPos:    3746,
 						},
 					},
 					Items: []ast.Vertex{
@@ -10814,8 +10499,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 181,
 									EndLine:   181,
-									StartPos:  4039,
-									EndPos:    4043,
+									StartPos:  3735,
+									EndPos:    3739,
 								},
 							},
 							Key: &ast.ScalarLnumber{
@@ -10823,8 +10508,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 181,
 										EndLine:   181,
-										StartPos:  4039,
-										EndPos:    4040,
+										StartPos:  3735,
+										EndPos:    3736,
 									},
 								},
 								Value: []byte("1"),
@@ -10834,8 +10519,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 181,
 										EndLine:   181,
-										StartPos:  4042,
-										EndPos:    4043,
+										StartPos:  3738,
+										EndPos:    3739,
 									},
 								},
 								Value: []byte("1"),
@@ -10846,8 +10531,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 181,
 									EndLine:   181,
-									StartPos:  4045,
-									EndPos:    4048,
+									StartPos:  3741,
+									EndPos:    3744,
 								},
 							},
 							Val: &ast.ExprReference{
@@ -10855,8 +10540,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 181,
 										EndLine:   181,
-										StartPos:  4045,
-										EndPos:    4048,
+										StartPos:  3741,
+										EndPos:    3744,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -10864,8 +10549,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 181,
 											EndLine:   181,
-											StartPos:  4046,
-											EndPos:    4048,
+											StartPos:  3742,
+											EndPos:    3744,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -10873,8 +10558,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 181,
 												EndLine:   181,
-												StartPos:  4046,
-												EndPos:    4048,
+												StartPos:  3742,
+												EndPos:    3744,
 											},
 										},
 										Value: []byte("$b"),
@@ -10891,8 +10576,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 182,
 						EndLine:   182,
-						StartPos:  4054,
-						EndPos:    4058,
+						StartPos:  3748,
+						EndPos:    3752,
 					},
 				},
 				Expr: &ast.ExprBitwiseNot{
@@ -10900,8 +10585,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 182,
 							EndLine:   182,
-							StartPos:  4054,
-							EndPos:    4057,
+							StartPos:  3748,
+							EndPos:    3751,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -10909,8 +10594,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 182,
 								EndLine:   182,
-								StartPos:  4055,
-								EndPos:    4057,
+								StartPos:  3749,
+								EndPos:    3751,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -10918,8 +10603,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 182,
 									EndLine:   182,
-									StartPos:  4055,
-									EndPos:    4057,
+									StartPos:  3749,
+									EndPos:    3751,
 								},
 							},
 							Value: []byte("$a"),
@@ -10932,8 +10617,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 183,
 						EndLine:   183,
-						StartPos:  4061,
-						EndPos:    4065,
+						StartPos:  3753,
+						EndPos:    3757,
 					},
 				},
 				Expr: &ast.ExprBooleanNot{
@@ -10941,8 +10626,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 183,
 							EndLine:   183,
-							StartPos:  4061,
-							EndPos:    4064,
+							StartPos:  3753,
+							EndPos:    3756,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -10950,8 +10635,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 183,
 								EndLine:   183,
-								StartPos:  4062,
-								EndPos:    4064,
+								StartPos:  3754,
+								EndPos:    3756,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -10959,8 +10644,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 183,
 									EndLine:   183,
-									StartPos:  4062,
-									EndPos:    4064,
+									StartPos:  3754,
+									EndPos:    3756,
 								},
 							},
 							Value: []byte("$a"),
@@ -10973,8 +10658,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 185,
 						EndLine:   185,
-						StartPos:  4069,
-						EndPos:    4078,
+						StartPos:  3759,
+						EndPos:    3768,
 					},
 				},
 				Expr: &ast.ExprClassConstFetch{
@@ -10982,8 +10667,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 185,
 							EndLine:   185,
-							StartPos:  4069,
-							EndPos:    4077,
+							StartPos:  3759,
+							EndPos:    3767,
 						},
 					},
 					Class: &ast.NameName{
@@ -10991,8 +10676,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 185,
 								EndLine:   185,
-								StartPos:  4069,
-								EndPos:    4072,
+								StartPos:  3759,
+								EndPos:    3762,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11001,8 +10686,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 185,
 										EndLine:   185,
-										StartPos:  4069,
-										EndPos:    4072,
+										StartPos:  3759,
+										EndPos:    3762,
 									},
 								},
 								Value: []byte("Foo"),
@@ -11014,8 +10699,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 185,
 								EndLine:   185,
-								StartPos:  4074,
-								EndPos:    4077,
+								StartPos:  3764,
+								EndPos:    3767,
 							},
 						},
 						Value: []byte("Bar"),
@@ -11027,8 +10712,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 186,
 						EndLine:   186,
-						StartPos:  4081,
-						EndPos:    4091,
+						StartPos:  3769,
+						EndPos:    3779,
 					},
 				},
 				Expr: &ast.ExprClassConstFetch{
@@ -11036,8 +10721,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 186,
 							EndLine:   186,
-							StartPos:  4081,
-							EndPos:    4090,
+							StartPos:  3769,
+							EndPos:    3778,
 						},
 					},
 					Class: &ast.ExprVariable{
@@ -11045,8 +10730,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 186,
 								EndLine:   186,
-								StartPos:  4081,
-								EndPos:    4085,
+								StartPos:  3769,
+								EndPos:    3773,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11054,8 +10739,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 186,
 									EndLine:   186,
-									StartPos:  4081,
-									EndPos:    4085,
+									StartPos:  3769,
+									EndPos:    3773,
 								},
 							},
 							Value: []byte("$foo"),
@@ -11066,8 +10751,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 186,
 								EndLine:   186,
-								StartPos:  4087,
-								EndPos:    4090,
+								StartPos:  3775,
+								EndPos:    3778,
 							},
 						},
 						Value: []byte("Bar"),
@@ -11079,8 +10764,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 187,
 						EndLine:   187,
-						StartPos:  4094,
-						EndPos:    4104,
+						StartPos:  3780,
+						EndPos:    3790,
 					},
 				},
 				Expr: &ast.ExprClone{
@@ -11088,8 +10773,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 187,
 							EndLine:   187,
-							StartPos:  4094,
-							EndPos:    4102,
+							StartPos:  3780,
+							EndPos:    3788,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -11097,8 +10782,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 187,
 								EndLine:   187,
-								StartPos:  4100,
-								EndPos:    4102,
+								StartPos:  3786,
+								EndPos:    3788,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11106,8 +10791,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 187,
 									EndLine:   187,
-									StartPos:  4100,
-									EndPos:    4102,
+									StartPos:  3786,
+									EndPos:    3788,
 								},
 							},
 							Value: []byte("$a"),
@@ -11120,8 +10805,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 188,
 						EndLine:   188,
-						StartPos:  4107,
-						EndPos:    4116,
+						StartPos:  3791,
+						EndPos:    3800,
 					},
 				},
 				Expr: &ast.ExprClone{
@@ -11129,8 +10814,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 188,
 							EndLine:   188,
-							StartPos:  4107,
-							EndPos:    4115,
+							StartPos:  3791,
+							EndPos:    3799,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -11138,8 +10823,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 188,
 								EndLine:   188,
-								StartPos:  4113,
-								EndPos:    4115,
+								StartPos:  3797,
+								EndPos:    3799,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11147,8 +10832,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 188,
 									EndLine:   188,
-									StartPos:  4113,
-									EndPos:    4115,
+									StartPos:  3797,
+									EndPos:    3799,
 								},
 							},
 							Value: []byte("$a"),
@@ -11161,8 +10846,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 189,
 						EndLine:   189,
-						StartPos:  4119,
-						EndPos:    4132,
+						StartPos:  3801,
+						EndPos:    3814,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -11170,13 +10855,11 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 189,
 							EndLine:   189,
-							StartPos:  4119,
-							EndPos:    4131,
+							StartPos:  3801,
+							EndPos:    3813,
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
-					Stmts:      []ast.Vertex{},
+					Stmts: []ast.Vertex{},
 				},
 			},
 			&ast.StmtExpression{
@@ -11184,8 +10867,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 190,
 						EndLine:   190,
-						StartPos:  4135,
-						EndPos:    4169,
+						StartPos:  3815,
+						EndPos:    3849,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -11193,31 +10876,27 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 190,
 							EndLine:   190,
-							StartPos:  4135,
-							EndPos:    4168,
+							StartPos:  3815,
+							EndPos:    3848,
 						},
 					},
-					Static:     false,
-					ReturnsRef: false,
 					Params: []ast.Vertex{
 						&ast.Parameter{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 190,
 									EndLine:   190,
-									StartPos:  4144,
-									EndPos:    4146,
+									StartPos:  3824,
+									EndPos:    3826,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 190,
 										EndLine:   190,
-										StartPos:  4144,
-										EndPos:    4146,
+										StartPos:  3824,
+										EndPos:    3826,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -11225,8 +10904,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 190,
 											EndLine:   190,
-											StartPos:  4144,
-											EndPos:    4146,
+											StartPos:  3824,
+											EndPos:    3826,
 										},
 									},
 									Value: []byte("$a"),
@@ -11238,19 +10917,17 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 190,
 									EndLine:   190,
-									StartPos:  4148,
-									EndPos:    4150,
+									StartPos:  3828,
+									EndPos:    3830,
 								},
 							},
-							ByRef:    false,
-							Variadic: false,
 							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 190,
 										EndLine:   190,
-										StartPos:  4148,
-										EndPos:    4150,
+										StartPos:  3828,
+										EndPos:    3830,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -11258,8 +10935,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 190,
 											EndLine:   190,
-											StartPos:  4148,
-											EndPos:    4150,
+											StartPos:  3828,
+											EndPos:    3830,
 										},
 									},
 									Value: []byte("$b"),
@@ -11272,8 +10949,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 190,
 								EndLine:   190,
-								StartPos:  4152,
-								EndPos:    4165,
+								StartPos:  3832,
+								EndPos:    3845,
 							},
 						},
 						Uses: []ast.Vertex{
@@ -11282,8 +10959,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 190,
 										EndLine:   190,
-										StartPos:  4157,
-										EndPos:    4159,
+										StartPos:  3837,
+										EndPos:    3839,
 									},
 								},
 								VarName: &ast.Identifier{
@@ -11291,8 +10968,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 190,
 											EndLine:   190,
-											StartPos:  4157,
-											EndPos:    4159,
+											StartPos:  3837,
+											EndPos:    3839,
 										},
 									},
 									Value: []byte("$c"),
@@ -11303,8 +10980,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 190,
 										EndLine:   190,
-										StartPos:  4161,
-										EndPos:    4164,
+										StartPos:  3841,
+										EndPos:    3844,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -11312,8 +10989,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 190,
 											EndLine:   190,
-											StartPos:  4162,
-											EndPos:    4164,
+											StartPos:  3842,
+											EndPos:    3844,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -11321,8 +10998,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 190,
 												EndLine:   190,
-												StartPos:  4162,
-												EndPos:    4164,
+												StartPos:  3842,
+												EndPos:    3844,
 											},
 										},
 										Value: []byte("$d"),
@@ -11339,8 +11016,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 191,
 						EndLine:   191,
-						StartPos:  4172,
-						EndPos:    4192,
+						StartPos:  3850,
+						EndPos:    3870,
 					},
 				},
 				Expr: &ast.ExprClosure{
@@ -11348,19 +11025,17 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 191,
 							EndLine:   191,
-							StartPos:  4172,
-							EndPos:    4191,
+							StartPos:  3850,
+							EndPos:    3869,
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
 					ReturnType: &ast.NameName{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 191,
 								EndLine:   191,
-								StartPos:  4184,
-								EndPos:    4188,
+								StartPos:  3862,
+								EndPos:    3866,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11369,8 +11044,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 191,
 										EndLine:   191,
-										StartPos:  4184,
-										EndPos:    4188,
+										StartPos:  3862,
+										EndPos:    3866,
 									},
 								},
 								Value: []byte("void"),
@@ -11385,8 +11060,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 192,
 						EndLine:   192,
-						StartPos:  4195,
-						EndPos:    4199,
+						StartPos:  3871,
+						EndPos:    3875,
 					},
 				},
 				Expr: &ast.ExprConstFetch{
@@ -11394,8 +11069,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 192,
 							EndLine:   192,
-							StartPos:  4195,
-							EndPos:    4198,
+							StartPos:  3871,
+							EndPos:    3874,
 						},
 					},
 					Const: &ast.NameName{
@@ -11403,8 +11078,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 192,
 								EndLine:   192,
-								StartPos:  4195,
-								EndPos:    4198,
+								StartPos:  3871,
+								EndPos:    3874,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11413,8 +11088,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 192,
 										EndLine:   192,
-										StartPos:  4195,
-										EndPos:    4198,
+										StartPos:  3871,
+										EndPos:    3874,
 									},
 								},
 								Value: []byte("foo"),
@@ -11428,8 +11103,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 193,
 						EndLine:   193,
-						StartPos:  4202,
-						EndPos:    4216,
+						StartPos:  3876,
+						EndPos:    3890,
 					},
 				},
 				Expr: &ast.ExprConstFetch{
@@ -11437,8 +11112,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 193,
 							EndLine:   193,
-							StartPos:  4202,
-							EndPos:    4215,
+							StartPos:  3876,
+							EndPos:    3889,
 						},
 					},
 					Const: &ast.NameRelative{
@@ -11446,8 +11121,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 193,
 								EndLine:   193,
-								StartPos:  4202,
-								EndPos:    4215,
+								StartPos:  3876,
+								EndPos:    3889,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11456,8 +11131,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 193,
 										EndLine:   193,
-										StartPos:  4212,
-										EndPos:    4215,
+										StartPos:  3886,
+										EndPos:    3889,
 									},
 								},
 								Value: []byte("foo"),
@@ -11471,8 +11146,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 194,
 						EndLine:   194,
-						StartPos:  4219,
-						EndPos:    4224,
+						StartPos:  3891,
+						EndPos:    3896,
 					},
 				},
 				Expr: &ast.ExprConstFetch{
@@ -11480,8 +11155,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 194,
 							EndLine:   194,
-							StartPos:  4219,
-							EndPos:    4223,
+							StartPos:  3891,
+							EndPos:    3895,
 						},
 					},
 					Const: &ast.NameFullyQualified{
@@ -11489,8 +11164,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 194,
 								EndLine:   194,
-								StartPos:  4219,
-								EndPos:    4223,
+								StartPos:  3891,
+								EndPos:    3895,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11499,8 +11174,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 194,
 										EndLine:   194,
-										StartPos:  4220,
-										EndPos:    4223,
+										StartPos:  3892,
+										EndPos:    3895,
 									},
 								},
 								Value: []byte("foo"),
@@ -11514,8 +11189,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 196,
 						EndLine:   196,
-						StartPos:  4228,
-						EndPos:    4238,
+						StartPos:  3898,
+						EndPos:    3908,
 					},
 				},
 				Expr: &ast.ExprEmpty{
@@ -11523,8 +11198,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 196,
 							EndLine:   196,
-							StartPos:  4228,
-							EndPos:    4237,
+							StartPos:  3898,
+							EndPos:    3907,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -11532,8 +11207,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 196,
 								EndLine:   196,
-								StartPos:  4234,
-								EndPos:    4236,
+								StartPos:  3904,
+								EndPos:    3906,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11541,8 +11216,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 196,
 									EndLine:   196,
-									StartPos:  4234,
-									EndPos:    4236,
+									StartPos:  3904,
+									EndPos:    3906,
 								},
 							},
 							Value: []byte("$a"),
@@ -11555,8 +11230,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 197,
 						EndLine:   197,
-						StartPos:  4241,
-						EndPos:    4245,
+						StartPos:  3909,
+						EndPos:    3913,
 					},
 				},
 				Expr: &ast.ExprErrorSuppress{
@@ -11564,8 +11239,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 197,
 							EndLine:   197,
-							StartPos:  4241,
-							EndPos:    4244,
+							StartPos:  3909,
+							EndPos:    3912,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -11573,8 +11248,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 197,
 								EndLine:   197,
-								StartPos:  4242,
-								EndPos:    4244,
+								StartPos:  3910,
+								EndPos:    3912,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11582,8 +11257,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 197,
 									EndLine:   197,
-									StartPos:  4242,
-									EndPos:    4244,
+									StartPos:  3910,
+									EndPos:    3912,
 								},
 							},
 							Value: []byte("$a"),
@@ -11596,8 +11271,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 198,
 						EndLine:   198,
-						StartPos:  4248,
-						EndPos:    4257,
+						StartPos:  3914,
+						EndPos:    3923,
 					},
 				},
 				Expr: &ast.ExprEval{
@@ -11605,8 +11280,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 198,
 							EndLine:   198,
-							StartPos:  4248,
-							EndPos:    4256,
+							StartPos:  3914,
+							EndPos:    3922,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -11614,8 +11289,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 198,
 								EndLine:   198,
-								StartPos:  4253,
-								EndPos:    4255,
+								StartPos:  3919,
+								EndPos:    3921,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11623,8 +11298,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 198,
 									EndLine:   198,
-									StartPos:  4253,
-									EndPos:    4255,
+									StartPos:  3919,
+									EndPos:    3921,
 								},
 							},
 							Value: []byte("$a"),
@@ -11637,8 +11312,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 199,
 						EndLine:   199,
-						StartPos:  4260,
-						EndPos:    4265,
+						StartPos:  3924,
+						EndPos:    3929,
 					},
 				},
 				Expr: &ast.ExprExit{
@@ -11646,11 +11321,10 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 199,
 							EndLine:   199,
-							StartPos:  4260,
-							EndPos:    4264,
+							StartPos:  3924,
+							EndPos:    3928,
 						},
 					},
-					Die: false,
 				},
 			},
 			&ast.StmtExpression{
@@ -11658,8 +11332,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 200,
 						EndLine:   200,
-						StartPos:  4268,
-						EndPos:    4277,
+						StartPos:  3930,
+						EndPos:    3939,
 					},
 				},
 				Expr: &ast.ExprExit{
@@ -11667,18 +11341,17 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 200,
 							EndLine:   200,
-							StartPos:  4268,
-							EndPos:    4276,
+							StartPos:  3930,
+							EndPos:    3938,
 						},
 					},
-					Die: false,
 					Expr: &ast.ExprVariable{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 200,
 								EndLine:   200,
-								StartPos:  4273,
-								EndPos:    4275,
+								StartPos:  3935,
+								EndPos:    3937,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11686,8 +11359,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 200,
 									EndLine:   200,
-									StartPos:  4273,
-									EndPos:    4275,
+									StartPos:  3935,
+									EndPos:    3937,
 								},
 							},
 							Value: []byte("$a"),
@@ -11700,8 +11373,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 201,
 						EndLine:   201,
-						StartPos:  4280,
-						EndPos:    4284,
+						StartPos:  3940,
+						EndPos:    3944,
 					},
 				},
 				Expr: &ast.ExprExit{
@@ -11709,8 +11382,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 201,
 							EndLine:   201,
-							StartPos:  4280,
-							EndPos:    4283,
+							StartPos:  3940,
+							EndPos:    3943,
 						},
 					},
 					Die: true,
@@ -11721,8 +11394,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 202,
 						EndLine:   202,
-						StartPos:  4287,
-						EndPos:    4295,
+						StartPos:  3945,
+						EndPos:    3953,
 					},
 				},
 				Expr: &ast.ExprExit{
@@ -11730,8 +11403,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 202,
 							EndLine:   202,
-							StartPos:  4287,
-							EndPos:    4294,
+							StartPos:  3945,
+							EndPos:    3952,
 						},
 					},
 					Die: true,
@@ -11740,8 +11413,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 202,
 								EndLine:   202,
-								StartPos:  4291,
-								EndPos:    4293,
+								StartPos:  3949,
+								EndPos:    3951,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11749,8 +11422,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 202,
 									EndLine:   202,
-									StartPos:  4291,
-									EndPos:    4293,
+									StartPos:  3949,
+									EndPos:    3951,
 								},
 							},
 							Value: []byte("$a"),
@@ -11763,8 +11436,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 203,
 						EndLine:   203,
-						StartPos:  4298,
-						EndPos:    4304,
+						StartPos:  3954,
+						EndPos:    3960,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -11772,8 +11445,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 203,
 							EndLine:   203,
-							StartPos:  4298,
-							EndPos:    4303,
+							StartPos:  3954,
+							EndPos:    3959,
 						},
 					},
 					Function: &ast.NameName{
@@ -11781,8 +11454,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 203,
 								EndLine:   203,
-								StartPos:  4298,
-								EndPos:    4301,
+								StartPos:  3954,
+								EndPos:    3957,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11791,8 +11464,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 203,
 										EndLine:   203,
-										StartPos:  4298,
-										EndPos:    4301,
+										StartPos:  3954,
+										EndPos:    3957,
 									},
 								},
 								Value: []byte("foo"),
@@ -11804,8 +11477,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 203,
 								EndLine:   203,
-								StartPos:  4301,
-								EndPos:    4303,
+								StartPos:  3957,
+								EndPos:    3959,
 							},
 						},
 					},
@@ -11816,8 +11489,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 204,
 						EndLine:   204,
-						StartPos:  4307,
-						EndPos:    4323,
+						StartPos:  3961,
+						EndPos:    3977,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -11825,8 +11498,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 204,
 							EndLine:   204,
-							StartPos:  4307,
-							EndPos:    4322,
+							StartPos:  3961,
+							EndPos:    3976,
 						},
 					},
 					Function: &ast.NameRelative{
@@ -11834,8 +11507,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 204,
 								EndLine:   204,
-								StartPos:  4307,
-								EndPos:    4320,
+								StartPos:  3961,
+								EndPos:    3974,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11844,8 +11517,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 204,
 										EndLine:   204,
-										StartPos:  4317,
-										EndPos:    4320,
+										StartPos:  3971,
+										EndPos:    3974,
 									},
 								},
 								Value: []byte("foo"),
@@ -11857,8 +11530,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 204,
 								EndLine:   204,
-								StartPos:  4320,
-								EndPos:    4322,
+								StartPos:  3974,
+								EndPos:    3976,
 							},
 						},
 					},
@@ -11869,8 +11542,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 205,
 						EndLine:   205,
-						StartPos:  4326,
-						EndPos:    4333,
+						StartPos:  3978,
+						EndPos:    3985,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -11878,8 +11551,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 205,
 							EndLine:   205,
-							StartPos:  4326,
-							EndPos:    4332,
+							StartPos:  3978,
+							EndPos:    3984,
 						},
 					},
 					Function: &ast.NameFullyQualified{
@@ -11887,8 +11560,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 205,
 								EndLine:   205,
-								StartPos:  4326,
-								EndPos:    4330,
+								StartPos:  3978,
+								EndPos:    3982,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -11897,8 +11570,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 205,
 										EndLine:   205,
-										StartPos:  4327,
-										EndPos:    4330,
+										StartPos:  3979,
+										EndPos:    3982,
 									},
 								},
 								Value: []byte("foo"),
@@ -11910,8 +11583,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 205,
 								EndLine:   205,
-								StartPos:  4330,
-								EndPos:    4332,
+								StartPos:  3982,
+								EndPos:    3984,
 							},
 						},
 					},
@@ -11922,8 +11595,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 206,
 						EndLine:   206,
-						StartPos:  4336,
-						EndPos:    4343,
+						StartPos:  3986,
+						EndPos:    3993,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -11931,8 +11604,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 206,
 							EndLine:   206,
-							StartPos:  4336,
-							EndPos:    4342,
+							StartPos:  3986,
+							EndPos:    3992,
 						},
 					},
 					Function: &ast.ExprVariable{
@@ -11940,8 +11613,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 206,
 								EndLine:   206,
-								StartPos:  4336,
-								EndPos:    4340,
+								StartPos:  3986,
+								EndPos:    3990,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -11949,8 +11622,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 206,
 									EndLine:   206,
-									StartPos:  4336,
-									EndPos:    4340,
+									StartPos:  3986,
+									EndPos:    3990,
 								},
 							},
 							Value: []byte("$foo"),
@@ -11961,8 +11634,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 206,
 								EndLine:   206,
-								StartPos:  4340,
-								EndPos:    4342,
+								StartPos:  3990,
+								EndPos:    3992,
 							},
 						},
 					},
@@ -11973,8 +11646,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 208,
 						EndLine:   208,
-						StartPos:  4347,
-						EndPos:    4352,
+						StartPos:  3995,
+						EndPos:    4000,
 					},
 				},
 				Expr: &ast.ExprPostDec{
@@ -11982,8 +11655,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 208,
 							EndLine:   208,
-							StartPos:  4347,
-							EndPos:    4351,
+							StartPos:  3995,
+							EndPos:    3999,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -11991,8 +11664,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 208,
 								EndLine:   208,
-								StartPos:  4347,
-								EndPos:    4349,
+								StartPos:  3995,
+								EndPos:    3997,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12000,8 +11673,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 208,
 									EndLine:   208,
-									StartPos:  4347,
-									EndPos:    4349,
+									StartPos:  3995,
+									EndPos:    3997,
 								},
 							},
 							Value: []byte("$a"),
@@ -12014,8 +11687,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 209,
 						EndLine:   209,
-						StartPos:  4355,
-						EndPos:    4360,
+						StartPos:  4001,
+						EndPos:    4006,
 					},
 				},
 				Expr: &ast.ExprPostInc{
@@ -12023,8 +11696,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 209,
 							EndLine:   209,
-							StartPos:  4355,
-							EndPos:    4359,
+							StartPos:  4001,
+							EndPos:    4005,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -12032,8 +11705,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 209,
 								EndLine:   209,
-								StartPos:  4355,
-								EndPos:    4357,
+								StartPos:  4001,
+								EndPos:    4003,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12041,8 +11714,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 209,
 									EndLine:   209,
-									StartPos:  4355,
-									EndPos:    4357,
+									StartPos:  4001,
+									EndPos:    4003,
 								},
 							},
 							Value: []byte("$a"),
@@ -12055,8 +11728,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 210,
 						EndLine:   210,
-						StartPos:  4363,
-						EndPos:    4368,
+						StartPos:  4007,
+						EndPos:    4012,
 					},
 				},
 				Expr: &ast.ExprPreDec{
@@ -12064,8 +11737,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 210,
 							EndLine:   210,
-							StartPos:  4363,
-							EndPos:    4367,
+							StartPos:  4007,
+							EndPos:    4011,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -12073,8 +11746,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 210,
 								EndLine:   210,
-								StartPos:  4365,
-								EndPos:    4367,
+								StartPos:  4009,
+								EndPos:    4011,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12082,8 +11755,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 210,
 									EndLine:   210,
-									StartPos:  4365,
-									EndPos:    4367,
+									StartPos:  4009,
+									EndPos:    4011,
 								},
 							},
 							Value: []byte("$a"),
@@ -12096,8 +11769,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 211,
 						EndLine:   211,
-						StartPos:  4371,
-						EndPos:    4376,
+						StartPos:  4013,
+						EndPos:    4018,
 					},
 				},
 				Expr: &ast.ExprPreInc{
@@ -12105,8 +11778,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 211,
 							EndLine:   211,
-							StartPos:  4371,
-							EndPos:    4375,
+							StartPos:  4013,
+							EndPos:    4017,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -12114,8 +11787,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 211,
 								EndLine:   211,
-								StartPos:  4373,
-								EndPos:    4375,
+								StartPos:  4015,
+								EndPos:    4017,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12123,8 +11796,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 211,
 									EndLine:   211,
-									StartPos:  4373,
-									EndPos:    4375,
+									StartPos:  4015,
+									EndPos:    4017,
 								},
 							},
 							Value: []byte("$a"),
@@ -12137,8 +11810,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 213,
 						EndLine:   213,
-						StartPos:  4380,
-						EndPos:    4391,
+						StartPos:  4020,
+						EndPos:    4031,
 					},
 				},
 				Expr: &ast.ExprInclude{
@@ -12146,8 +11819,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 213,
 							EndLine:   213,
-							StartPos:  4380,
-							EndPos:    4390,
+							StartPos:  4020,
+							EndPos:    4030,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -12155,8 +11828,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 213,
 								EndLine:   213,
-								StartPos:  4388,
-								EndPos:    4390,
+								StartPos:  4028,
+								EndPos:    4030,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12164,8 +11837,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 213,
 									EndLine:   213,
-									StartPos:  4388,
-									EndPos:    4390,
+									StartPos:  4028,
+									EndPos:    4030,
 								},
 							},
 							Value: []byte("$a"),
@@ -12178,8 +11851,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 214,
 						EndLine:   214,
-						StartPos:  4394,
-						EndPos:    4410,
+						StartPos:  4032,
+						EndPos:    4048,
 					},
 				},
 				Expr: &ast.ExprIncludeOnce{
@@ -12187,8 +11860,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 214,
 							EndLine:   214,
-							StartPos:  4394,
-							EndPos:    4409,
+							StartPos:  4032,
+							EndPos:    4047,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -12196,8 +11869,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 214,
 								EndLine:   214,
-								StartPos:  4407,
-								EndPos:    4409,
+								StartPos:  4045,
+								EndPos:    4047,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12205,8 +11878,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 214,
 									EndLine:   214,
-									StartPos:  4407,
-									EndPos:    4409,
+									StartPos:  4045,
+									EndPos:    4047,
 								},
 							},
 							Value: []byte("$a"),
@@ -12219,8 +11892,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 215,
 						EndLine:   215,
-						StartPos:  4413,
-						EndPos:    4424,
+						StartPos:  4049,
+						EndPos:    4060,
 					},
 				},
 				Expr: &ast.ExprRequire{
@@ -12228,8 +11901,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 215,
 							EndLine:   215,
-							StartPos:  4413,
-							EndPos:    4423,
+							StartPos:  4049,
+							EndPos:    4059,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -12237,8 +11910,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 215,
 								EndLine:   215,
-								StartPos:  4421,
-								EndPos:    4423,
+								StartPos:  4057,
+								EndPos:    4059,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12246,8 +11919,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 215,
 									EndLine:   215,
-									StartPos:  4421,
-									EndPos:    4423,
+									StartPos:  4057,
+									EndPos:    4059,
 								},
 							},
 							Value: []byte("$a"),
@@ -12260,8 +11933,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 216,
 						EndLine:   216,
-						StartPos:  4427,
-						EndPos:    4443,
+						StartPos:  4061,
+						EndPos:    4077,
 					},
 				},
 				Expr: &ast.ExprRequireOnce{
@@ -12269,8 +11942,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 216,
 							EndLine:   216,
-							StartPos:  4427,
-							EndPos:    4442,
+							StartPos:  4061,
+							EndPos:    4076,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -12278,8 +11951,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 216,
 								EndLine:   216,
-								StartPos:  4440,
-								EndPos:    4442,
+								StartPos:  4074,
+								EndPos:    4076,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12287,8 +11960,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 216,
 									EndLine:   216,
-									StartPos:  4440,
-									EndPos:    4442,
+									StartPos:  4074,
+									EndPos:    4076,
 								},
 							},
 							Value: []byte("$a"),
@@ -12301,8 +11974,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 218,
 						EndLine:   218,
-						StartPos:  4447,
-						EndPos:    4465,
+						StartPos:  4079,
+						EndPos:    4097,
 					},
 				},
 				Expr: &ast.ExprInstanceOf{
@@ -12310,8 +11983,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 218,
 							EndLine:   218,
-							StartPos:  4447,
-							EndPos:    4464,
+							StartPos:  4079,
+							EndPos:    4096,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -12319,8 +11992,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 218,
 								EndLine:   218,
-								StartPos:  4447,
-								EndPos:    4449,
+								StartPos:  4079,
+								EndPos:    4081,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12328,8 +12001,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 218,
 									EndLine:   218,
-									StartPos:  4447,
-									EndPos:    4449,
+									StartPos:  4079,
+									EndPos:    4081,
 								},
 							},
 							Value: []byte("$a"),
@@ -12340,8 +12013,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 218,
 								EndLine:   218,
-								StartPos:  4461,
-								EndPos:    4464,
+								StartPos:  4093,
+								EndPos:    4096,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -12350,8 +12023,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 218,
 										EndLine:   218,
-										StartPos:  4461,
-										EndPos:    4464,
+										StartPos:  4093,
+										EndPos:    4096,
 									},
 								},
 								Value: []byte("Foo"),
@@ -12365,8 +12038,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 219,
 						EndLine:   219,
-						StartPos:  4468,
-						EndPos:    4496,
+						StartPos:  4098,
+						EndPos:    4126,
 					},
 				},
 				Expr: &ast.ExprInstanceOf{
@@ -12374,8 +12047,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 219,
 							EndLine:   219,
-							StartPos:  4468,
-							EndPos:    4495,
+							StartPos:  4098,
+							EndPos:    4125,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -12383,8 +12056,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 219,
 								EndLine:   219,
-								StartPos:  4468,
-								EndPos:    4470,
+								StartPos:  4098,
+								EndPos:    4100,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12392,8 +12065,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 219,
 									EndLine:   219,
-									StartPos:  4468,
-									EndPos:    4470,
+									StartPos:  4098,
+									EndPos:    4100,
 								},
 							},
 							Value: []byte("$a"),
@@ -12404,8 +12077,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 219,
 								EndLine:   219,
-								StartPos:  4482,
-								EndPos:    4495,
+								StartPos:  4112,
+								EndPos:    4125,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -12414,8 +12087,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 219,
 										EndLine:   219,
-										StartPos:  4492,
-										EndPos:    4495,
+										StartPos:  4122,
+										EndPos:    4125,
 									},
 								},
 								Value: []byte("Foo"),
@@ -12429,8 +12102,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 220,
 						EndLine:   220,
-						StartPos:  4499,
-						EndPos:    4518,
+						StartPos:  4127,
+						EndPos:    4146,
 					},
 				},
 				Expr: &ast.ExprInstanceOf{
@@ -12438,8 +12111,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 220,
 							EndLine:   220,
-							StartPos:  4499,
-							EndPos:    4517,
+							StartPos:  4127,
+							EndPos:    4145,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -12447,8 +12120,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 220,
 								EndLine:   220,
-								StartPos:  4499,
-								EndPos:    4501,
+								StartPos:  4127,
+								EndPos:    4129,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12456,8 +12129,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 220,
 									EndLine:   220,
-									StartPos:  4499,
-									EndPos:    4501,
+									StartPos:  4127,
+									EndPos:    4129,
 								},
 							},
 							Value: []byte("$a"),
@@ -12468,8 +12141,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 220,
 								EndLine:   220,
-								StartPos:  4513,
-								EndPos:    4517,
+								StartPos:  4141,
+								EndPos:    4145,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -12478,8 +12151,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 220,
 										EndLine:   220,
-										StartPos:  4514,
-										EndPos:    4517,
+										StartPos:  4142,
+										EndPos:    4145,
 									},
 								},
 								Value: []byte("Foo"),
@@ -12493,8 +12166,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 222,
 						EndLine:   222,
-						StartPos:  4522,
-						EndPos:    4536,
+						StartPos:  4148,
+						EndPos:    4162,
 					},
 				},
 				Expr: &ast.ExprIsset{
@@ -12502,8 +12175,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 222,
 							EndLine:   222,
-							StartPos:  4522,
-							EndPos:    4535,
+							StartPos:  4148,
+							EndPos:    4161,
 						},
 					},
 					Vars: []ast.Vertex{
@@ -12512,8 +12185,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 222,
 									EndLine:   222,
-									StartPos:  4528,
-									EndPos:    4530,
+									StartPos:  4154,
+									EndPos:    4156,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -12521,8 +12194,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 222,
 										EndLine:   222,
-										StartPos:  4528,
-										EndPos:    4530,
+										StartPos:  4154,
+										EndPos:    4156,
 									},
 								},
 								Value: []byte("$a"),
@@ -12533,8 +12206,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 222,
 									EndLine:   222,
-									StartPos:  4532,
-									EndPos:    4534,
+									StartPos:  4158,
+									EndPos:    4160,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -12542,8 +12215,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 222,
 										EndLine:   222,
-										StartPos:  4532,
-										EndPos:    4534,
+										StartPos:  4158,
+										EndPos:    4160,
 									},
 								},
 								Value: []byte("$b"),
@@ -12557,8 +12230,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 223,
 						EndLine:   223,
-						StartPos:  4539,
-						EndPos:    4553,
+						StartPos:  4163,
+						EndPos:    4177,
 					},
 				},
 				Expr: &ast.ExprAssign{
@@ -12566,8 +12239,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 223,
 							EndLine:   223,
-							StartPos:  4539,
-							EndPos:    4552,
+							StartPos:  4163,
+							EndPos:    4176,
 						},
 					},
 					Var: &ast.ExprList{
@@ -12575,8 +12248,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 223,
 								EndLine:   223,
-								StartPos:  4539,
-								EndPos:    4547,
+								StartPos:  4163,
+								EndPos:    4171,
 							},
 						},
 						Items: []ast.Vertex{
@@ -12585,8 +12258,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 223,
 										EndLine:   223,
-										StartPos:  4544,
-										EndPos:    4546,
+										StartPos:  4168,
+										EndPos:    4170,
 									},
 								},
 								Val: &ast.ExprVariable{
@@ -12594,8 +12267,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 223,
 											EndLine:   223,
-											StartPos:  4544,
-											EndPos:    4546,
+											StartPos:  4168,
+											EndPos:    4170,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -12603,8 +12276,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 223,
 												EndLine:   223,
-												StartPos:  4544,
-												EndPos:    4546,
+												StartPos:  4168,
+												EndPos:    4170,
 											},
 										},
 										Value: []byte("$a"),
@@ -12618,8 +12291,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 223,
 								EndLine:   223,
-								StartPos:  4550,
-								EndPos:    4552,
+								StartPos:  4174,
+								EndPos:    4176,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12627,8 +12300,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 223,
 									EndLine:   223,
-									StartPos:  4550,
-									EndPos:    4552,
+									StartPos:  4174,
+									EndPos:    4176,
 								},
 							},
 							Value: []byte("$b"),
@@ -12641,8 +12314,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 224,
 						EndLine:   224,
-						StartPos:  4556,
-						EndPos:    4572,
+						StartPos:  4178,
+						EndPos:    4194,
 					},
 				},
 				Expr: &ast.ExprAssign{
@@ -12650,8 +12323,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 224,
 							EndLine:   224,
-							StartPos:  4556,
-							EndPos:    4571,
+							StartPos:  4178,
+							EndPos:    4193,
 						},
 					},
 					Var: &ast.ExprList{
@@ -12659,8 +12332,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 224,
 								EndLine:   224,
-								StartPos:  4556,
-								EndPos:    4566,
+								StartPos:  4178,
+								EndPos:    4188,
 							},
 						},
 						Items: []ast.Vertex{
@@ -12669,8 +12342,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 224,
 										EndLine:   224,
-										StartPos:  4561,
-										EndPos:    4565,
+										StartPos:  4183,
+										EndPos:    4187,
 									},
 								},
 								Val: &ast.ExprArrayDimFetch{
@@ -12678,8 +12351,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 224,
 											EndLine:   224,
-											StartPos:  4561,
-											EndPos:    4565,
+											StartPos:  4183,
+											EndPos:    4187,
 										},
 									},
 									Var: &ast.ExprVariable{
@@ -12687,8 +12360,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 224,
 												EndLine:   224,
-												StartPos:  4561,
-												EndPos:    4563,
+												StartPos:  4183,
+												EndPos:    4185,
 											},
 										},
 										VarName: &ast.Identifier{
@@ -12696,8 +12369,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 224,
 													EndLine:   224,
-													StartPos:  4561,
-													EndPos:    4563,
+													StartPos:  4183,
+													EndPos:    4185,
 												},
 											},
 											Value: []byte("$a"),
@@ -12712,8 +12385,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 224,
 								EndLine:   224,
-								StartPos:  4569,
-								EndPos:    4571,
+								StartPos:  4191,
+								EndPos:    4193,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12721,8 +12394,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 224,
 									EndLine:   224,
-									StartPos:  4569,
-									EndPos:    4571,
+									StartPos:  4191,
+									EndPos:    4193,
 								},
 							},
 							Value: []byte("$b"),
@@ -12735,8 +12408,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 225,
 						EndLine:   225,
-						StartPos:  4575,
-						EndPos:    4595,
+						StartPos:  4195,
+						EndPos:    4215,
 					},
 				},
 				Expr: &ast.ExprAssign{
@@ -12744,8 +12417,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 225,
 							EndLine:   225,
-							StartPos:  4575,
-							EndPos:    4594,
+							StartPos:  4195,
+							EndPos:    4214,
 						},
 					},
 					Var: &ast.ExprList{
@@ -12753,8 +12426,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 225,
 								EndLine:   225,
-								StartPos:  4575,
-								EndPos:    4589,
+								StartPos:  4195,
+								EndPos:    4209,
 							},
 						},
 						Items: []ast.Vertex{
@@ -12763,8 +12436,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 225,
 										EndLine:   225,
-										StartPos:  4580,
-										EndPos:    4588,
+										StartPos:  4200,
+										EndPos:    4208,
 									},
 								},
 								Val: &ast.ExprList{
@@ -12772,8 +12445,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 225,
 											EndLine:   225,
-											StartPos:  4580,
-											EndPos:    4588,
+											StartPos:  4200,
+											EndPos:    4208,
 										},
 									},
 									Items: []ast.Vertex{
@@ -12782,8 +12455,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 225,
 													EndLine:   225,
-													StartPos:  4585,
-													EndPos:    4587,
+													StartPos:  4205,
+													EndPos:    4207,
 												},
 											},
 											Val: &ast.ExprVariable{
@@ -12791,8 +12464,8 @@ func TestPhp7(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 225,
 														EndLine:   225,
-														StartPos:  4585,
-														EndPos:    4587,
+														StartPos:  4205,
+														EndPos:    4207,
 													},
 												},
 												VarName: &ast.Identifier{
@@ -12800,8 +12473,8 @@ func TestPhp7(t *testing.T) {
 														Position: &position.Position{
 															StartLine: 225,
 															EndLine:   225,
-															StartPos:  4585,
-															EndPos:    4587,
+															StartPos:  4205,
+															EndPos:    4207,
 														},
 													},
 													Value: []byte("$a"),
@@ -12818,8 +12491,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 225,
 								EndLine:   225,
-								StartPos:  4592,
-								EndPos:    4594,
+								StartPos:  4212,
+								EndPos:    4214,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12827,8 +12500,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 225,
 									EndLine:   225,
-									StartPos:  4592,
-									EndPos:    4594,
+									StartPos:  4212,
+									EndPos:    4214,
 								},
 							},
 							Value: []byte("$b"),
@@ -12841,8 +12514,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 227,
 						EndLine:   227,
-						StartPos:  4599,
-						EndPos:    4609,
+						StartPos:  4217,
+						EndPos:    4227,
 					},
 				},
 				Expr: &ast.ExprMethodCall{
@@ -12850,8 +12523,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 227,
 							EndLine:   227,
-							StartPos:  4599,
-							EndPos:    4608,
+							StartPos:  4217,
+							EndPos:    4226,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -12859,8 +12532,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 227,
 								EndLine:   227,
-								StartPos:  4599,
-								EndPos:    4601,
+								StartPos:  4217,
+								EndPos:    4219,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -12868,8 +12541,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 227,
 									EndLine:   227,
-									StartPos:  4599,
-									EndPos:    4601,
+									StartPos:  4217,
+									EndPos:    4219,
 								},
 							},
 							Value: []byte("$a"),
@@ -12880,8 +12553,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 227,
 								EndLine:   227,
-								StartPos:  4603,
-								EndPos:    4606,
+								StartPos:  4221,
+								EndPos:    4224,
 							},
 						},
 						Value: []byte("foo"),
@@ -12891,8 +12564,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 227,
 								EndLine:   227,
-								StartPos:  4606,
-								EndPos:    4608,
+								StartPos:  4224,
+								EndPos:    4226,
 							},
 						},
 					},
@@ -12903,8 +12576,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 228,
 						EndLine:   228,
-						StartPos:  4612,
-						EndPos:    4622,
+						StartPos:  4228,
+						EndPos:    4238,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -12912,8 +12585,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 228,
 							EndLine:   228,
-							StartPos:  4612,
-							EndPos:    4621,
+							StartPos:  4228,
+							EndPos:    4237,
 						},
 					},
 					Class: &ast.NameName{
@@ -12921,8 +12594,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 228,
 								EndLine:   228,
-								StartPos:  4616,
-								EndPos:    4619,
+								StartPos:  4232,
+								EndPos:    4235,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -12931,8 +12604,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 228,
 										EndLine:   228,
-										StartPos:  4616,
-										EndPos:    4619,
+										StartPos:  4232,
+										EndPos:    4235,
 									},
 								},
 								Value: []byte("Foo"),
@@ -12944,8 +12617,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 228,
 								EndLine:   228,
-								StartPos:  4619,
-								EndPos:    4621,
+								StartPos:  4235,
+								EndPos:    4237,
 							},
 						},
 					},
@@ -12956,8 +12629,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 229,
 						EndLine:   229,
-						StartPos:  4625,
-						EndPos:    4645,
+						StartPos:  4239,
+						EndPos:    4259,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -12965,8 +12638,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 229,
 							EndLine:   229,
-							StartPos:  4625,
-							EndPos:    4644,
+							StartPos:  4239,
+							EndPos:    4258,
 						},
 					},
 					Class: &ast.NameRelative{
@@ -12974,8 +12647,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 229,
 								EndLine:   229,
-								StartPos:  4629,
-								EndPos:    4642,
+								StartPos:  4243,
+								EndPos:    4256,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -12984,8 +12657,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 229,
 										EndLine:   229,
-										StartPos:  4639,
-										EndPos:    4642,
+										StartPos:  4253,
+										EndPos:    4256,
 									},
 								},
 								Value: []byte("Foo"),
@@ -12997,8 +12670,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 229,
 								EndLine:   229,
-								StartPos:  4642,
-								EndPos:    4644,
+								StartPos:  4256,
+								EndPos:    4258,
 							},
 						},
 					},
@@ -13009,8 +12682,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 230,
 						EndLine:   230,
-						StartPos:  4648,
-						EndPos:    4659,
+						StartPos:  4260,
+						EndPos:    4271,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -13018,8 +12691,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 230,
 							EndLine:   230,
-							StartPos:  4648,
-							EndPos:    4658,
+							StartPos:  4260,
+							EndPos:    4270,
 						},
 					},
 					Class: &ast.NameFullyQualified{
@@ -13027,8 +12700,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 230,
 								EndLine:   230,
-								StartPos:  4652,
-								EndPos:    4656,
+								StartPos:  4264,
+								EndPos:    4268,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -13037,8 +12710,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 230,
 										EndLine:   230,
-										StartPos:  4653,
-										EndPos:    4656,
+										StartPos:  4265,
+										EndPos:    4268,
 									},
 								},
 								Value: []byte("Foo"),
@@ -13050,8 +12723,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 230,
 								EndLine:   230,
-								StartPos:  4656,
-								EndPos:    4658,
+								StartPos:  4268,
+								EndPos:    4270,
 							},
 						},
 					},
@@ -13062,8 +12735,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 231,
 						EndLine:   231,
-						StartPos:  4662,
-						EndPos:    4687,
+						StartPos:  4272,
+						EndPos:    4297,
 					},
 				},
 				Expr: &ast.ExprNew{
@@ -13071,8 +12744,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 231,
 							EndLine:   231,
-							StartPos:  4662,
-							EndPos:    4686,
+							StartPos:  4272,
+							EndPos:    4296,
 						},
 					},
 					Class: &ast.StmtClass{
@@ -13080,8 +12753,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 231,
 								EndLine:   231,
-								StartPos:  4666,
-								EndPos:    4686,
+								StartPos:  4276,
+								EndPos:    4296,
 							},
 						},
 						ArgumentList: &ast.ArgumentList{
@@ -13089,8 +12762,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 231,
 									EndLine:   231,
-									StartPos:  4672,
-									EndPos:    4683,
+									StartPos:  4282,
+									EndPos:    4293,
 								},
 							},
 							Arguments: []ast.Vertex{
@@ -13099,19 +12772,17 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 231,
 											EndLine:   231,
-											StartPos:  4673,
-											EndPos:    4675,
+											StartPos:  4283,
+											EndPos:    4285,
 										},
 									},
-									IsReference: false,
-									Variadic:    false,
 									Expr: &ast.ExprVariable{
 										Node: ast.Node{
 											Position: &position.Position{
 												StartLine: 231,
 												EndLine:   231,
-												StartPos:  4673,
-												EndPos:    4675,
+												StartPos:  4283,
+												EndPos:    4285,
 											},
 										},
 										VarName: &ast.Identifier{
@@ -13119,8 +12790,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 231,
 													EndLine:   231,
-													StartPos:  4673,
-													EndPos:    4675,
+													StartPos:  4283,
+													EndPos:    4285,
 												},
 											},
 											Value: []byte("$a"),
@@ -13132,19 +12803,18 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 231,
 											EndLine:   231,
-											StartPos:  4677,
-											EndPos:    4682,
+											StartPos:  4287,
+											EndPos:    4292,
 										},
 									},
-									IsReference: false,
-									Variadic:    true,
+									Variadic: true,
 									Expr: &ast.ExprVariable{
 										Node: ast.Node{
 											Position: &position.Position{
 												StartLine: 231,
 												EndLine:   231,
-												StartPos:  4680,
-												EndPos:    4682,
+												StartPos:  4290,
+												EndPos:    4292,
 											},
 										},
 										VarName: &ast.Identifier{
@@ -13152,8 +12822,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 231,
 													EndLine:   231,
-													StartPos:  4680,
-													EndPos:    4682,
+													StartPos:  4290,
+													EndPos:    4292,
 												},
 											},
 											Value: []byte("$b"),
@@ -13171,8 +12841,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 232,
 						EndLine:   232,
-						StartPos:  4690,
-						EndPos:    4700,
+						StartPos:  4298,
+						EndPos:    4308,
 					},
 				},
 				Expr: &ast.ExprPrint{
@@ -13180,8 +12850,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 232,
 							EndLine:   232,
-							StartPos:  4690,
-							EndPos:    4698,
+							StartPos:  4298,
+							EndPos:    4306,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -13189,8 +12859,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 232,
 								EndLine:   232,
-								StartPos:  4696,
-								EndPos:    4698,
+								StartPos:  4304,
+								EndPos:    4306,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13198,8 +12868,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 232,
 									EndLine:   232,
-									StartPos:  4696,
-									EndPos:    4698,
+									StartPos:  4304,
+									EndPos:    4306,
 								},
 							},
 							Value: []byte("$a"),
@@ -13212,8 +12882,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 233,
 						EndLine:   233,
-						StartPos:  4703,
-						EndPos:    4711,
+						StartPos:  4309,
+						EndPos:    4317,
 					},
 				},
 				Expr: &ast.ExprPropertyFetch{
@@ -13221,8 +12891,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 233,
 							EndLine:   233,
-							StartPos:  4703,
-							EndPos:    4710,
+							StartPos:  4309,
+							EndPos:    4316,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -13230,8 +12900,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 233,
 								EndLine:   233,
-								StartPos:  4703,
-								EndPos:    4705,
+								StartPos:  4309,
+								EndPos:    4311,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13239,8 +12909,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 233,
 									EndLine:   233,
-									StartPos:  4703,
-									EndPos:    4705,
+									StartPos:  4309,
+									EndPos:    4311,
 								},
 							},
 							Value: []byte("$a"),
@@ -13251,8 +12921,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 233,
 								EndLine:   233,
-								StartPos:  4707,
-								EndPos:    4710,
+								StartPos:  4313,
+								EndPos:    4316,
 							},
 						},
 						Value: []byte("foo"),
@@ -13264,8 +12934,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 234,
 						EndLine:   234,
-						StartPos:  4714,
-						EndPos:    4723,
+						StartPos:  4318,
+						EndPos:    4327,
 					},
 				},
 				Expr: &ast.ExprShellExec{
@@ -13273,8 +12943,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 234,
 							EndLine:   234,
-							StartPos:  4714,
-							EndPos:    4722,
+							StartPos:  4318,
+							EndPos:    4326,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -13283,8 +12953,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 234,
 									EndLine:   234,
-									StartPos:  4715,
-									EndPos:    4719,
+									StartPos:  4319,
+									EndPos:    4323,
 								},
 							},
 							Value: []byte("cmd "),
@@ -13294,8 +12964,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 234,
 									EndLine:   234,
-									StartPos:  4719,
-									EndPos:    4721,
+									StartPos:  4323,
+									EndPos:    4325,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -13303,8 +12973,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 234,
 										EndLine:   234,
-										StartPos:  4719,
-										EndPos:    4721,
+										StartPos:  4323,
+										EndPos:    4325,
 									},
 								},
 								Value: []byte("$a"),
@@ -13318,8 +12988,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 235,
 						EndLine:   235,
-						StartPos:  4726,
-						EndPos:    4732,
+						StartPos:  4328,
+						EndPos:    4334,
 					},
 				},
 				Expr: &ast.ExprShellExec{
@@ -13327,8 +12997,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 235,
 							EndLine:   235,
-							StartPos:  4726,
-							EndPos:    4731,
+							StartPos:  4328,
+							EndPos:    4333,
 						},
 					},
 					Parts: []ast.Vertex{
@@ -13337,8 +13007,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 235,
 									EndLine:   235,
-									StartPos:  4727,
-									EndPos:    4730,
+									StartPos:  4329,
+									EndPos:    4332,
 								},
 							},
 							Value: []byte("cmd"),
@@ -13351,8 +13021,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 236,
 						EndLine:   236,
-						StartPos:  4735,
-						EndPos:    4738,
+						StartPos:  4335,
+						EndPos:    4338,
 					},
 				},
 				Expr: &ast.ExprShellExec{
@@ -13360,8 +13030,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 236,
 							EndLine:   236,
-							StartPos:  4735,
-							EndPos:    4737,
+							StartPos:  4335,
+							EndPos:    4337,
 						},
 					},
 					Parts: []ast.Vertex{},
@@ -13372,8 +13042,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 237,
 						EndLine:   237,
-						StartPos:  4741,
-						EndPos:    4744,
+						StartPos:  4339,
+						EndPos:    4342,
 					},
 				},
 				Expr: &ast.ExprShortArray{
@@ -13381,8 +13051,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 237,
 							EndLine:   237,
-							StartPos:  4741,
-							EndPos:    4743,
+							StartPos:  4339,
+							EndPos:    4341,
 						},
 					},
 					Items: []ast.Vertex{},
@@ -13393,8 +13063,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 238,
 						EndLine:   238,
-						StartPos:  4747,
-						EndPos:    4751,
+						StartPos:  4343,
+						EndPos:    4347,
 					},
 				},
 				Expr: &ast.ExprShortArray{
@@ -13402,8 +13072,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 238,
 							EndLine:   238,
-							StartPos:  4747,
-							EndPos:    4750,
+							StartPos:  4343,
+							EndPos:    4346,
 						},
 					},
 					Items: []ast.Vertex{
@@ -13412,8 +13082,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 238,
 									EndLine:   238,
-									StartPos:  4748,
-									EndPos:    4749,
+									StartPos:  4344,
+									EndPos:    4345,
 								},
 							},
 							Val: &ast.ScalarLnumber{
@@ -13421,8 +13091,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 238,
 										EndLine:   238,
-										StartPos:  4748,
-										EndPos:    4749,
+										StartPos:  4344,
+										EndPos:    4345,
 									},
 								},
 								Value: []byte("1"),
@@ -13436,8 +13106,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 239,
 						EndLine:   239,
-						StartPos:  4754,
-						EndPos:    4767,
+						StartPos:  4348,
+						EndPos:    4361,
 					},
 				},
 				Expr: &ast.ExprShortArray{
@@ -13445,8 +13115,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 239,
 							EndLine:   239,
-							StartPos:  4754,
-							EndPos:    4766,
+							StartPos:  4348,
+							EndPos:    4360,
 						},
 					},
 					Items: []ast.Vertex{
@@ -13455,8 +13125,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 239,
 									EndLine:   239,
-									StartPos:  4755,
-									EndPos:    4759,
+									StartPos:  4349,
+									EndPos:    4353,
 								},
 							},
 							Key: &ast.ScalarLnumber{
@@ -13464,8 +13134,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 239,
 										EndLine:   239,
-										StartPos:  4755,
-										EndPos:    4756,
+										StartPos:  4349,
+										EndPos:    4350,
 									},
 								},
 								Value: []byte("1"),
@@ -13475,8 +13145,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 239,
 										EndLine:   239,
-										StartPos:  4758,
-										EndPos:    4759,
+										StartPos:  4352,
+										EndPos:    4353,
 									},
 								},
 								Value: []byte("1"),
@@ -13487,8 +13157,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 239,
 									EndLine:   239,
-									StartPos:  4761,
-									EndPos:    4764,
+									StartPos:  4355,
+									EndPos:    4358,
 								},
 							},
 							Val: &ast.ExprReference{
@@ -13496,8 +13166,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 239,
 										EndLine:   239,
-										StartPos:  4761,
-										EndPos:    4764,
+										StartPos:  4355,
+										EndPos:    4358,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -13505,8 +13175,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 239,
 											EndLine:   239,
-											StartPos:  4762,
-											EndPos:    4764,
+											StartPos:  4356,
+											EndPos:    4358,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -13514,8 +13184,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 239,
 												EndLine:   239,
-												StartPos:  4762,
-												EndPos:    4764,
+												StartPos:  4356,
+												EndPos:    4358,
 											},
 										},
 										Value: []byte("$b"),
@@ -13532,8 +13202,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 241,
 						EndLine:   241,
-						StartPos:  4771,
-						EndPos:    4781,
+						StartPos:  4363,
+						EndPos:    4373,
 					},
 				},
 				Expr: &ast.ExprAssign{
@@ -13541,8 +13211,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 241,
 							EndLine:   241,
-							StartPos:  4771,
-							EndPos:    4780,
+							StartPos:  4363,
+							EndPos:    4372,
 						},
 					},
 					Var: &ast.ExprShortList{
@@ -13550,8 +13220,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 241,
 								EndLine:   241,
-								StartPos:  4771,
-								EndPos:    4775,
+								StartPos:  4363,
+								EndPos:    4367,
 							},
 						},
 						Items: []ast.Vertex{
@@ -13560,8 +13230,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 241,
 										EndLine:   241,
-										StartPos:  4772,
-										EndPos:    4774,
+										StartPos:  4364,
+										EndPos:    4366,
 									},
 								},
 								Val: &ast.ExprVariable{
@@ -13569,8 +13239,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 241,
 											EndLine:   241,
-											StartPos:  4772,
-											EndPos:    4774,
+											StartPos:  4364,
+											EndPos:    4366,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -13578,8 +13248,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 241,
 												EndLine:   241,
-												StartPos:  4772,
-												EndPos:    4774,
+												StartPos:  4364,
+												EndPos:    4366,
 											},
 										},
 										Value: []byte("$a"),
@@ -13593,8 +13263,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 241,
 								EndLine:   241,
-								StartPos:  4778,
-								EndPos:    4780,
+								StartPos:  4370,
+								EndPos:    4372,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13602,8 +13272,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 241,
 									EndLine:   241,
-									StartPos:  4778,
-									EndPos:    4780,
+									StartPos:  4370,
+									EndPos:    4372,
 								},
 							},
 							Value: []byte("$b"),
@@ -13616,8 +13286,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 242,
 						EndLine:   242,
-						StartPos:  4784,
-						EndPos:    4796,
+						StartPos:  4374,
+						EndPos:    4386,
 					},
 				},
 				Expr: &ast.ExprAssign{
@@ -13625,8 +13295,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 242,
 							EndLine:   242,
-							StartPos:  4784,
-							EndPos:    4795,
+							StartPos:  4374,
+							EndPos:    4385,
 						},
 					},
 					Var: &ast.ExprShortList{
@@ -13634,8 +13304,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 242,
 								EndLine:   242,
-								StartPos:  4784,
-								EndPos:    4790,
+								StartPos:  4374,
+								EndPos:    4380,
 							},
 						},
 						Items: []ast.Vertex{
@@ -13644,8 +13314,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 242,
 										EndLine:   242,
-										StartPos:  4785,
-										EndPos:    4789,
+										StartPos:  4375,
+										EndPos:    4379,
 									},
 								},
 								Val: &ast.ExprArrayDimFetch{
@@ -13653,8 +13323,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 242,
 											EndLine:   242,
-											StartPos:  4785,
-											EndPos:    4789,
+											StartPos:  4375,
+											EndPos:    4379,
 										},
 									},
 									Var: &ast.ExprVariable{
@@ -13662,8 +13332,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 242,
 												EndLine:   242,
-												StartPos:  4785,
-												EndPos:    4787,
+												StartPos:  4375,
+												EndPos:    4377,
 											},
 										},
 										VarName: &ast.Identifier{
@@ -13671,8 +13341,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 242,
 													EndLine:   242,
-													StartPos:  4785,
-													EndPos:    4787,
+													StartPos:  4375,
+													EndPos:    4377,
 												},
 											},
 											Value: []byte("$a"),
@@ -13687,8 +13357,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 242,
 								EndLine:   242,
-								StartPos:  4793,
-								EndPos:    4795,
+								StartPos:  4383,
+								EndPos:    4385,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13696,8 +13366,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 242,
 									EndLine:   242,
-									StartPos:  4793,
-									EndPos:    4795,
+									StartPos:  4383,
+									EndPos:    4385,
 								},
 							},
 							Value: []byte("$b"),
@@ -13710,8 +13380,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 243,
 						EndLine:   243,
-						StartPos:  4799,
-						EndPos:    4815,
+						StartPos:  4387,
+						EndPos:    4403,
 					},
 				},
 				Expr: &ast.ExprAssign{
@@ -13719,8 +13389,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 243,
 							EndLine:   243,
-							StartPos:  4799,
-							EndPos:    4814,
+							StartPos:  4387,
+							EndPos:    4402,
 						},
 					},
 					Var: &ast.ExprShortList{
@@ -13728,8 +13398,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 243,
 								EndLine:   243,
-								StartPos:  4799,
-								EndPos:    4809,
+								StartPos:  4387,
+								EndPos:    4397,
 							},
 						},
 						Items: []ast.Vertex{
@@ -13738,8 +13408,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 243,
 										EndLine:   243,
-										StartPos:  4800,
-										EndPos:    4808,
+										StartPos:  4388,
+										EndPos:    4396,
 									},
 								},
 								Val: &ast.ExprList{
@@ -13747,8 +13417,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 243,
 											EndLine:   243,
-											StartPos:  4800,
-											EndPos:    4808,
+											StartPos:  4388,
+											EndPos:    4396,
 										},
 									},
 									Items: []ast.Vertex{
@@ -13757,8 +13427,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 243,
 													EndLine:   243,
-													StartPos:  4805,
-													EndPos:    4807,
+													StartPos:  4393,
+													EndPos:    4395,
 												},
 											},
 											Val: &ast.ExprVariable{
@@ -13766,8 +13436,8 @@ func TestPhp7(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 243,
 														EndLine:   243,
-														StartPos:  4805,
-														EndPos:    4807,
+														StartPos:  4393,
+														EndPos:    4395,
 													},
 												},
 												VarName: &ast.Identifier{
@@ -13775,8 +13445,8 @@ func TestPhp7(t *testing.T) {
 														Position: &position.Position{
 															StartLine: 243,
 															EndLine:   243,
-															StartPos:  4805,
-															EndPos:    4807,
+															StartPos:  4393,
+															EndPos:    4395,
 														},
 													},
 													Value: []byte("$a"),
@@ -13793,8 +13463,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 243,
 								EndLine:   243,
-								StartPos:  4812,
-								EndPos:    4814,
+								StartPos:  4400,
+								EndPos:    4402,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -13802,8 +13472,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 243,
 									EndLine:   243,
-									StartPos:  4812,
-									EndPos:    4814,
+									StartPos:  4400,
+									EndPos:    4402,
 								},
 							},
 							Value: []byte("$b"),
@@ -13816,8 +13486,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 244,
 						EndLine:   244,
-						StartPos:  4818,
-						EndPos:    4829,
+						StartPos:  4404,
+						EndPos:    4415,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -13825,8 +13495,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 244,
 							EndLine:   244,
-							StartPos:  4818,
-							EndPos:    4828,
+							StartPos:  4404,
+							EndPos:    4414,
 						},
 					},
 					Class: &ast.NameName{
@@ -13834,8 +13504,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 244,
 								EndLine:   244,
-								StartPos:  4818,
-								EndPos:    4821,
+								StartPos:  4404,
+								EndPos:    4407,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -13844,8 +13514,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 244,
 										EndLine:   244,
-										StartPos:  4818,
-										EndPos:    4821,
+										StartPos:  4404,
+										EndPos:    4407,
 									},
 								},
 								Value: []byte("Foo"),
@@ -13857,8 +13527,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 244,
 								EndLine:   244,
-								StartPos:  4823,
-								EndPos:    4826,
+								StartPos:  4409,
+								EndPos:    4412,
 							},
 						},
 						Value: []byte("bar"),
@@ -13868,8 +13538,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 244,
 								EndLine:   244,
-								StartPos:  4826,
-								EndPos:    4828,
+								StartPos:  4412,
+								EndPos:    4414,
 							},
 						},
 					},
@@ -13880,8 +13550,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 245,
 						EndLine:   245,
-						StartPos:  4832,
-						EndPos:    4853,
+						StartPos:  4416,
+						EndPos:    4437,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -13889,8 +13559,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 245,
 							EndLine:   245,
-							StartPos:  4832,
-							EndPos:    4852,
+							StartPos:  4416,
+							EndPos:    4436,
 						},
 					},
 					Class: &ast.NameRelative{
@@ -13898,8 +13568,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 245,
 								EndLine:   245,
-								StartPos:  4832,
-								EndPos:    4845,
+								StartPos:  4416,
+								EndPos:    4429,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -13908,8 +13578,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 245,
 										EndLine:   245,
-										StartPos:  4842,
-										EndPos:    4845,
+										StartPos:  4426,
+										EndPos:    4429,
 									},
 								},
 								Value: []byte("Foo"),
@@ -13921,8 +13591,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 245,
 								EndLine:   245,
-								StartPos:  4847,
-								EndPos:    4850,
+								StartPos:  4431,
+								EndPos:    4434,
 							},
 						},
 						Value: []byte("bar"),
@@ -13932,8 +13602,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 245,
 								EndLine:   245,
-								StartPos:  4850,
-								EndPos:    4852,
+								StartPos:  4434,
+								EndPos:    4436,
 							},
 						},
 					},
@@ -13944,8 +13614,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 246,
 						EndLine:   246,
-						StartPos:  4856,
-						EndPos:    4868,
+						StartPos:  4438,
+						EndPos:    4450,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -13953,8 +13623,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 246,
 							EndLine:   246,
-							StartPos:  4856,
-							EndPos:    4867,
+							StartPos:  4438,
+							EndPos:    4449,
 						},
 					},
 					Class: &ast.NameFullyQualified{
@@ -13962,8 +13632,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 246,
 								EndLine:   246,
-								StartPos:  4856,
-								EndPos:    4860,
+								StartPos:  4438,
+								EndPos:    4442,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -13972,8 +13642,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 246,
 										EndLine:   246,
-										StartPos:  4857,
-										EndPos:    4860,
+										StartPos:  4439,
+										EndPos:    4442,
 									},
 								},
 								Value: []byte("Foo"),
@@ -13985,8 +13655,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 246,
 								EndLine:   246,
-								StartPos:  4862,
-								EndPos:    4865,
+								StartPos:  4444,
+								EndPos:    4447,
 							},
 						},
 						Value: []byte("bar"),
@@ -13996,8 +13666,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 246,
 								EndLine:   246,
-								StartPos:  4865,
-								EndPos:    4867,
+								StartPos:  4447,
+								EndPos:    4449,
 							},
 						},
 					},
@@ -14008,8 +13678,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 247,
 						EndLine:   247,
-						StartPos:  4871,
-						EndPos:    4881,
+						StartPos:  4451,
+						EndPos:    4461,
 					},
 				},
 				Expr: &ast.ExprStaticPropertyFetch{
@@ -14017,8 +13687,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 247,
 							EndLine:   247,
-							StartPos:  4871,
-							EndPos:    4880,
+							StartPos:  4451,
+							EndPos:    4460,
 						},
 					},
 					Class: &ast.NameName{
@@ -14026,8 +13696,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 247,
 								EndLine:   247,
-								StartPos:  4871,
-								EndPos:    4874,
+								StartPos:  4451,
+								EndPos:    4454,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -14036,8 +13706,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 247,
 										EndLine:   247,
-										StartPos:  4871,
-										EndPos:    4874,
+										StartPos:  4451,
+										EndPos:    4454,
 									},
 								},
 								Value: []byte("Foo"),
@@ -14049,8 +13719,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 247,
 								EndLine:   247,
-								StartPos:  4876,
-								EndPos:    4880,
+								StartPos:  4456,
+								EndPos:    4460,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14058,8 +13728,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 247,
 									EndLine:   247,
-									StartPos:  4876,
-									EndPos:    4880,
+									StartPos:  4456,
+									EndPos:    4460,
 								},
 							},
 							Value: []byte("$bar"),
@@ -14072,8 +13742,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 248,
 						EndLine:   248,
-						StartPos:  4884,
-						EndPos:    4895,
+						StartPos:  4462,
+						EndPos:    4473,
 					},
 				},
 				Expr: &ast.ExprStaticPropertyFetch{
@@ -14081,8 +13751,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 248,
 							EndLine:   248,
-							StartPos:  4884,
-							EndPos:    4894,
+							StartPos:  4462,
+							EndPos:    4472,
 						},
 					},
 					Class: &ast.ExprVariable{
@@ -14090,8 +13760,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 248,
 								EndLine:   248,
-								StartPos:  4884,
-								EndPos:    4888,
+								StartPos:  4462,
+								EndPos:    4466,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14099,8 +13769,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 248,
 									EndLine:   248,
-									StartPos:  4884,
-									EndPos:    4888,
+									StartPos:  4462,
+									EndPos:    4466,
 								},
 							},
 							Value: []byte("$foo"),
@@ -14111,8 +13781,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 248,
 								EndLine:   248,
-								StartPos:  4890,
-								EndPos:    4894,
+								StartPos:  4468,
+								EndPos:    4472,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14120,8 +13790,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 248,
 									EndLine:   248,
-									StartPos:  4890,
-									EndPos:    4894,
+									StartPos:  4468,
+									EndPos:    4472,
 								},
 							},
 							Value: []byte("$bar"),
@@ -14134,8 +13804,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 249,
 						EndLine:   249,
-						StartPos:  4898,
-						EndPos:    4918,
+						StartPos:  4474,
+						EndPos:    4494,
 					},
 				},
 				Expr: &ast.ExprStaticPropertyFetch{
@@ -14143,8 +13813,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 249,
 							EndLine:   249,
-							StartPos:  4898,
-							EndPos:    4917,
+							StartPos:  4474,
+							EndPos:    4493,
 						},
 					},
 					Class: &ast.NameRelative{
@@ -14152,8 +13822,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 249,
 								EndLine:   249,
-								StartPos:  4898,
-								EndPos:    4911,
+								StartPos:  4474,
+								EndPos:    4487,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -14162,8 +13832,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 249,
 										EndLine:   249,
-										StartPos:  4908,
-										EndPos:    4911,
+										StartPos:  4484,
+										EndPos:    4487,
 									},
 								},
 								Value: []byte("Foo"),
@@ -14175,8 +13845,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 249,
 								EndLine:   249,
-								StartPos:  4913,
-								EndPos:    4917,
+								StartPos:  4489,
+								EndPos:    4493,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14184,8 +13854,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 249,
 									EndLine:   249,
-									StartPos:  4913,
-									EndPos:    4917,
+									StartPos:  4489,
+									EndPos:    4493,
 								},
 							},
 							Value: []byte("$bar"),
@@ -14198,8 +13868,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 250,
 						EndLine:   250,
-						StartPos:  4921,
-						EndPos:    4932,
+						StartPos:  4495,
+						EndPos:    4506,
 					},
 				},
 				Expr: &ast.ExprStaticPropertyFetch{
@@ -14207,8 +13877,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 250,
 							EndLine:   250,
-							StartPos:  4921,
-							EndPos:    4931,
+							StartPos:  4495,
+							EndPos:    4505,
 						},
 					},
 					Class: &ast.NameFullyQualified{
@@ -14216,8 +13886,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 250,
 								EndLine:   250,
-								StartPos:  4921,
-								EndPos:    4925,
+								StartPos:  4495,
+								EndPos:    4499,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -14226,8 +13896,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 250,
 										EndLine:   250,
-										StartPos:  4922,
-										EndPos:    4925,
+										StartPos:  4496,
+										EndPos:    4499,
 									},
 								},
 								Value: []byte("Foo"),
@@ -14239,8 +13909,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 250,
 								EndLine:   250,
-								StartPos:  4927,
-								EndPos:    4931,
+								StartPos:  4501,
+								EndPos:    4505,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14248,8 +13918,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 250,
 									EndLine:   250,
-									StartPos:  4927,
-									EndPos:    4931,
+									StartPos:  4501,
+									EndPos:    4505,
 								},
 							},
 							Value: []byte("$bar"),
@@ -14262,8 +13932,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 251,
 						EndLine:   251,
-						StartPos:  4935,
-						EndPos:    4948,
+						StartPos:  4507,
+						EndPos:    4520,
 					},
 				},
 				Expr: &ast.ExprTernary{
@@ -14271,8 +13941,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 251,
 							EndLine:   251,
-							StartPos:  4935,
-							EndPos:    4947,
+							StartPos:  4507,
+							EndPos:    4519,
 						},
 					},
 					Condition: &ast.ExprVariable{
@@ -14280,8 +13950,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 251,
 								EndLine:   251,
-								StartPos:  4935,
-								EndPos:    4937,
+								StartPos:  4507,
+								EndPos:    4509,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14289,8 +13959,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 251,
 									EndLine:   251,
-									StartPos:  4935,
-									EndPos:    4937,
+									StartPos:  4507,
+									EndPos:    4509,
 								},
 							},
 							Value: []byte("$a"),
@@ -14301,8 +13971,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 251,
 								EndLine:   251,
-								StartPos:  4940,
-								EndPos:    4942,
+								StartPos:  4512,
+								EndPos:    4514,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14310,8 +13980,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 251,
 									EndLine:   251,
-									StartPos:  4940,
-									EndPos:    4942,
+									StartPos:  4512,
+									EndPos:    4514,
 								},
 							},
 							Value: []byte("$b"),
@@ -14322,8 +13992,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 251,
 								EndLine:   251,
-								StartPos:  4945,
-								EndPos:    4947,
+								StartPos:  4517,
+								EndPos:    4519,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14331,8 +14001,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 251,
 									EndLine:   251,
-									StartPos:  4945,
-									EndPos:    4947,
+									StartPos:  4517,
+									EndPos:    4519,
 								},
 							},
 							Value: []byte("$c"),
@@ -14345,8 +14015,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 252,
 						EndLine:   252,
-						StartPos:  4951,
-						EndPos:    4961,
+						StartPos:  4521,
+						EndPos:    4531,
 					},
 				},
 				Expr: &ast.ExprTernary{
@@ -14354,8 +14024,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 252,
 							EndLine:   252,
-							StartPos:  4951,
-							EndPos:    4960,
+							StartPos:  4521,
+							EndPos:    4530,
 						},
 					},
 					Condition: &ast.ExprVariable{
@@ -14363,8 +14033,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 252,
 								EndLine:   252,
-								StartPos:  4951,
-								EndPos:    4953,
+								StartPos:  4521,
+								EndPos:    4523,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14372,8 +14042,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 252,
 									EndLine:   252,
-									StartPos:  4951,
-									EndPos:    4953,
+									StartPos:  4521,
+									EndPos:    4523,
 								},
 							},
 							Value: []byte("$a"),
@@ -14384,8 +14054,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 252,
 								EndLine:   252,
-								StartPos:  4958,
-								EndPos:    4960,
+								StartPos:  4528,
+								EndPos:    4530,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14393,8 +14063,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 252,
 									EndLine:   252,
-									StartPos:  4958,
-									EndPos:    4960,
+									StartPos:  4528,
+									EndPos:    4530,
 								},
 							},
 							Value: []byte("$c"),
@@ -14407,8 +14077,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 253,
 						EndLine:   253,
-						StartPos:  4964,
-						EndPos:    4987,
+						StartPos:  4532,
+						EndPos:    4555,
 					},
 				},
 				Expr: &ast.ExprTernary{
@@ -14416,8 +14086,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 253,
 							EndLine:   253,
-							StartPos:  4964,
-							EndPos:    4986,
+							StartPos:  4532,
+							EndPos:    4554,
 						},
 					},
 					Condition: &ast.ExprVariable{
@@ -14425,8 +14095,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 253,
 								EndLine:   253,
-								StartPos:  4964,
-								EndPos:    4966,
+								StartPos:  4532,
+								EndPos:    4534,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14434,8 +14104,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 253,
 									EndLine:   253,
-									StartPos:  4964,
-									EndPos:    4966,
+									StartPos:  4532,
+									EndPos:    4534,
 								},
 							},
 							Value: []byte("$a"),
@@ -14446,8 +14116,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 253,
 								EndLine:   253,
-								StartPos:  4969,
-								EndPos:    4981,
+								StartPos:  4537,
+								EndPos:    4549,
 							},
 						},
 						Condition: &ast.ExprVariable{
@@ -14455,8 +14125,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 253,
 									EndLine:   253,
-									StartPos:  4969,
-									EndPos:    4971,
+									StartPos:  4537,
+									EndPos:    4539,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -14464,8 +14134,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 253,
 										EndLine:   253,
-										StartPos:  4969,
-										EndPos:    4971,
+										StartPos:  4537,
+										EndPos:    4539,
 									},
 								},
 								Value: []byte("$b"),
@@ -14476,8 +14146,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 253,
 									EndLine:   253,
-									StartPos:  4974,
-									EndPos:    4976,
+									StartPos:  4542,
+									EndPos:    4544,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -14485,8 +14155,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 253,
 										EndLine:   253,
-										StartPos:  4974,
-										EndPos:    4976,
+										StartPos:  4542,
+										EndPos:    4544,
 									},
 								},
 								Value: []byte("$c"),
@@ -14497,8 +14167,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 253,
 									EndLine:   253,
-									StartPos:  4979,
-									EndPos:    4981,
+									StartPos:  4547,
+									EndPos:    4549,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -14506,8 +14176,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 253,
 										EndLine:   253,
-										StartPos:  4979,
-										EndPos:    4981,
+										StartPos:  4547,
+										EndPos:    4549,
 									},
 								},
 								Value: []byte("$d"),
@@ -14519,8 +14189,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 253,
 								EndLine:   253,
-								StartPos:  4984,
-								EndPos:    4986,
+								StartPos:  4552,
+								EndPos:    4554,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14528,8 +14198,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 253,
 									EndLine:   253,
-									StartPos:  4984,
-									EndPos:    4986,
+									StartPos:  4552,
+									EndPos:    4554,
 								},
 							},
 							Value: []byte("$e"),
@@ -14542,8 +14212,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 254,
 						EndLine:   254,
-						StartPos:  4990,
-						EndPos:    5013,
+						StartPos:  4556,
+						EndPos:    4579,
 					},
 				},
 				Expr: &ast.ExprTernary{
@@ -14551,8 +14221,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 254,
 							EndLine:   254,
-							StartPos:  4990,
-							EndPos:    5012,
+							StartPos:  4556,
+							EndPos:    4578,
 						},
 					},
 					Condition: &ast.ExprTernary{
@@ -14560,8 +14230,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 254,
 								EndLine:   254,
-								StartPos:  4990,
-								EndPos:    5002,
+								StartPos:  4556,
+								EndPos:    4568,
 							},
 						},
 						Condition: &ast.ExprVariable{
@@ -14569,8 +14239,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 254,
 									EndLine:   254,
-									StartPos:  4990,
-									EndPos:    4992,
+									StartPos:  4556,
+									EndPos:    4558,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -14578,8 +14248,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 254,
 										EndLine:   254,
-										StartPos:  4990,
-										EndPos:    4992,
+										StartPos:  4556,
+										EndPos:    4558,
 									},
 								},
 								Value: []byte("$a"),
@@ -14590,8 +14260,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 254,
 									EndLine:   254,
-									StartPos:  4995,
-									EndPos:    4997,
+									StartPos:  4561,
+									EndPos:    4563,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -14599,8 +14269,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 254,
 										EndLine:   254,
-										StartPos:  4995,
-										EndPos:    4997,
+										StartPos:  4561,
+										EndPos:    4563,
 									},
 								},
 								Value: []byte("$b"),
@@ -14611,8 +14281,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 254,
 									EndLine:   254,
-									StartPos:  5000,
-									EndPos:    5002,
+									StartPos:  4566,
+									EndPos:    4568,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -14620,8 +14290,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 254,
 										EndLine:   254,
-										StartPos:  5000,
-										EndPos:    5002,
+										StartPos:  4566,
+										EndPos:    4568,
 									},
 								},
 								Value: []byte("$c"),
@@ -14633,8 +14303,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 254,
 								EndLine:   254,
-								StartPos:  5005,
-								EndPos:    5007,
+								StartPos:  4571,
+								EndPos:    4573,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14642,8 +14312,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 254,
 									EndLine:   254,
-									StartPos:  5005,
-									EndPos:    5007,
+									StartPos:  4571,
+									EndPos:    4573,
 								},
 							},
 							Value: []byte("$d"),
@@ -14654,8 +14324,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 254,
 								EndLine:   254,
-								StartPos:  5010,
-								EndPos:    5012,
+								StartPos:  4576,
+								EndPos:    4578,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14663,8 +14333,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 254,
 									EndLine:   254,
-									StartPos:  5010,
-									EndPos:    5012,
+									StartPos:  4576,
+									EndPos:    4578,
 								},
 							},
 							Value: []byte("$e"),
@@ -14677,8 +14347,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 255,
 						EndLine:   255,
-						StartPos:  5016,
-						EndPos:    5020,
+						StartPos:  4580,
+						EndPos:    4584,
 					},
 				},
 				Expr: &ast.ExprUnaryMinus{
@@ -14686,8 +14356,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 255,
 							EndLine:   255,
-							StartPos:  5016,
-							EndPos:    5019,
+							StartPos:  4580,
+							EndPos:    4583,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -14695,8 +14365,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 255,
 								EndLine:   255,
-								StartPos:  5017,
-								EndPos:    5019,
+								StartPos:  4581,
+								EndPos:    4583,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14704,8 +14374,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 255,
 									EndLine:   255,
-									StartPos:  5017,
-									EndPos:    5019,
+									StartPos:  4581,
+									EndPos:    4583,
 								},
 							},
 							Value: []byte("$a"),
@@ -14718,8 +14388,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 256,
 						EndLine:   256,
-						StartPos:  5023,
-						EndPos:    5027,
+						StartPos:  4585,
+						EndPos:    4589,
 					},
 				},
 				Expr: &ast.ExprUnaryPlus{
@@ -14727,8 +14397,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 256,
 							EndLine:   256,
-							StartPos:  5023,
-							EndPos:    5026,
+							StartPos:  4585,
+							EndPos:    4588,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -14736,8 +14406,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 256,
 								EndLine:   256,
-								StartPos:  5024,
-								EndPos:    5026,
+								StartPos:  4586,
+								EndPos:    4588,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14745,8 +14415,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 256,
 									EndLine:   256,
-									StartPos:  5024,
-									EndPos:    5026,
+									StartPos:  4586,
+									EndPos:    4588,
 								},
 							},
 							Value: []byte("$a"),
@@ -14759,8 +14429,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 257,
 						EndLine:   257,
-						StartPos:  5030,
-						EndPos:    5034,
+						StartPos:  4590,
+						EndPos:    4594,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -14768,8 +14438,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 257,
 							EndLine:   257,
-							StartPos:  5030,
-							EndPos:    5033,
+							StartPos:  4590,
+							EndPos:    4593,
 						},
 					},
 					VarName: &ast.ExprVariable{
@@ -14777,8 +14447,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 257,
 								EndLine:   257,
-								StartPos:  5031,
-								EndPos:    5033,
+								StartPos:  4591,
+								EndPos:    4593,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14786,8 +14456,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 257,
 									EndLine:   257,
-									StartPos:  5031,
-									EndPos:    5033,
+									StartPos:  4591,
+									EndPos:    4593,
 								},
 							},
 							Value: []byte("$a"),
@@ -14800,8 +14470,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 258,
 						EndLine:   258,
-						StartPos:  5037,
-						EndPos:    5043,
+						StartPos:  4595,
+						EndPos:    4601,
 					},
 				},
 				Expr: &ast.ExprYield{
@@ -14809,8 +14479,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 258,
 							EndLine:   258,
-							StartPos:  5037,
-							EndPos:    5042,
+							StartPos:  4595,
+							EndPos:    4600,
 						},
 					},
 				},
@@ -14820,8 +14490,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 259,
 						EndLine:   259,
-						StartPos:  5046,
-						EndPos:    5055,
+						StartPos:  4602,
+						EndPos:    4611,
 					},
 				},
 				Expr: &ast.ExprYield{
@@ -14829,8 +14499,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 259,
 							EndLine:   259,
-							StartPos:  5046,
-							EndPos:    5054,
+							StartPos:  4602,
+							EndPos:    4610,
 						},
 					},
 					Value: &ast.ExprVariable{
@@ -14838,8 +14508,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 259,
 								EndLine:   259,
-								StartPos:  5052,
-								EndPos:    5054,
+								StartPos:  4608,
+								EndPos:    4610,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14847,8 +14517,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 259,
 									EndLine:   259,
-									StartPos:  5052,
-									EndPos:    5054,
+									StartPos:  4608,
+									EndPos:    4610,
 								},
 							},
 							Value: []byte("$a"),
@@ -14861,8 +14531,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 260,
 						EndLine:   260,
-						StartPos:  5058,
-						EndPos:    5073,
+						StartPos:  4612,
+						EndPos:    4627,
 					},
 				},
 				Expr: &ast.ExprYield{
@@ -14870,8 +14540,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 260,
 							EndLine:   260,
-							StartPos:  5058,
-							EndPos:    5072,
+							StartPos:  4612,
+							EndPos:    4626,
 						},
 					},
 					Key: &ast.ExprVariable{
@@ -14879,8 +14549,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 260,
 								EndLine:   260,
-								StartPos:  5064,
-								EndPos:    5066,
+								StartPos:  4618,
+								EndPos:    4620,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14888,8 +14558,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 260,
 									EndLine:   260,
-									StartPos:  5064,
-									EndPos:    5066,
+									StartPos:  4618,
+									EndPos:    4620,
 								},
 							},
 							Value: []byte("$a"),
@@ -14900,8 +14570,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 260,
 								EndLine:   260,
-								StartPos:  5070,
-								EndPos:    5072,
+								StartPos:  4624,
+								EndPos:    4626,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14909,8 +14579,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 260,
 									EndLine:   260,
-									StartPos:  5070,
-									EndPos:    5072,
+									StartPos:  4624,
+									EndPos:    4626,
 								},
 							},
 							Value: []byte("$b"),
@@ -14923,8 +14593,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 261,
 						EndLine:   261,
-						StartPos:  5076,
-						EndPos:    5090,
+						StartPos:  4628,
+						EndPos:    4642,
 					},
 				},
 				Expr: &ast.ExprYieldFrom{
@@ -14932,8 +14602,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 261,
 							EndLine:   261,
-							StartPos:  5076,
-							EndPos:    5089,
+							StartPos:  4628,
+							EndPos:    4641,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -14941,8 +14611,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 261,
 								EndLine:   261,
-								StartPos:  5087,
-								EndPos:    5089,
+								StartPos:  4639,
+								EndPos:    4641,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14950,8 +14620,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 261,
 									EndLine:   261,
-									StartPos:  5087,
-									EndPos:    5089,
+									StartPos:  4639,
+									EndPos:    4641,
 								},
 							},
 							Value: []byte("$a"),
@@ -14964,8 +14634,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 263,
 						EndLine:   263,
-						StartPos:  5096,
-						EndPos:    5106,
+						StartPos:  4644,
+						EndPos:    4654,
 					},
 				},
 				Expr: &ast.ExprCastArray{
@@ -14973,8 +14643,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 263,
 							EndLine:   263,
-							StartPos:  5096,
-							EndPos:    5105,
+							StartPos:  4644,
+							EndPos:    4653,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -14982,8 +14652,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 263,
 								EndLine:   263,
-								StartPos:  5103,
-								EndPos:    5105,
+								StartPos:  4651,
+								EndPos:    4653,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -14991,8 +14661,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 263,
 									EndLine:   263,
-									StartPos:  5103,
-									EndPos:    5105,
+									StartPos:  4651,
+									EndPos:    4653,
 								},
 							},
 							Value: []byte("$a"),
@@ -15005,8 +14675,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 264,
 						EndLine:   264,
-						StartPos:  5109,
-						EndPos:    5121,
+						StartPos:  4655,
+						EndPos:    4667,
 					},
 				},
 				Expr: &ast.ExprCastBool{
@@ -15014,8 +14684,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 264,
 							EndLine:   264,
-							StartPos:  5109,
-							EndPos:    5120,
+							StartPos:  4655,
+							EndPos:    4666,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -15023,8 +14693,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 264,
 								EndLine:   264,
-								StartPos:  5118,
-								EndPos:    5120,
+								StartPos:  4664,
+								EndPos:    4666,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15032,8 +14702,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 264,
 									EndLine:   264,
-									StartPos:  5118,
-									EndPos:    5120,
+									StartPos:  4664,
+									EndPos:    4666,
 								},
 							},
 							Value: []byte("$a"),
@@ -15046,8 +14716,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 265,
 						EndLine:   265,
-						StartPos:  5124,
-						EndPos:    5133,
+						StartPos:  4668,
+						EndPos:    4677,
 					},
 				},
 				Expr: &ast.ExprCastBool{
@@ -15055,8 +14725,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 265,
 							EndLine:   265,
-							StartPos:  5124,
-							EndPos:    5132,
+							StartPos:  4668,
+							EndPos:    4676,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -15064,8 +14734,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 265,
 								EndLine:   265,
-								StartPos:  5130,
-								EndPos:    5132,
+								StartPos:  4674,
+								EndPos:    4676,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15073,8 +14743,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 265,
 									EndLine:   265,
-									StartPos:  5130,
-									EndPos:    5132,
+									StartPos:  4674,
+									EndPos:    4676,
 								},
 							},
 							Value: []byte("$a"),
@@ -15087,8 +14757,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 266,
 						EndLine:   266,
-						StartPos:  5136,
-						EndPos:    5147,
+						StartPos:  4678,
+						EndPos:    4689,
 					},
 				},
 				Expr: &ast.ExprCastDouble{
@@ -15096,8 +14766,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 266,
 							EndLine:   266,
-							StartPos:  5136,
-							EndPos:    5146,
+							StartPos:  4678,
+							EndPos:    4688,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -15105,8 +14775,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 266,
 								EndLine:   266,
-								StartPos:  5144,
-								EndPos:    5146,
+								StartPos:  4686,
+								EndPos:    4688,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15114,8 +14784,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 266,
 									EndLine:   266,
-									StartPos:  5144,
-									EndPos:    5146,
+									StartPos:  4686,
+									EndPos:    4688,
 								},
 							},
 							Value: []byte("$a"),
@@ -15128,8 +14798,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 267,
 						EndLine:   267,
-						StartPos:  5150,
-						EndPos:    5160,
+						StartPos:  4690,
+						EndPos:    4700,
 					},
 				},
 				Expr: &ast.ExprCastDouble{
@@ -15137,8 +14807,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 267,
 							EndLine:   267,
-							StartPos:  5150,
-							EndPos:    5159,
+							StartPos:  4690,
+							EndPos:    4699,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -15146,8 +14816,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 267,
 								EndLine:   267,
-								StartPos:  5157,
-								EndPos:    5159,
+								StartPos:  4697,
+								EndPos:    4699,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15155,8 +14825,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 267,
 									EndLine:   267,
-									StartPos:  5157,
-									EndPos:    5159,
+									StartPos:  4697,
+									EndPos:    4699,
 								},
 							},
 							Value: []byte("$a"),
@@ -15169,8 +14839,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 268,
 						EndLine:   268,
-						StartPos:  5163,
-						EndPos:    5175,
+						StartPos:  4701,
+						EndPos:    4713,
 					},
 				},
 				Expr: &ast.ExprCastInt{
@@ -15178,8 +14848,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 268,
 							EndLine:   268,
-							StartPos:  5163,
-							EndPos:    5174,
+							StartPos:  4701,
+							EndPos:    4712,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -15187,8 +14857,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 268,
 								EndLine:   268,
-								StartPos:  5172,
-								EndPos:    5174,
+								StartPos:  4710,
+								EndPos:    4712,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15196,8 +14866,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 268,
 									EndLine:   268,
-									StartPos:  5172,
-									EndPos:    5174,
+									StartPos:  4710,
+									EndPos:    4712,
 								},
 							},
 							Value: []byte("$a"),
@@ -15210,8 +14880,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 269,
 						EndLine:   269,
-						StartPos:  5178,
-						EndPos:    5186,
+						StartPos:  4714,
+						EndPos:    4722,
 					},
 				},
 				Expr: &ast.ExprCastInt{
@@ -15219,8 +14889,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 269,
 							EndLine:   269,
-							StartPos:  5178,
-							EndPos:    5185,
+							StartPos:  4714,
+							EndPos:    4721,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -15228,8 +14898,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 269,
 								EndLine:   269,
-								StartPos:  5183,
-								EndPos:    5185,
+								StartPos:  4719,
+								EndPos:    4721,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15237,8 +14907,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 269,
 									EndLine:   269,
-									StartPos:  5183,
-									EndPos:    5185,
+									StartPos:  4719,
+									EndPos:    4721,
 								},
 							},
 							Value: []byte("$a"),
@@ -15251,8 +14921,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 270,
 						EndLine:   270,
-						StartPos:  5189,
-						EndPos:    5200,
+						StartPos:  4723,
+						EndPos:    4734,
 					},
 				},
 				Expr: &ast.ExprCastObject{
@@ -15260,8 +14930,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 270,
 							EndLine:   270,
-							StartPos:  5189,
-							EndPos:    5199,
+							StartPos:  4723,
+							EndPos:    4733,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -15269,8 +14939,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 270,
 								EndLine:   270,
-								StartPos:  5197,
-								EndPos:    5199,
+								StartPos:  4731,
+								EndPos:    4733,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15278,8 +14948,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 270,
 									EndLine:   270,
-									StartPos:  5197,
-									EndPos:    5199,
+									StartPos:  4731,
+									EndPos:    4733,
 								},
 							},
 							Value: []byte("$a"),
@@ -15292,8 +14962,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 271,
 						EndLine:   271,
-						StartPos:  5203,
-						EndPos:    5214,
+						StartPos:  4735,
+						EndPos:    4746,
 					},
 				},
 				Expr: &ast.ExprCastString{
@@ -15301,8 +14971,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 271,
 							EndLine:   271,
-							StartPos:  5203,
-							EndPos:    5213,
+							StartPos:  4735,
+							EndPos:    4745,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -15310,8 +14980,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 271,
 								EndLine:   271,
-								StartPos:  5211,
-								EndPos:    5213,
+								StartPos:  4743,
+								EndPos:    4745,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15319,8 +14989,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 271,
 									EndLine:   271,
-									StartPos:  5211,
-									EndPos:    5213,
+									StartPos:  4743,
+									EndPos:    4745,
 								},
 							},
 							Value: []byte("$a"),
@@ -15333,8 +15003,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 272,
 						EndLine:   272,
-						StartPos:  5217,
-						EndPos:    5227,
+						StartPos:  4747,
+						EndPos:    4757,
 					},
 				},
 				Expr: &ast.ExprCastUnset{
@@ -15342,8 +15012,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 272,
 							EndLine:   272,
-							StartPos:  5217,
-							EndPos:    5226,
+							StartPos:  4747,
+							EndPos:    4756,
 						},
 					},
 					Expr: &ast.ExprVariable{
@@ -15351,8 +15021,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 272,
 								EndLine:   272,
-								StartPos:  5224,
-								EndPos:    5226,
+								StartPos:  4754,
+								EndPos:    4756,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15360,8 +15030,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 272,
 									EndLine:   272,
-									StartPos:  5224,
-									EndPos:    5226,
+									StartPos:  4754,
+									EndPos:    4756,
 								},
 							},
 							Value: []byte("$a"),
@@ -15374,8 +15044,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 274,
 						EndLine:   274,
-						StartPos:  5231,
-						EndPos:    5239,
+						StartPos:  4759,
+						EndPos:    4767,
 					},
 				},
 				Expr: &ast.ExprBinaryBitwiseAnd{
@@ -15383,8 +15053,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 274,
 							EndLine:   274,
-							StartPos:  5231,
-							EndPos:    5238,
+							StartPos:  4759,
+							EndPos:    4766,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15392,8 +15062,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 274,
 								EndLine:   274,
-								StartPos:  5231,
-								EndPos:    5233,
+								StartPos:  4759,
+								EndPos:    4761,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15401,8 +15071,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 274,
 									EndLine:   274,
-									StartPos:  5231,
-									EndPos:    5233,
+									StartPos:  4759,
+									EndPos:    4761,
 								},
 							},
 							Value: []byte("$a"),
@@ -15413,8 +15083,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 274,
 								EndLine:   274,
-								StartPos:  5236,
-								EndPos:    5238,
+								StartPos:  4764,
+								EndPos:    4766,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15422,8 +15092,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 274,
 									EndLine:   274,
-									StartPos:  5236,
-									EndPos:    5238,
+									StartPos:  4764,
+									EndPos:    4766,
 								},
 							},
 							Value: []byte("$b"),
@@ -15436,8 +15106,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 275,
 						EndLine:   275,
-						StartPos:  5242,
-						EndPos:    5250,
+						StartPos:  4768,
+						EndPos:    4776,
 					},
 				},
 				Expr: &ast.ExprBinaryBitwiseOr{
@@ -15445,8 +15115,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 275,
 							EndLine:   275,
-							StartPos:  5242,
-							EndPos:    5249,
+							StartPos:  4768,
+							EndPos:    4775,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15454,8 +15124,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 275,
 								EndLine:   275,
-								StartPos:  5242,
-								EndPos:    5244,
+								StartPos:  4768,
+								EndPos:    4770,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15463,8 +15133,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 275,
 									EndLine:   275,
-									StartPos:  5242,
-									EndPos:    5244,
+									StartPos:  4768,
+									EndPos:    4770,
 								},
 							},
 							Value: []byte("$a"),
@@ -15475,8 +15145,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 275,
 								EndLine:   275,
-								StartPos:  5247,
-								EndPos:    5249,
+								StartPos:  4773,
+								EndPos:    4775,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15484,8 +15154,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 275,
 									EndLine:   275,
-									StartPos:  5247,
-									EndPos:    5249,
+									StartPos:  4773,
+									EndPos:    4775,
 								},
 							},
 							Value: []byte("$b"),
@@ -15498,8 +15168,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 276,
 						EndLine:   276,
-						StartPos:  5253,
-						EndPos:    5261,
+						StartPos:  4777,
+						EndPos:    4785,
 					},
 				},
 				Expr: &ast.ExprBinaryBitwiseXor{
@@ -15507,8 +15177,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 276,
 							EndLine:   276,
-							StartPos:  5253,
-							EndPos:    5260,
+							StartPos:  4777,
+							EndPos:    4784,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15516,8 +15186,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 276,
 								EndLine:   276,
-								StartPos:  5253,
-								EndPos:    5255,
+								StartPos:  4777,
+								EndPos:    4779,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15525,8 +15195,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 276,
 									EndLine:   276,
-									StartPos:  5253,
-									EndPos:    5255,
+									StartPos:  4777,
+									EndPos:    4779,
 								},
 							},
 							Value: []byte("$a"),
@@ -15537,8 +15207,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 276,
 								EndLine:   276,
-								StartPos:  5258,
-								EndPos:    5260,
+								StartPos:  4782,
+								EndPos:    4784,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15546,8 +15216,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 276,
 									EndLine:   276,
-									StartPos:  5258,
-									EndPos:    5260,
+									StartPos:  4782,
+									EndPos:    4784,
 								},
 							},
 							Value: []byte("$b"),
@@ -15560,8 +15230,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 277,
 						EndLine:   277,
-						StartPos:  5264,
-						EndPos:    5273,
+						StartPos:  4786,
+						EndPos:    4795,
 					},
 				},
 				Expr: &ast.ExprBinaryBooleanAnd{
@@ -15569,8 +15239,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 277,
 							EndLine:   277,
-							StartPos:  5264,
-							EndPos:    5272,
+							StartPos:  4786,
+							EndPos:    4794,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15578,8 +15248,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 277,
 								EndLine:   277,
-								StartPos:  5264,
-								EndPos:    5266,
+								StartPos:  4786,
+								EndPos:    4788,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15587,8 +15257,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 277,
 									EndLine:   277,
-									StartPos:  5264,
-									EndPos:    5266,
+									StartPos:  4786,
+									EndPos:    4788,
 								},
 							},
 							Value: []byte("$a"),
@@ -15599,8 +15269,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 277,
 								EndLine:   277,
-								StartPos:  5270,
-								EndPos:    5272,
+								StartPos:  4792,
+								EndPos:    4794,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15608,8 +15278,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 277,
 									EndLine:   277,
-									StartPos:  5270,
-									EndPos:    5272,
+									StartPos:  4792,
+									EndPos:    4794,
 								},
 							},
 							Value: []byte("$b"),
@@ -15622,8 +15292,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 278,
 						EndLine:   278,
-						StartPos:  5276,
-						EndPos:    5285,
+						StartPos:  4796,
+						EndPos:    4805,
 					},
 				},
 				Expr: &ast.ExprBinaryBooleanOr{
@@ -15631,8 +15301,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 278,
 							EndLine:   278,
-							StartPos:  5276,
-							EndPos:    5284,
+							StartPos:  4796,
+							EndPos:    4804,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15640,8 +15310,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 278,
 								EndLine:   278,
-								StartPos:  5276,
-								EndPos:    5278,
+								StartPos:  4796,
+								EndPos:    4798,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15649,8 +15319,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 278,
 									EndLine:   278,
-									StartPos:  5276,
-									EndPos:    5278,
+									StartPos:  4796,
+									EndPos:    4798,
 								},
 							},
 							Value: []byte("$a"),
@@ -15661,8 +15331,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 278,
 								EndLine:   278,
-								StartPos:  5282,
-								EndPos:    5284,
+								StartPos:  4802,
+								EndPos:    4804,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15670,8 +15340,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 278,
 									EndLine:   278,
-									StartPos:  5282,
-									EndPos:    5284,
+									StartPos:  4802,
+									EndPos:    4804,
 								},
 							},
 							Value: []byte("$b"),
@@ -15684,8 +15354,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 279,
 						EndLine:   279,
-						StartPos:  5288,
-						EndPos:    5297,
+						StartPos:  4806,
+						EndPos:    4815,
 					},
 				},
 				Expr: &ast.ExprBinaryCoalesce{
@@ -15693,8 +15363,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 279,
 							EndLine:   279,
-							StartPos:  5288,
-							EndPos:    5296,
+							StartPos:  4806,
+							EndPos:    4814,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15702,8 +15372,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 279,
 								EndLine:   279,
-								StartPos:  5288,
-								EndPos:    5290,
+								StartPos:  4806,
+								EndPos:    4808,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15711,8 +15381,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 279,
 									EndLine:   279,
-									StartPos:  5288,
-									EndPos:    5290,
+									StartPos:  4806,
+									EndPos:    4808,
 								},
 							},
 							Value: []byte("$a"),
@@ -15723,8 +15393,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 279,
 								EndLine:   279,
-								StartPos:  5294,
-								EndPos:    5296,
+								StartPos:  4812,
+								EndPos:    4814,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15732,8 +15402,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 279,
 									EndLine:   279,
-									StartPos:  5294,
-									EndPos:    5296,
+									StartPos:  4812,
+									EndPos:    4814,
 								},
 							},
 							Value: []byte("$b"),
@@ -15746,8 +15416,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 280,
 						EndLine:   280,
-						StartPos:  5300,
-						EndPos:    5308,
+						StartPos:  4816,
+						EndPos:    4824,
 					},
 				},
 				Expr: &ast.ExprBinaryConcat{
@@ -15755,8 +15425,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 280,
 							EndLine:   280,
-							StartPos:  5300,
-							EndPos:    5307,
+							StartPos:  4816,
+							EndPos:    4823,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15764,8 +15434,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 280,
 								EndLine:   280,
-								StartPos:  5300,
-								EndPos:    5302,
+								StartPos:  4816,
+								EndPos:    4818,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15773,8 +15443,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 280,
 									EndLine:   280,
-									StartPos:  5300,
-									EndPos:    5302,
+									StartPos:  4816,
+									EndPos:    4818,
 								},
 							},
 							Value: []byte("$a"),
@@ -15785,8 +15455,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 280,
 								EndLine:   280,
-								StartPos:  5305,
-								EndPos:    5307,
+								StartPos:  4821,
+								EndPos:    4823,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15794,8 +15464,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 280,
 									EndLine:   280,
-									StartPos:  5305,
-									EndPos:    5307,
+									StartPos:  4821,
+									EndPos:    4823,
 								},
 							},
 							Value: []byte("$b"),
@@ -15808,8 +15478,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 281,
 						EndLine:   281,
-						StartPos:  5311,
-						EndPos:    5319,
+						StartPos:  4825,
+						EndPos:    4833,
 					},
 				},
 				Expr: &ast.ExprBinaryDiv{
@@ -15817,8 +15487,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 281,
 							EndLine:   281,
-							StartPos:  5311,
-							EndPos:    5318,
+							StartPos:  4825,
+							EndPos:    4832,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15826,8 +15496,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 281,
 								EndLine:   281,
-								StartPos:  5311,
-								EndPos:    5313,
+								StartPos:  4825,
+								EndPos:    4827,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15835,8 +15505,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 281,
 									EndLine:   281,
-									StartPos:  5311,
-									EndPos:    5313,
+									StartPos:  4825,
+									EndPos:    4827,
 								},
 							},
 							Value: []byte("$a"),
@@ -15847,8 +15517,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 281,
 								EndLine:   281,
-								StartPos:  5316,
-								EndPos:    5318,
+								StartPos:  4830,
+								EndPos:    4832,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15856,8 +15526,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 281,
 									EndLine:   281,
-									StartPos:  5316,
-									EndPos:    5318,
+									StartPos:  4830,
+									EndPos:    4832,
 								},
 							},
 							Value: []byte("$b"),
@@ -15870,8 +15540,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 282,
 						EndLine:   282,
-						StartPos:  5322,
-						EndPos:    5331,
+						StartPos:  4834,
+						EndPos:    4843,
 					},
 				},
 				Expr: &ast.ExprBinaryEqual{
@@ -15879,8 +15549,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 282,
 							EndLine:   282,
-							StartPos:  5322,
-							EndPos:    5330,
+							StartPos:  4834,
+							EndPos:    4842,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15888,8 +15558,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 282,
 								EndLine:   282,
-								StartPos:  5322,
-								EndPos:    5324,
+								StartPos:  4834,
+								EndPos:    4836,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15897,8 +15567,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 282,
 									EndLine:   282,
-									StartPos:  5322,
-									EndPos:    5324,
+									StartPos:  4834,
+									EndPos:    4836,
 								},
 							},
 							Value: []byte("$a"),
@@ -15909,8 +15579,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 282,
 								EndLine:   282,
-								StartPos:  5328,
-								EndPos:    5330,
+								StartPos:  4840,
+								EndPos:    4842,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15918,8 +15588,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 282,
 									EndLine:   282,
-									StartPos:  5328,
-									EndPos:    5330,
+									StartPos:  4840,
+									EndPos:    4842,
 								},
 							},
 							Value: []byte("$b"),
@@ -15932,8 +15602,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 283,
 						EndLine:   283,
-						StartPos:  5334,
-						EndPos:    5343,
+						StartPos:  4844,
+						EndPos:    4853,
 					},
 				},
 				Expr: &ast.ExprBinaryGreaterOrEqual{
@@ -15941,8 +15611,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 283,
 							EndLine:   283,
-							StartPos:  5334,
-							EndPos:    5342,
+							StartPos:  4844,
+							EndPos:    4852,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -15950,8 +15620,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 283,
 								EndLine:   283,
-								StartPos:  5334,
-								EndPos:    5336,
+								StartPos:  4844,
+								EndPos:    4846,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15959,8 +15629,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 283,
 									EndLine:   283,
-									StartPos:  5334,
-									EndPos:    5336,
+									StartPos:  4844,
+									EndPos:    4846,
 								},
 							},
 							Value: []byte("$a"),
@@ -15971,8 +15641,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 283,
 								EndLine:   283,
-								StartPos:  5340,
-								EndPos:    5342,
+								StartPos:  4850,
+								EndPos:    4852,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -15980,8 +15650,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 283,
 									EndLine:   283,
-									StartPos:  5340,
-									EndPos:    5342,
+									StartPos:  4850,
+									EndPos:    4852,
 								},
 							},
 							Value: []byte("$b"),
@@ -15994,8 +15664,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 284,
 						EndLine:   284,
-						StartPos:  5346,
-						EndPos:    5354,
+						StartPos:  4854,
+						EndPos:    4862,
 					},
 				},
 				Expr: &ast.ExprBinaryGreater{
@@ -16003,8 +15673,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 284,
 							EndLine:   284,
-							StartPos:  5346,
-							EndPos:    5353,
+							StartPos:  4854,
+							EndPos:    4861,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16012,8 +15682,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 284,
 								EndLine:   284,
-								StartPos:  5346,
-								EndPos:    5348,
+								StartPos:  4854,
+								EndPos:    4856,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16021,8 +15691,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 284,
 									EndLine:   284,
-									StartPos:  5346,
-									EndPos:    5348,
+									StartPos:  4854,
+									EndPos:    4856,
 								},
 							},
 							Value: []byte("$a"),
@@ -16033,8 +15703,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 284,
 								EndLine:   284,
-								StartPos:  5351,
-								EndPos:    5353,
+								StartPos:  4859,
+								EndPos:    4861,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16042,8 +15712,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 284,
 									EndLine:   284,
-									StartPos:  5351,
-									EndPos:    5353,
+									StartPos:  4859,
+									EndPos:    4861,
 								},
 							},
 							Value: []byte("$b"),
@@ -16056,8 +15726,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 285,
 						EndLine:   285,
-						StartPos:  5357,
-						EndPos:    5367,
+						StartPos:  4863,
+						EndPos:    4873,
 					},
 				},
 				Expr: &ast.ExprBinaryIdentical{
@@ -16065,8 +15735,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 285,
 							EndLine:   285,
-							StartPos:  5357,
-							EndPos:    5366,
+							StartPos:  4863,
+							EndPos:    4872,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16074,8 +15744,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 285,
 								EndLine:   285,
-								StartPos:  5357,
-								EndPos:    5359,
+								StartPos:  4863,
+								EndPos:    4865,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16083,8 +15753,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 285,
 									EndLine:   285,
-									StartPos:  5357,
-									EndPos:    5359,
+									StartPos:  4863,
+									EndPos:    4865,
 								},
 							},
 							Value: []byte("$a"),
@@ -16095,8 +15765,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 285,
 								EndLine:   285,
-								StartPos:  5364,
-								EndPos:    5366,
+								StartPos:  4870,
+								EndPos:    4872,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16104,8 +15774,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 285,
 									EndLine:   285,
-									StartPos:  5364,
-									EndPos:    5366,
+									StartPos:  4870,
+									EndPos:    4872,
 								},
 							},
 							Value: []byte("$b"),
@@ -16118,8 +15788,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 286,
 						EndLine:   286,
-						StartPos:  5370,
-						EndPos:    5380,
+						StartPos:  4874,
+						EndPos:    4884,
 					},
 				},
 				Expr: &ast.ExprBinaryLogicalAnd{
@@ -16127,8 +15797,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 286,
 							EndLine:   286,
-							StartPos:  5370,
-							EndPos:    5379,
+							StartPos:  4874,
+							EndPos:    4883,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16136,8 +15806,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 286,
 								EndLine:   286,
-								StartPos:  5370,
-								EndPos:    5372,
+								StartPos:  4874,
+								EndPos:    4876,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16145,8 +15815,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 286,
 									EndLine:   286,
-									StartPos:  5370,
-									EndPos:    5372,
+									StartPos:  4874,
+									EndPos:    4876,
 								},
 							},
 							Value: []byte("$a"),
@@ -16157,8 +15827,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 286,
 								EndLine:   286,
-								StartPos:  5377,
-								EndPos:    5379,
+								StartPos:  4881,
+								EndPos:    4883,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16166,8 +15836,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 286,
 									EndLine:   286,
-									StartPos:  5377,
-									EndPos:    5379,
+									StartPos:  4881,
+									EndPos:    4883,
 								},
 							},
 							Value: []byte("$b"),
@@ -16180,8 +15850,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 287,
 						EndLine:   287,
-						StartPos:  5383,
-						EndPos:    5392,
+						StartPos:  4885,
+						EndPos:    4894,
 					},
 				},
 				Expr: &ast.ExprBinaryLogicalOr{
@@ -16189,8 +15859,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 287,
 							EndLine:   287,
-							StartPos:  5383,
-							EndPos:    5391,
+							StartPos:  4885,
+							EndPos:    4893,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16198,8 +15868,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 287,
 								EndLine:   287,
-								StartPos:  5383,
-								EndPos:    5385,
+								StartPos:  4885,
+								EndPos:    4887,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16207,8 +15877,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 287,
 									EndLine:   287,
-									StartPos:  5383,
-									EndPos:    5385,
+									StartPos:  4885,
+									EndPos:    4887,
 								},
 							},
 							Value: []byte("$a"),
@@ -16219,8 +15889,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 287,
 								EndLine:   287,
-								StartPos:  5389,
-								EndPos:    5391,
+								StartPos:  4891,
+								EndPos:    4893,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16228,8 +15898,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 287,
 									EndLine:   287,
-									StartPos:  5389,
-									EndPos:    5391,
+									StartPos:  4891,
+									EndPos:    4893,
 								},
 							},
 							Value: []byte("$b"),
@@ -16242,8 +15912,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 288,
 						EndLine:   288,
-						StartPos:  5395,
-						EndPos:    5405,
+						StartPos:  4895,
+						EndPos:    4905,
 					},
 				},
 				Expr: &ast.ExprBinaryLogicalXor{
@@ -16251,8 +15921,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 288,
 							EndLine:   288,
-							StartPos:  5395,
-							EndPos:    5404,
+							StartPos:  4895,
+							EndPos:    4904,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16260,8 +15930,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 288,
 								EndLine:   288,
-								StartPos:  5395,
-								EndPos:    5397,
+								StartPos:  4895,
+								EndPos:    4897,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16269,8 +15939,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 288,
 									EndLine:   288,
-									StartPos:  5395,
-									EndPos:    5397,
+									StartPos:  4895,
+									EndPos:    4897,
 								},
 							},
 							Value: []byte("$a"),
@@ -16281,8 +15951,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 288,
 								EndLine:   288,
-								StartPos:  5402,
-								EndPos:    5404,
+								StartPos:  4902,
+								EndPos:    4904,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16290,8 +15960,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 288,
 									EndLine:   288,
-									StartPos:  5402,
-									EndPos:    5404,
+									StartPos:  4902,
+									EndPos:    4904,
 								},
 							},
 							Value: []byte("$b"),
@@ -16304,8 +15974,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 289,
 						EndLine:   289,
-						StartPos:  5408,
-						EndPos:    5416,
+						StartPos:  4906,
+						EndPos:    4914,
 					},
 				},
 				Expr: &ast.ExprBinaryMinus{
@@ -16313,8 +15983,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 289,
 							EndLine:   289,
-							StartPos:  5408,
-							EndPos:    5415,
+							StartPos:  4906,
+							EndPos:    4913,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16322,8 +15992,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 289,
 								EndLine:   289,
-								StartPos:  5408,
-								EndPos:    5410,
+								StartPos:  4906,
+								EndPos:    4908,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16331,8 +16001,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 289,
 									EndLine:   289,
-									StartPos:  5408,
-									EndPos:    5410,
+									StartPos:  4906,
+									EndPos:    4908,
 								},
 							},
 							Value: []byte("$a"),
@@ -16343,8 +16013,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 289,
 								EndLine:   289,
-								StartPos:  5413,
-								EndPos:    5415,
+								StartPos:  4911,
+								EndPos:    4913,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16352,8 +16022,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 289,
 									EndLine:   289,
-									StartPos:  5413,
-									EndPos:    5415,
+									StartPos:  4911,
+									EndPos:    4913,
 								},
 							},
 							Value: []byte("$b"),
@@ -16366,8 +16036,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 290,
 						EndLine:   290,
-						StartPos:  5419,
-						EndPos:    5427,
+						StartPos:  4915,
+						EndPos:    4923,
 					},
 				},
 				Expr: &ast.ExprBinaryMod{
@@ -16375,8 +16045,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 290,
 							EndLine:   290,
-							StartPos:  5419,
-							EndPos:    5426,
+							StartPos:  4915,
+							EndPos:    4922,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16384,8 +16054,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 290,
 								EndLine:   290,
-								StartPos:  5419,
-								EndPos:    5421,
+								StartPos:  4915,
+								EndPos:    4917,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16393,8 +16063,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 290,
 									EndLine:   290,
-									StartPos:  5419,
-									EndPos:    5421,
+									StartPos:  4915,
+									EndPos:    4917,
 								},
 							},
 							Value: []byte("$a"),
@@ -16405,8 +16075,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 290,
 								EndLine:   290,
-								StartPos:  5424,
-								EndPos:    5426,
+								StartPos:  4920,
+								EndPos:    4922,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16414,8 +16084,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 290,
 									EndLine:   290,
-									StartPos:  5424,
-									EndPos:    5426,
+									StartPos:  4920,
+									EndPos:    4922,
 								},
 							},
 							Value: []byte("$b"),
@@ -16428,8 +16098,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 291,
 						EndLine:   291,
-						StartPos:  5430,
-						EndPos:    5438,
+						StartPos:  4924,
+						EndPos:    4932,
 					},
 				},
 				Expr: &ast.ExprBinaryMul{
@@ -16437,8 +16107,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 291,
 							EndLine:   291,
-							StartPos:  5430,
-							EndPos:    5437,
+							StartPos:  4924,
+							EndPos:    4931,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16446,8 +16116,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 291,
 								EndLine:   291,
-								StartPos:  5430,
-								EndPos:    5432,
+								StartPos:  4924,
+								EndPos:    4926,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16455,8 +16125,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 291,
 									EndLine:   291,
-									StartPos:  5430,
-									EndPos:    5432,
+									StartPos:  4924,
+									EndPos:    4926,
 								},
 							},
 							Value: []byte("$a"),
@@ -16467,8 +16137,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 291,
 								EndLine:   291,
-								StartPos:  5435,
-								EndPos:    5437,
+								StartPos:  4929,
+								EndPos:    4931,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16476,8 +16146,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 291,
 									EndLine:   291,
-									StartPos:  5435,
-									EndPos:    5437,
+									StartPos:  4929,
+									EndPos:    4931,
 								},
 							},
 							Value: []byte("$b"),
@@ -16490,8 +16160,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 292,
 						EndLine:   292,
-						StartPos:  5441,
-						EndPos:    5450,
+						StartPos:  4933,
+						EndPos:    4942,
 					},
 				},
 				Expr: &ast.ExprBinaryNotEqual{
@@ -16499,8 +16169,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 292,
 							EndLine:   292,
-							StartPos:  5441,
-							EndPos:    5449,
+							StartPos:  4933,
+							EndPos:    4941,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16508,8 +16178,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 292,
 								EndLine:   292,
-								StartPos:  5441,
-								EndPos:    5443,
+								StartPos:  4933,
+								EndPos:    4935,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16517,8 +16187,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 292,
 									EndLine:   292,
-									StartPos:  5441,
-									EndPos:    5443,
+									StartPos:  4933,
+									EndPos:    4935,
 								},
 							},
 							Value: []byte("$a"),
@@ -16529,8 +16199,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 292,
 								EndLine:   292,
-								StartPos:  5447,
-								EndPos:    5449,
+								StartPos:  4939,
+								EndPos:    4941,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16538,8 +16208,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 292,
 									EndLine:   292,
-									StartPos:  5447,
-									EndPos:    5449,
+									StartPos:  4939,
+									EndPos:    4941,
 								},
 							},
 							Value: []byte("$b"),
@@ -16552,8 +16222,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 293,
 						EndLine:   293,
-						StartPos:  5453,
-						EndPos:    5463,
+						StartPos:  4943,
+						EndPos:    4953,
 					},
 				},
 				Expr: &ast.ExprBinaryNotIdentical{
@@ -16561,8 +16231,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 293,
 							EndLine:   293,
-							StartPos:  5453,
-							EndPos:    5462,
+							StartPos:  4943,
+							EndPos:    4952,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16570,8 +16240,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 293,
 								EndLine:   293,
-								StartPos:  5453,
-								EndPos:    5455,
+								StartPos:  4943,
+								EndPos:    4945,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16579,8 +16249,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 293,
 									EndLine:   293,
-									StartPos:  5453,
-									EndPos:    5455,
+									StartPos:  4943,
+									EndPos:    4945,
 								},
 							},
 							Value: []byte("$a"),
@@ -16591,8 +16261,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 293,
 								EndLine:   293,
-								StartPos:  5460,
-								EndPos:    5462,
+								StartPos:  4950,
+								EndPos:    4952,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16600,8 +16270,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 293,
 									EndLine:   293,
-									StartPos:  5460,
-									EndPos:    5462,
+									StartPos:  4950,
+									EndPos:    4952,
 								},
 							},
 							Value: []byte("$b"),
@@ -16614,8 +16284,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 294,
 						EndLine:   294,
-						StartPos:  5466,
-						EndPos:    5474,
+						StartPos:  4954,
+						EndPos:    4962,
 					},
 				},
 				Expr: &ast.ExprBinaryPlus{
@@ -16623,8 +16293,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 294,
 							EndLine:   294,
-							StartPos:  5466,
-							EndPos:    5473,
+							StartPos:  4954,
+							EndPos:    4961,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16632,8 +16302,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 294,
 								EndLine:   294,
-								StartPos:  5466,
-								EndPos:    5468,
+								StartPos:  4954,
+								EndPos:    4956,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16641,8 +16311,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 294,
 									EndLine:   294,
-									StartPos:  5466,
-									EndPos:    5468,
+									StartPos:  4954,
+									EndPos:    4956,
 								},
 							},
 							Value: []byte("$a"),
@@ -16653,8 +16323,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 294,
 								EndLine:   294,
-								StartPos:  5471,
-								EndPos:    5473,
+								StartPos:  4959,
+								EndPos:    4961,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16662,8 +16332,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 294,
 									EndLine:   294,
-									StartPos:  5471,
-									EndPos:    5473,
+									StartPos:  4959,
+									EndPos:    4961,
 								},
 							},
 							Value: []byte("$b"),
@@ -16676,8 +16346,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 295,
 						EndLine:   295,
-						StartPos:  5477,
-						EndPos:    5486,
+						StartPos:  4963,
+						EndPos:    4972,
 					},
 				},
 				Expr: &ast.ExprBinaryPow{
@@ -16685,8 +16355,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 295,
 							EndLine:   295,
-							StartPos:  5477,
-							EndPos:    5485,
+							StartPos:  4963,
+							EndPos:    4971,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16694,8 +16364,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 295,
 								EndLine:   295,
-								StartPos:  5477,
-								EndPos:    5479,
+								StartPos:  4963,
+								EndPos:    4965,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16703,8 +16373,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 295,
 									EndLine:   295,
-									StartPos:  5477,
-									EndPos:    5479,
+									StartPos:  4963,
+									EndPos:    4965,
 								},
 							},
 							Value: []byte("$a"),
@@ -16715,8 +16385,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 295,
 								EndLine:   295,
-								StartPos:  5483,
-								EndPos:    5485,
+								StartPos:  4969,
+								EndPos:    4971,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16724,8 +16394,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 295,
 									EndLine:   295,
-									StartPos:  5483,
-									EndPos:    5485,
+									StartPos:  4969,
+									EndPos:    4971,
 								},
 							},
 							Value: []byte("$b"),
@@ -16738,8 +16408,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 296,
 						EndLine:   296,
-						StartPos:  5489,
-						EndPos:    5498,
+						StartPos:  4973,
+						EndPos:    4982,
 					},
 				},
 				Expr: &ast.ExprBinaryShiftLeft{
@@ -16747,8 +16417,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 296,
 							EndLine:   296,
-							StartPos:  5489,
-							EndPos:    5497,
+							StartPos:  4973,
+							EndPos:    4981,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16756,8 +16426,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 296,
 								EndLine:   296,
-								StartPos:  5489,
-								EndPos:    5491,
+								StartPos:  4973,
+								EndPos:    4975,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16765,8 +16435,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 296,
 									EndLine:   296,
-									StartPos:  5489,
-									EndPos:    5491,
+									StartPos:  4973,
+									EndPos:    4975,
 								},
 							},
 							Value: []byte("$a"),
@@ -16777,8 +16447,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 296,
 								EndLine:   296,
-								StartPos:  5495,
-								EndPos:    5497,
+								StartPos:  4979,
+								EndPos:    4981,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16786,8 +16456,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 296,
 									EndLine:   296,
-									StartPos:  5495,
-									EndPos:    5497,
+									StartPos:  4979,
+									EndPos:    4981,
 								},
 							},
 							Value: []byte("$b"),
@@ -16800,8 +16470,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 297,
 						EndLine:   297,
-						StartPos:  5501,
-						EndPos:    5510,
+						StartPos:  4983,
+						EndPos:    4992,
 					},
 				},
 				Expr: &ast.ExprBinaryShiftRight{
@@ -16809,8 +16479,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 297,
 							EndLine:   297,
-							StartPos:  5501,
-							EndPos:    5509,
+							StartPos:  4983,
+							EndPos:    4991,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16818,8 +16488,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 297,
 								EndLine:   297,
-								StartPos:  5501,
-								EndPos:    5503,
+								StartPos:  4983,
+								EndPos:    4985,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16827,8 +16497,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 297,
 									EndLine:   297,
-									StartPos:  5501,
-									EndPos:    5503,
+									StartPos:  4983,
+									EndPos:    4985,
 								},
 							},
 							Value: []byte("$a"),
@@ -16839,8 +16509,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 297,
 								EndLine:   297,
-								StartPos:  5507,
-								EndPos:    5509,
+								StartPos:  4989,
+								EndPos:    4991,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16848,8 +16518,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 297,
 									EndLine:   297,
-									StartPos:  5507,
-									EndPos:    5509,
+									StartPos:  4989,
+									EndPos:    4991,
 								},
 							},
 							Value: []byte("$b"),
@@ -16862,8 +16532,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 298,
 						EndLine:   298,
-						StartPos:  5513,
-						EndPos:    5522,
+						StartPos:  4993,
+						EndPos:    5002,
 					},
 				},
 				Expr: &ast.ExprBinarySmallerOrEqual{
@@ -16871,8 +16541,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 298,
 							EndLine:   298,
-							StartPos:  5513,
-							EndPos:    5521,
+							StartPos:  4993,
+							EndPos:    5001,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16880,8 +16550,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 298,
 								EndLine:   298,
-								StartPos:  5513,
-								EndPos:    5515,
+								StartPos:  4993,
+								EndPos:    4995,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16889,8 +16559,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 298,
 									EndLine:   298,
-									StartPos:  5513,
-									EndPos:    5515,
+									StartPos:  4993,
+									EndPos:    4995,
 								},
 							},
 							Value: []byte("$a"),
@@ -16901,8 +16571,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 298,
 								EndLine:   298,
-								StartPos:  5519,
-								EndPos:    5521,
+								StartPos:  4999,
+								EndPos:    5001,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16910,8 +16580,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 298,
 									EndLine:   298,
-									StartPos:  5519,
-									EndPos:    5521,
+									StartPos:  4999,
+									EndPos:    5001,
 								},
 							},
 							Value: []byte("$b"),
@@ -16924,8 +16594,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 299,
 						EndLine:   299,
-						StartPos:  5525,
-						EndPos:    5533,
+						StartPos:  5003,
+						EndPos:    5011,
 					},
 				},
 				Expr: &ast.ExprBinarySmaller{
@@ -16933,8 +16603,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 299,
 							EndLine:   299,
-							StartPos:  5525,
-							EndPos:    5532,
+							StartPos:  5003,
+							EndPos:    5010,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -16942,8 +16612,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 299,
 								EndLine:   299,
-								StartPos:  5525,
-								EndPos:    5527,
+								StartPos:  5003,
+								EndPos:    5005,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16951,8 +16621,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 299,
 									EndLine:   299,
-									StartPos:  5525,
-									EndPos:    5527,
+									StartPos:  5003,
+									EndPos:    5005,
 								},
 							},
 							Value: []byte("$a"),
@@ -16963,8 +16633,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 299,
 								EndLine:   299,
-								StartPos:  5530,
-								EndPos:    5532,
+								StartPos:  5008,
+								EndPos:    5010,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -16972,8 +16642,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 299,
 									EndLine:   299,
-									StartPos:  5530,
-									EndPos:    5532,
+									StartPos:  5008,
+									EndPos:    5010,
 								},
 							},
 							Value: []byte("$b"),
@@ -16986,8 +16656,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 300,
 						EndLine:   300,
-						StartPos:  5536,
-						EndPos:    5546,
+						StartPos:  5012,
+						EndPos:    5022,
 					},
 				},
 				Expr: &ast.ExprBinarySpaceship{
@@ -16995,8 +16665,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 300,
 							EndLine:   300,
-							StartPos:  5536,
-							EndPos:    5545,
+							StartPos:  5012,
+							EndPos:    5021,
 						},
 					},
 					Left: &ast.ExprVariable{
@@ -17004,8 +16674,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 300,
 								EndLine:   300,
-								StartPos:  5536,
-								EndPos:    5538,
+								StartPos:  5012,
+								EndPos:    5014,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17013,8 +16683,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 300,
 									EndLine:   300,
-									StartPos:  5536,
-									EndPos:    5538,
+									StartPos:  5012,
+									EndPos:    5014,
 								},
 							},
 							Value: []byte("$a"),
@@ -17025,8 +16695,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 300,
 								EndLine:   300,
-								StartPos:  5543,
-								EndPos:    5545,
+								StartPos:  5019,
+								EndPos:    5021,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17034,8 +16704,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 300,
 									EndLine:   300,
-									StartPos:  5543,
-									EndPos:    5545,
+									StartPos:  5019,
+									EndPos:    5021,
 								},
 							},
 							Value: []byte("$b"),
@@ -17048,8 +16718,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 302,
 						EndLine:   302,
-						StartPos:  5550,
-						EndPos:    5559,
+						StartPos:  5024,
+						EndPos:    5033,
 					},
 				},
 				Expr: &ast.ExprAssignReference{
@@ -17057,8 +16727,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 302,
 							EndLine:   302,
-							StartPos:  5550,
-							EndPos:    5558,
+							StartPos:  5024,
+							EndPos:    5032,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17066,8 +16736,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 302,
 								EndLine:   302,
-								StartPos:  5550,
-								EndPos:    5552,
+								StartPos:  5024,
+								EndPos:    5026,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17075,8 +16745,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 302,
 									EndLine:   302,
-									StartPos:  5550,
-									EndPos:    5552,
+									StartPos:  5024,
+									EndPos:    5026,
 								},
 							},
 							Value: []byte("$a"),
@@ -17087,8 +16757,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 302,
 								EndLine:   302,
-								StartPos:  5556,
-								EndPos:    5558,
+								StartPos:  5030,
+								EndPos:    5032,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17096,8 +16766,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 302,
 									EndLine:   302,
-									StartPos:  5556,
-									EndPos:    5558,
+									StartPos:  5030,
+									EndPos:    5032,
 								},
 							},
 							Value: []byte("$b"),
@@ -17110,8 +16780,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 303,
 						EndLine:   303,
-						StartPos:  5562,
-						EndPos:    5570,
+						StartPos:  5034,
+						EndPos:    5042,
 					},
 				},
 				Expr: &ast.ExprAssign{
@@ -17119,8 +16789,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 303,
 							EndLine:   303,
-							StartPos:  5562,
-							EndPos:    5569,
+							StartPos:  5034,
+							EndPos:    5041,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17128,8 +16798,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 303,
 								EndLine:   303,
-								StartPos:  5562,
-								EndPos:    5564,
+								StartPos:  5034,
+								EndPos:    5036,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17137,8 +16807,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 303,
 									EndLine:   303,
-									StartPos:  5562,
-									EndPos:    5564,
+									StartPos:  5034,
+									EndPos:    5036,
 								},
 							},
 							Value: []byte("$a"),
@@ -17149,8 +16819,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 303,
 								EndLine:   303,
-								StartPos:  5567,
-								EndPos:    5569,
+								StartPos:  5039,
+								EndPos:    5041,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17158,8 +16828,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 303,
 									EndLine:   303,
-									StartPos:  5567,
-									EndPos:    5569,
+									StartPos:  5039,
+									EndPos:    5041,
 								},
 							},
 							Value: []byte("$b"),
@@ -17172,8 +16842,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 304,
 						EndLine:   304,
-						StartPos:  5573,
-						EndPos:    5582,
+						StartPos:  5043,
+						EndPos:    5052,
 					},
 				},
 				Expr: &ast.ExprAssignBitwiseAnd{
@@ -17181,8 +16851,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 304,
 							EndLine:   304,
-							StartPos:  5573,
-							EndPos:    5581,
+							StartPos:  5043,
+							EndPos:    5051,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17190,8 +16860,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 304,
 								EndLine:   304,
-								StartPos:  5573,
-								EndPos:    5575,
+								StartPos:  5043,
+								EndPos:    5045,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17199,8 +16869,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 304,
 									EndLine:   304,
-									StartPos:  5573,
-									EndPos:    5575,
+									StartPos:  5043,
+									EndPos:    5045,
 								},
 							},
 							Value: []byte("$a"),
@@ -17211,8 +16881,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 304,
 								EndLine:   304,
-								StartPos:  5579,
-								EndPos:    5581,
+								StartPos:  5049,
+								EndPos:    5051,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17220,8 +16890,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 304,
 									EndLine:   304,
-									StartPos:  5579,
-									EndPos:    5581,
+									StartPos:  5049,
+									EndPos:    5051,
 								},
 							},
 							Value: []byte("$b"),
@@ -17234,8 +16904,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 305,
 						EndLine:   305,
-						StartPos:  5585,
-						EndPos:    5594,
+						StartPos:  5053,
+						EndPos:    5062,
 					},
 				},
 				Expr: &ast.ExprAssignBitwiseOr{
@@ -17243,8 +16913,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 305,
 							EndLine:   305,
-							StartPos:  5585,
-							EndPos:    5593,
+							StartPos:  5053,
+							EndPos:    5061,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17252,8 +16922,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 305,
 								EndLine:   305,
-								StartPos:  5585,
-								EndPos:    5587,
+								StartPos:  5053,
+								EndPos:    5055,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17261,8 +16931,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 305,
 									EndLine:   305,
-									StartPos:  5585,
-									EndPos:    5587,
+									StartPos:  5053,
+									EndPos:    5055,
 								},
 							},
 							Value: []byte("$a"),
@@ -17273,8 +16943,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 305,
 								EndLine:   305,
-								StartPos:  5591,
-								EndPos:    5593,
+								StartPos:  5059,
+								EndPos:    5061,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17282,8 +16952,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 305,
 									EndLine:   305,
-									StartPos:  5591,
-									EndPos:    5593,
+									StartPos:  5059,
+									EndPos:    5061,
 								},
 							},
 							Value: []byte("$b"),
@@ -17296,8 +16966,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 306,
 						EndLine:   306,
-						StartPos:  5597,
-						EndPos:    5606,
+						StartPos:  5063,
+						EndPos:    5072,
 					},
 				},
 				Expr: &ast.ExprAssignBitwiseXor{
@@ -17305,8 +16975,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 306,
 							EndLine:   306,
-							StartPos:  5597,
-							EndPos:    5605,
+							StartPos:  5063,
+							EndPos:    5071,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17314,8 +16984,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 306,
 								EndLine:   306,
-								StartPos:  5597,
-								EndPos:    5599,
+								StartPos:  5063,
+								EndPos:    5065,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17323,8 +16993,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 306,
 									EndLine:   306,
-									StartPos:  5597,
-									EndPos:    5599,
+									StartPos:  5063,
+									EndPos:    5065,
 								},
 							},
 							Value: []byte("$a"),
@@ -17335,8 +17005,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 306,
 								EndLine:   306,
-								StartPos:  5603,
-								EndPos:    5605,
+								StartPos:  5069,
+								EndPos:    5071,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17344,8 +17014,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 306,
 									EndLine:   306,
-									StartPos:  5603,
-									EndPos:    5605,
+									StartPos:  5069,
+									EndPos:    5071,
 								},
 							},
 							Value: []byte("$b"),
@@ -17358,8 +17028,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 307,
 						EndLine:   307,
-						StartPos:  5609,
-						EndPos:    5618,
+						StartPos:  5073,
+						EndPos:    5082,
 					},
 				},
 				Expr: &ast.ExprAssignConcat{
@@ -17367,8 +17037,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 307,
 							EndLine:   307,
-							StartPos:  5609,
-							EndPos:    5617,
+							StartPos:  5073,
+							EndPos:    5081,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17376,8 +17046,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 307,
 								EndLine:   307,
-								StartPos:  5609,
-								EndPos:    5611,
+								StartPos:  5073,
+								EndPos:    5075,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17385,8 +17055,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 307,
 									EndLine:   307,
-									StartPos:  5609,
-									EndPos:    5611,
+									StartPos:  5073,
+									EndPos:    5075,
 								},
 							},
 							Value: []byte("$a"),
@@ -17397,8 +17067,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 307,
 								EndLine:   307,
-								StartPos:  5615,
-								EndPos:    5617,
+								StartPos:  5079,
+								EndPos:    5081,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17406,8 +17076,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 307,
 									EndLine:   307,
-									StartPos:  5615,
-									EndPos:    5617,
+									StartPos:  5079,
+									EndPos:    5081,
 								},
 							},
 							Value: []byte("$b"),
@@ -17420,8 +17090,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 308,
 						EndLine:   308,
-						StartPos:  5621,
-						EndPos:    5630,
+						StartPos:  5083,
+						EndPos:    5092,
 					},
 				},
 				Expr: &ast.ExprAssignDiv{
@@ -17429,8 +17099,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 308,
 							EndLine:   308,
-							StartPos:  5621,
-							EndPos:    5629,
+							StartPos:  5083,
+							EndPos:    5091,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17438,8 +17108,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 308,
 								EndLine:   308,
-								StartPos:  5621,
-								EndPos:    5623,
+								StartPos:  5083,
+								EndPos:    5085,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17447,8 +17117,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 308,
 									EndLine:   308,
-									StartPos:  5621,
-									EndPos:    5623,
+									StartPos:  5083,
+									EndPos:    5085,
 								},
 							},
 							Value: []byte("$a"),
@@ -17459,8 +17129,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 308,
 								EndLine:   308,
-								StartPos:  5627,
-								EndPos:    5629,
+								StartPos:  5089,
+								EndPos:    5091,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17468,8 +17138,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 308,
 									EndLine:   308,
-									StartPos:  5627,
-									EndPos:    5629,
+									StartPos:  5089,
+									EndPos:    5091,
 								},
 							},
 							Value: []byte("$b"),
@@ -17482,8 +17152,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 309,
 						EndLine:   309,
-						StartPos:  5633,
-						EndPos:    5642,
+						StartPos:  5093,
+						EndPos:    5102,
 					},
 				},
 				Expr: &ast.ExprAssignMinus{
@@ -17491,8 +17161,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 309,
 							EndLine:   309,
-							StartPos:  5633,
-							EndPos:    5641,
+							StartPos:  5093,
+							EndPos:    5101,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17500,8 +17170,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 309,
 								EndLine:   309,
-								StartPos:  5633,
-								EndPos:    5635,
+								StartPos:  5093,
+								EndPos:    5095,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17509,8 +17179,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 309,
 									EndLine:   309,
-									StartPos:  5633,
-									EndPos:    5635,
+									StartPos:  5093,
+									EndPos:    5095,
 								},
 							},
 							Value: []byte("$a"),
@@ -17521,8 +17191,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 309,
 								EndLine:   309,
-								StartPos:  5639,
-								EndPos:    5641,
+								StartPos:  5099,
+								EndPos:    5101,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17530,8 +17200,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 309,
 									EndLine:   309,
-									StartPos:  5639,
-									EndPos:    5641,
+									StartPos:  5099,
+									EndPos:    5101,
 								},
 							},
 							Value: []byte("$b"),
@@ -17544,8 +17214,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 310,
 						EndLine:   310,
-						StartPos:  5645,
-						EndPos:    5654,
+						StartPos:  5103,
+						EndPos:    5112,
 					},
 				},
 				Expr: &ast.ExprAssignMod{
@@ -17553,8 +17223,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 310,
 							EndLine:   310,
-							StartPos:  5645,
-							EndPos:    5653,
+							StartPos:  5103,
+							EndPos:    5111,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17562,8 +17232,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 310,
 								EndLine:   310,
-								StartPos:  5645,
-								EndPos:    5647,
+								StartPos:  5103,
+								EndPos:    5105,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17571,8 +17241,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 310,
 									EndLine:   310,
-									StartPos:  5645,
-									EndPos:    5647,
+									StartPos:  5103,
+									EndPos:    5105,
 								},
 							},
 							Value: []byte("$a"),
@@ -17583,8 +17253,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 310,
 								EndLine:   310,
-								StartPos:  5651,
-								EndPos:    5653,
+								StartPos:  5109,
+								EndPos:    5111,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17592,8 +17262,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 310,
 									EndLine:   310,
-									StartPos:  5651,
-									EndPos:    5653,
+									StartPos:  5109,
+									EndPos:    5111,
 								},
 							},
 							Value: []byte("$b"),
@@ -17606,8 +17276,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 311,
 						EndLine:   311,
-						StartPos:  5657,
-						EndPos:    5666,
+						StartPos:  5113,
+						EndPos:    5122,
 					},
 				},
 				Expr: &ast.ExprAssignMul{
@@ -17615,8 +17285,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 311,
 							EndLine:   311,
-							StartPos:  5657,
-							EndPos:    5665,
+							StartPos:  5113,
+							EndPos:    5121,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17624,8 +17294,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 311,
 								EndLine:   311,
-								StartPos:  5657,
-								EndPos:    5659,
+								StartPos:  5113,
+								EndPos:    5115,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17633,8 +17303,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 311,
 									EndLine:   311,
-									StartPos:  5657,
-									EndPos:    5659,
+									StartPos:  5113,
+									EndPos:    5115,
 								},
 							},
 							Value: []byte("$a"),
@@ -17645,8 +17315,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 311,
 								EndLine:   311,
-								StartPos:  5663,
-								EndPos:    5665,
+								StartPos:  5119,
+								EndPos:    5121,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17654,8 +17324,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 311,
 									EndLine:   311,
-									StartPos:  5663,
-									EndPos:    5665,
+									StartPos:  5119,
+									EndPos:    5121,
 								},
 							},
 							Value: []byte("$b"),
@@ -17668,8 +17338,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 312,
 						EndLine:   312,
-						StartPos:  5669,
-						EndPos:    5678,
+						StartPos:  5123,
+						EndPos:    5132,
 					},
 				},
 				Expr: &ast.ExprAssignPlus{
@@ -17677,8 +17347,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 312,
 							EndLine:   312,
-							StartPos:  5669,
-							EndPos:    5677,
+							StartPos:  5123,
+							EndPos:    5131,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17686,8 +17356,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 312,
 								EndLine:   312,
-								StartPos:  5669,
-								EndPos:    5671,
+								StartPos:  5123,
+								EndPos:    5125,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17695,8 +17365,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 312,
 									EndLine:   312,
-									StartPos:  5669,
-									EndPos:    5671,
+									StartPos:  5123,
+									EndPos:    5125,
 								},
 							},
 							Value: []byte("$a"),
@@ -17707,8 +17377,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 312,
 								EndLine:   312,
-								StartPos:  5675,
-								EndPos:    5677,
+								StartPos:  5129,
+								EndPos:    5131,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17716,8 +17386,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 312,
 									EndLine:   312,
-									StartPos:  5675,
-									EndPos:    5677,
+									StartPos:  5129,
+									EndPos:    5131,
 								},
 							},
 							Value: []byte("$b"),
@@ -17730,8 +17400,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 313,
 						EndLine:   313,
-						StartPos:  5681,
-						EndPos:    5691,
+						StartPos:  5133,
+						EndPos:    5143,
 					},
 				},
 				Expr: &ast.ExprAssignPow{
@@ -17739,8 +17409,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 313,
 							EndLine:   313,
-							StartPos:  5681,
-							EndPos:    5690,
+							StartPos:  5133,
+							EndPos:    5142,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17748,8 +17418,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 313,
 								EndLine:   313,
-								StartPos:  5681,
-								EndPos:    5683,
+								StartPos:  5133,
+								EndPos:    5135,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17757,8 +17427,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 313,
 									EndLine:   313,
-									StartPos:  5681,
-									EndPos:    5683,
+									StartPos:  5133,
+									EndPos:    5135,
 								},
 							},
 							Value: []byte("$a"),
@@ -17769,8 +17439,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 313,
 								EndLine:   313,
-								StartPos:  5688,
-								EndPos:    5690,
+								StartPos:  5140,
+								EndPos:    5142,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17778,8 +17448,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 313,
 									EndLine:   313,
-									StartPos:  5688,
-									EndPos:    5690,
+									StartPos:  5140,
+									EndPos:    5142,
 								},
 							},
 							Value: []byte("$b"),
@@ -17792,8 +17462,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 314,
 						EndLine:   314,
-						StartPos:  5694,
-						EndPos:    5704,
+						StartPos:  5144,
+						EndPos:    5154,
 					},
 				},
 				Expr: &ast.ExprAssignShiftLeft{
@@ -17801,8 +17471,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 314,
 							EndLine:   314,
-							StartPos:  5694,
-							EndPos:    5703,
+							StartPos:  5144,
+							EndPos:    5153,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17810,8 +17480,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 314,
 								EndLine:   314,
-								StartPos:  5694,
-								EndPos:    5696,
+								StartPos:  5144,
+								EndPos:    5146,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17819,8 +17489,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 314,
 									EndLine:   314,
-									StartPos:  5694,
-									EndPos:    5696,
+									StartPos:  5144,
+									EndPos:    5146,
 								},
 							},
 							Value: []byte("$a"),
@@ -17831,8 +17501,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 314,
 								EndLine:   314,
-								StartPos:  5701,
-								EndPos:    5703,
+								StartPos:  5151,
+								EndPos:    5153,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17840,8 +17510,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 314,
 									EndLine:   314,
-									StartPos:  5701,
-									EndPos:    5703,
+									StartPos:  5151,
+									EndPos:    5153,
 								},
 							},
 							Value: []byte("$b"),
@@ -17854,8 +17524,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 315,
 						EndLine:   315,
-						StartPos:  5707,
-						EndPos:    5717,
+						StartPos:  5155,
+						EndPos:    5165,
 					},
 				},
 				Expr: &ast.ExprAssignShiftRight{
@@ -17863,8 +17533,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 315,
 							EndLine:   315,
-							StartPos:  5707,
-							EndPos:    5716,
+							StartPos:  5155,
+							EndPos:    5164,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -17872,8 +17542,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 315,
 								EndLine:   315,
-								StartPos:  5707,
-								EndPos:    5709,
+								StartPos:  5155,
+								EndPos:    5157,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17881,8 +17551,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 315,
 									EndLine:   315,
-									StartPos:  5707,
-									EndPos:    5709,
+									StartPos:  5155,
+									EndPos:    5157,
 								},
 							},
 							Value: []byte("$a"),
@@ -17893,8 +17563,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 315,
 								EndLine:   315,
-								StartPos:  5714,
-								EndPos:    5716,
+								StartPos:  5162,
+								EndPos:    5164,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -17902,8 +17572,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 315,
 									EndLine:   315,
-									StartPos:  5714,
-									EndPos:    5716,
+									StartPos:  5162,
+									EndPos:    5164,
 								},
 							},
 							Value: []byte("$b"),
@@ -17916,8 +17586,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 317,
 						EndLine:   317,
-						StartPos:  5721,
-						EndPos:    5760,
+						StartPos:  5167,
+						EndPos:    5206,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -17925,8 +17595,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 317,
 							EndLine:   317,
-							StartPos:  5727,
-							EndPos:    5730,
+							StartPos:  5173,
+							EndPos:    5176,
 						},
 					},
 					Value: []byte("foo"),
@@ -17937,18 +17607,17 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 317,
 								EndLine:   317,
-								StartPos:  5732,
-								EndPos:    5758,
+								StartPos:  5178,
+								EndPos:    5204,
 							},
 						},
-						ReturnsRef: false,
 						MethodName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 317,
 									EndLine:   317,
-									StartPos:  5748,
-									EndPos:    5753,
+									StartPos:  5194,
+									EndPos:    5199,
 								},
 							},
 							Value: []byte("class"),
@@ -17959,8 +17628,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 317,
 										EndLine:   317,
-										StartPos:  5732,
-										EndPos:    5738,
+										StartPos:  5178,
+										EndPos:    5184,
 									},
 								},
 								Value: []byte("public"),
@@ -17971,8 +17640,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 317,
 									EndLine:   317,
-									StartPos:  5756,
-									EndPos:    5758,
+									StartPos:  5202,
+									EndPos:    5204,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -17985,8 +17654,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 318,
 						EndLine:   318,
-						StartPos:  5763,
-						EndPos:    5774,
+						StartPos:  5207,
+						EndPos:    5218,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -17994,8 +17663,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 318,
 							EndLine:   318,
-							StartPos:  5763,
-							EndPos:    5773,
+							StartPos:  5207,
+							EndPos:    5217,
 						},
 					},
 					Function: &ast.NameFullyQualified{
@@ -18003,8 +17672,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 318,
 								EndLine:   318,
-								StartPos:  5763,
-								EndPos:    5771,
+								StartPos:  5207,
+								EndPos:    5215,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -18013,8 +17682,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 318,
 										EndLine:   318,
-										StartPos:  5764,
-										EndPos:    5767,
+										StartPos:  5208,
+										EndPos:    5211,
 									},
 								},
 								Value: []byte("foo"),
@@ -18024,8 +17693,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 318,
 										EndLine:   318,
-										StartPos:  5768,
-										EndPos:    5771,
+										StartPos:  5212,
+										EndPos:    5215,
 									},
 								},
 								Value: []byte("bar"),
@@ -18037,8 +17706,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 318,
 								EndLine:   318,
-								StartPos:  5771,
-								EndPos:    5773,
+								StartPos:  5215,
+								EndPos:    5217,
 							},
 						},
 					},
@@ -18049,18 +17718,17 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 320,
 						EndLine:   326,
-						StartPos:  5778,
-						EndPos:    5905,
+						StartPos:  5220,
+						EndPos:    5328,
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 320,
 							EndLine:   320,
-							StartPos:  5787,
-							EndPos:    5790,
+							StartPos:  5229,
+							EndPos:    5232,
 						},
 					},
 					Value: []byte("foo"),
@@ -18071,31 +17739,39 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 320,
 								EndLine:   320,
-								StartPos:  5791,
-								EndPos:    5794,
+								StartPos:  5233,
+								EndPos:    5236,
 							},
 						},
-						ByRef:    true,
-						Variadic: false,
-						Var: &ast.ExprVariable{
+						Var: &ast.Reference{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 320,
 									EndLine:   320,
-									StartPos:  5792,
-									EndPos:    5794,
+									StartPos:  5233,
+									EndPos:    5236,
 								},
 							},
-							VarName: &ast.Identifier{
+							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 320,
 										EndLine:   320,
-										StartPos:  5792,
-										EndPos:    5794,
+										StartPos:  5234,
+										EndPos:    5236,
 									},
 								},
-								Value: []byte("$a"),
+								VarName: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 320,
+											EndLine:   320,
+											StartPos:  5234,
+											EndPos:    5236,
+										},
+									},
+									Value: []byte("$a"),
+								},
 							},
 						},
 					},
@@ -18104,31 +17780,39 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 320,
 								EndLine:   320,
-								StartPos:  5796,
-								EndPos:    5801,
+								StartPos:  5238,
+								EndPos:    5243,
 							},
 						},
-						ByRef:    false,
-						Variadic: true,
-						Var: &ast.ExprVariable{
+						Var: &ast.Variadic{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 320,
 									EndLine:   320,
-									StartPos:  5799,
-									EndPos:    5801,
+									StartPos:  5238,
+									EndPos:    5243,
 								},
 							},
-							VarName: &ast.Identifier{
+							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 320,
 										EndLine:   320,
-										StartPos:  5799,
-										EndPos:    5801,
+										StartPos:  5241,
+										EndPos:    5243,
 									},
 								},
-								Value: []byte("$b"),
+								VarName: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 320,
+											EndLine:   320,
+											StartPos:  5241,
+											EndPos:    5243,
+										},
+									},
+									Value: []byte("$b"),
+								},
 							},
 						},
 					},
@@ -18139,18 +17823,17 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 322,
 								EndLine:   322,
-								StartPos:  5830,
-								EndPos:    5847,
+								StartPos:  5252,
+								EndPos:    5269,
 							},
 						},
-						ReturnsRef: false,
 						FunctionName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 322,
 									EndLine:   322,
-									StartPos:  5839,
-									EndPos:    5842,
+									StartPos:  5261,
+									EndPos:    5264,
 								},
 							},
 							Value: []byte("bar"),
@@ -18162,8 +17845,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 323,
 								EndLine:   323,
-								StartPos:  5851,
-								EndPos:    5863,
+								StartPos:  5274,
+								EndPos:    5286,
 							},
 						},
 						ClassName: &ast.Identifier{
@@ -18171,8 +17854,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 323,
 									EndLine:   323,
-									StartPos:  5857,
-									EndPos:    5860,
+									StartPos:  5280,
+									EndPos:    5283,
 								},
 							},
 							Value: []byte("Baz"),
@@ -18184,8 +17867,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 324,
 								EndLine:   324,
-								StartPos:  5867,
-								EndPos:    5879,
+								StartPos:  5291,
+								EndPos:    5303,
 							},
 						},
 						TraitName: &ast.Identifier{
@@ -18193,8 +17876,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 324,
 									EndLine:   324,
-									StartPos:  5873,
-									EndPos:    5877,
+									StartPos:  5297,
+									EndPos:    5301,
 								},
 							},
 							Value: []byte("Quux"),
@@ -18206,8 +17889,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 325,
 								EndLine:   325,
-								StartPos:  5883,
-								EndPos:    5901,
+								StartPos:  5308,
+								EndPos:    5326,
 							},
 						},
 						InterfaceName: &ast.Identifier{
@@ -18215,8 +17898,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 325,
 									EndLine:   325,
-									StartPos:  5893,
-									EndPos:    5898,
+									StartPos:  5318,
+									EndPos:    5323,
 								},
 							},
 							Value: []byte("Quuux"),
@@ -18230,18 +17913,17 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 328,
 						EndLine:   328,
-						StartPos:  5911,
-						EndPos:    5954,
+						StartPos:  5330,
+						EndPos:    5373,
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 328,
 							EndLine:   328,
-							StartPos:  5920,
-							EndPos:    5923,
+							StartPos:  5339,
+							EndPos:    5342,
 						},
 					},
 					Value: []byte("foo"),
@@ -18252,31 +17934,39 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 328,
 								EndLine:   328,
-								StartPos:  5924,
-								EndPos:    5931,
+								StartPos:  5343,
+								EndPos:    5350,
 							},
 						},
-						ByRef:    true,
-						Variadic: false,
-						Var: &ast.ExprVariable{
+						Var: &ast.Reference{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 328,
 									EndLine:   328,
-									StartPos:  5925,
-									EndPos:    5927,
+									StartPos:  5343,
+									EndPos:    5346,
 								},
 							},
-							VarName: &ast.Identifier{
+							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 328,
 										EndLine:   328,
-										StartPos:  5925,
-										EndPos:    5927,
+										StartPos:  5344,
+										EndPos:    5346,
 									},
 								},
-								Value: []byte("$a"),
+								VarName: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 328,
+											EndLine:   328,
+											StartPos:  5344,
+											EndPos:    5346,
+										},
+									},
+									Value: []byte("$a"),
+								},
 							},
 						},
 						DefaultValue: &ast.ScalarLnumber{
@@ -18284,8 +17974,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 328,
 									EndLine:   328,
-									StartPos:  5930,
-									EndPos:    5931,
+									StartPos:  5349,
+									EndPos:    5350,
 								},
 							},
 							Value: []byte("1"),
@@ -18296,31 +17986,39 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 328,
 								EndLine:   328,
-								StartPos:  5933,
-								EndPos:    5942,
+								StartPos:  5352,
+								EndPos:    5361,
 							},
 						},
-						ByRef:    false,
-						Variadic: true,
-						Var: &ast.ExprVariable{
+						Var: &ast.Variadic{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 328,
 									EndLine:   328,
-									StartPos:  5936,
-									EndPos:    5938,
+									StartPos:  5352,
+									EndPos:    5357,
 								},
 							},
-							VarName: &ast.Identifier{
+							Var: &ast.ExprVariable{
 								Node: ast.Node{
 									Position: &position.Position{
 										StartLine: 328,
 										EndLine:   328,
-										StartPos:  5936,
-										EndPos:    5938,
+										StartPos:  5355,
+										EndPos:    5357,
 									},
 								},
-								Value: []byte("$b"),
+								VarName: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 328,
+											EndLine:   328,
+											StartPos:  5355,
+											EndPos:    5357,
+										},
+									},
+									Value: []byte("$b"),
+								},
 							},
 						},
 						DefaultValue: &ast.ScalarLnumber{
@@ -18328,8 +18026,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 328,
 									EndLine:   328,
-									StartPos:  5941,
-									EndPos:    5942,
+									StartPos:  5360,
+									EndPos:    5361,
 								},
 							},
 							Value: []byte("1"),
@@ -18340,19 +18038,17 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 328,
 								EndLine:   328,
-								StartPos:  5944,
-								EndPos:    5950,
+								StartPos:  5363,
+								EndPos:    5369,
 							},
 						},
-						ByRef:    false,
-						Variadic: false,
 						Var: &ast.ExprVariable{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 328,
 									EndLine:   328,
-									StartPos:  5944,
-									EndPos:    5946,
+									StartPos:  5363,
+									EndPos:    5365,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -18360,8 +18056,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 328,
 										EndLine:   328,
-										StartPos:  5944,
-										EndPos:    5946,
+										StartPos:  5363,
+										EndPos:    5365,
 									},
 								},
 								Value: []byte("$c"),
@@ -18372,8 +18068,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 328,
 									EndLine:   328,
-									StartPos:  5949,
-									EndPos:    5950,
+									StartPos:  5368,
+									EndPos:    5369,
 								},
 							},
 							Value: []byte("1"),
@@ -18387,18 +18083,17 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 329,
 						EndLine:   329,
-						StartPos:  5957,
-						EndPos:    5995,
+						StartPos:  5374,
+						EndPos:    5412,
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 329,
 							EndLine:   329,
-							StartPos:  5966,
-							EndPos:    5969,
+							StartPos:  5383,
+							EndPos:    5386,
 						},
 					},
 					Value: []byte("foo"),
@@ -18409,19 +18104,17 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 329,
 								EndLine:   329,
-								StartPos:  5970,
-								EndPos:    5978,
+								StartPos:  5387,
+								EndPos:    5395,
 							},
 						},
-						ByRef:    false,
-						Variadic: false,
 						Type: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 329,
 									EndLine:   329,
-									StartPos:  5970,
-									EndPos:    5975,
+									StartPos:  5387,
+									EndPos:    5392,
 								},
 							},
 							Value: []byte("array"),
@@ -18431,8 +18124,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 329,
 									EndLine:   329,
-									StartPos:  5976,
-									EndPos:    5978,
+									StartPos:  5393,
+									EndPos:    5395,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -18440,8 +18133,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 329,
 										EndLine:   329,
-										StartPos:  5976,
-										EndPos:    5978,
+										StartPos:  5393,
+										EndPos:    5395,
 									},
 								},
 								Value: []byte("$a"),
@@ -18453,19 +18146,17 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 329,
 								EndLine:   329,
-								StartPos:  5980,
-								EndPos:    5991,
+								StartPos:  5397,
+								EndPos:    5408,
 							},
 						},
-						Variadic: false,
-						ByRef:    false,
 						Type: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 329,
 									EndLine:   329,
-									StartPos:  5980,
-									EndPos:    5988,
+									StartPos:  5397,
+									EndPos:    5405,
 								},
 							},
 							Value: []byte("callable"),
@@ -18475,8 +18166,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 329,
 									EndLine:   329,
-									StartPos:  5989,
-									EndPos:    5991,
+									StartPos:  5406,
+									EndPos:    5408,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -18484,8 +18175,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 329,
 										EndLine:   329,
-										StartPos:  5989,
-										EndPos:    5991,
+										StartPos:  5406,
+										EndPos:    5408,
 									},
 								},
 								Value: []byte("$b"),
@@ -18500,8 +18191,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 330,
 						EndLine:   330,
-						StartPos:  5998,
-						EndPos:    6100,
+						StartPos:  5413,
+						EndPos:    5515,
 					},
 				},
 				ClassName: &ast.Identifier{
@@ -18509,8 +18200,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 330,
 							EndLine:   330,
-							StartPos:  6019,
-							EndPos:    6022,
+							StartPos:  5434,
+							EndPos:    5437,
 						},
 					},
 					Value: []byte("foo"),
@@ -18521,8 +18212,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 330,
 								EndLine:   330,
-								StartPos:  5998,
-								EndPos:    6006,
+								StartPos:  5413,
+								EndPos:    5421,
 							},
 						},
 						Value: []byte("abstract"),
@@ -18532,8 +18223,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 330,
 								EndLine:   330,
-								StartPos:  6007,
-								EndPos:    6012,
+								StartPos:  5422,
+								EndPos:    5427,
 							},
 						},
 						Value: []byte("final"),
@@ -18545,18 +18236,17 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 330,
 								EndLine:   330,
-								StartPos:  6025,
-								EndPos:    6066,
+								StartPos:  5440,
+								EndPos:    5481,
 							},
 						},
-						ReturnsRef: false,
 						MethodName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 330,
 									EndLine:   330,
-									StartPos:  6060,
-									EndPos:    6063,
+									StartPos:  5475,
+									EndPos:    5478,
 								},
 							},
 							Value: []byte("bar"),
@@ -18567,8 +18257,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 330,
 										EndLine:   330,
-										StartPos:  6025,
-										EndPos:    6033,
+										StartPos:  5440,
+										EndPos:    5448,
 									},
 								},
 								Value: []byte("abstract"),
@@ -18578,8 +18268,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 330,
 										EndLine:   330,
-										StartPos:  6034,
-										EndPos:    6043,
+										StartPos:  5449,
+										EndPos:    5458,
 									},
 								},
 								Value: []byte("protected"),
@@ -18589,8 +18279,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 330,
 										EndLine:   330,
-										StartPos:  6044,
-										EndPos:    6050,
+										StartPos:  5459,
+										EndPos:    5465,
 									},
 								},
 								Value: []byte("static"),
@@ -18601,8 +18291,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 330,
 									EndLine:   330,
-									StartPos:  6065,
-									EndPos:    6066,
+									StartPos:  5480,
+									EndPos:    5481,
 								},
 							},
 						},
@@ -18612,18 +18302,17 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 330,
 								EndLine:   330,
-								StartPos:  6067,
-								EndPos:    6098,
+								StartPos:  5482,
+								EndPos:    5513,
 							},
 						},
-						ReturnsRef: false,
 						MethodName: &ast.Identifier{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 330,
 									EndLine:   330,
-									StartPos:  6090,
-									EndPos:    6093,
+									StartPos:  5505,
+									EndPos:    5508,
 								},
 							},
 							Value: []byte("baz"),
@@ -18634,8 +18323,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 330,
 										EndLine:   330,
-										StartPos:  6067,
-										EndPos:    6072,
+										StartPos:  5482,
+										EndPos:    5487,
 									},
 								},
 								Value: []byte("final"),
@@ -18645,8 +18334,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 330,
 										EndLine:   330,
-										StartPos:  6073,
-										EndPos:    6080,
+										StartPos:  5488,
+										EndPos:    5495,
 									},
 								},
 								Value: []byte("private"),
@@ -18657,8 +18346,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 330,
 									EndLine:   330,
-									StartPos:  6096,
-									EndPos:    6098,
+									StartPos:  5511,
+									EndPos:    5513,
 								},
 							},
 							Stmts: []ast.Vertex{},
@@ -18671,8 +18360,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 332,
 						EndLine:   332,
-						StartPos:  6105,
-						EndPos:    6119,
+						StartPos:  5518,
+						EndPos:    5532,
 					},
 				},
 				Expr: &ast.ExprPropertyFetch{
@@ -18680,8 +18369,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 332,
 							EndLine:   332,
-							StartPos:  6105,
-							EndPos:    6118,
+							StartPos:  5518,
+							EndPos:    5531,
 						},
 					},
 					Var: &ast.ExprNew{
@@ -18689,8 +18378,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 332,
 								EndLine:   332,
-								StartPos:  6105,
-								EndPos:    6112,
+								StartPos:  5518,
+								EndPos:    5525,
 							},
 						},
 						Class: &ast.NameName{
@@ -18698,8 +18387,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 332,
 									EndLine:   332,
-									StartPos:  6109,
-									EndPos:    6112,
+									StartPos:  5522,
+									EndPos:    5525,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -18708,8 +18397,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 332,
 											EndLine:   332,
-											StartPos:  6109,
-											EndPos:    6112,
+											StartPos:  5522,
+											EndPos:    5525,
 										},
 									},
 									Value: []byte("Foo"),
@@ -18722,8 +18411,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 332,
 								EndLine:   332,
-								StartPos:  6115,
-								EndPos:    6118,
+								StartPos:  5528,
+								EndPos:    5531,
 							},
 						},
 						Value: []byte("bar"),
@@ -18735,8 +18424,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 333,
 						EndLine:   333,
-						StartPos:  6123,
-						EndPos:    6134,
+						StartPos:  5534,
+						EndPos:    5545,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -18744,8 +18433,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 333,
 							EndLine:   333,
-							StartPos:  6123,
-							EndPos:    6133,
+							StartPos:  5534,
+							EndPos:    5544,
 						},
 					},
 					Function: &ast.ExprNew{
@@ -18753,8 +18442,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 333,
 								EndLine:   333,
-								StartPos:  6123,
-								EndPos:    6130,
+								StartPos:  5534,
+								EndPos:    5541,
 							},
 						},
 						Class: &ast.NameName{
@@ -18762,8 +18451,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 333,
 									EndLine:   333,
-									StartPos:  6127,
-									EndPos:    6130,
+									StartPos:  5538,
+									EndPos:    5541,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -18772,8 +18461,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 333,
 											EndLine:   333,
-											StartPos:  6127,
-											EndPos:    6130,
+											StartPos:  5538,
+											EndPos:    5541,
 										},
 									},
 									Value: []byte("Foo"),
@@ -18786,8 +18475,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 333,
 								EndLine:   333,
-								StartPos:  6131,
-								EndPos:    6133,
+								StartPos:  5542,
+								EndPos:    5544,
 							},
 						},
 					},
@@ -18798,8 +18487,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 334,
 						EndLine:   334,
-						StartPos:  6137,
-						EndPos:    6149,
+						StartPos:  5546,
+						EndPos:    5558,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -18807,8 +18496,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 334,
 							EndLine:   334,
-							StartPos:  6137,
-							EndPos:    6148,
+							StartPos:  5546,
+							EndPos:    5557,
 						},
 					},
 					Function: &ast.ExprArrayDimFetch{
@@ -18816,8 +18505,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 334,
 								EndLine:   334,
-								StartPos:  6137,
-								EndPos:    6146,
+								StartPos:  5546,
+								EndPos:    5555,
 							},
 						},
 						Var: &ast.ExprShortArray{
@@ -18825,8 +18514,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 334,
 									EndLine:   334,
-									StartPos:  6137,
-									EndPos:    6143,
+									StartPos:  5546,
+									EndPos:    5552,
 								},
 							},
 							Items: []ast.Vertex{
@@ -18835,8 +18524,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 334,
 											EndLine:   334,
-											StartPos:  6138,
-											EndPos:    6142,
+											StartPos:  5547,
+											EndPos:    5551,
 										},
 									},
 									Val: &ast.ExprVariable{
@@ -18844,8 +18533,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 334,
 												EndLine:   334,
-												StartPos:  6138,
-												EndPos:    6142,
+												StartPos:  5547,
+												EndPos:    5551,
 											},
 										},
 										VarName: &ast.Identifier{
@@ -18853,8 +18542,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 334,
 													EndLine:   334,
-													StartPos:  6138,
-													EndPos:    6142,
+													StartPos:  5547,
+													EndPos:    5551,
 												},
 											},
 											Value: []byte("$foo"),
@@ -18868,8 +18557,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 334,
 									EndLine:   334,
-									StartPos:  6144,
-									EndPos:    6145,
+									StartPos:  5553,
+									EndPos:    5554,
 								},
 							},
 							Value: []byte("0"),
@@ -18880,8 +18569,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 334,
 								EndLine:   334,
-								StartPos:  6146,
-								EndPos:    6148,
+								StartPos:  5555,
+								EndPos:    5557,
 							},
 						},
 					},
@@ -18892,8 +18581,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 335,
 						EndLine:   335,
-						StartPos:  6152,
-						EndPos:    6161,
+						StartPos:  5559,
+						EndPos:    5568,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -18901,8 +18590,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 335,
 							EndLine:   335,
-							StartPos:  6152,
-							EndPos:    6160,
+							StartPos:  5559,
+							EndPos:    5567,
 						},
 					},
 					Function: &ast.ExprArrayDimFetch{
@@ -18910,8 +18599,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 335,
 								EndLine:   335,
-								StartPos:  6152,
-								EndPos:    6158,
+								StartPos:  5559,
+								EndPos:    5565,
 							},
 						},
 						Var: &ast.ExprConstFetch{
@@ -18919,8 +18608,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 335,
 									EndLine:   335,
-									StartPos:  6152,
-									EndPos:    6155,
+									StartPos:  5559,
+									EndPos:    5562,
 								},
 							},
 							Const: &ast.NameName{
@@ -18928,8 +18617,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 335,
 										EndLine:   335,
-										StartPos:  6152,
-										EndPos:    6155,
+										StartPos:  5559,
+										EndPos:    5562,
 									},
 								},
 								Parts: []ast.Vertex{
@@ -18938,8 +18627,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 335,
 												EndLine:   335,
-												StartPos:  6152,
-												EndPos:    6155,
+												StartPos:  5559,
+												EndPos:    5562,
 											},
 										},
 										Value: []byte("foo"),
@@ -18952,8 +18641,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 335,
 									EndLine:   335,
-									StartPos:  6156,
-									EndPos:    6157,
+									StartPos:  5563,
+									EndPos:    5564,
 								},
 							},
 							Value: []byte("1"),
@@ -18964,8 +18653,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 335,
 								EndLine:   335,
-								StartPos:  6158,
-								EndPos:    6160,
+								StartPos:  5565,
+								EndPos:    5567,
 							},
 						},
 					},
@@ -18976,8 +18665,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 336,
 						EndLine:   336,
-						StartPos:  6164,
-						EndPos:    6172,
+						StartPos:  5569,
+						EndPos:    5577,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -18985,8 +18674,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 336,
 							EndLine:   336,
-							StartPos:  6164,
-							EndPos:    6171,
+							StartPos:  5569,
+							EndPos:    5576,
 						},
 					},
 					Function: &ast.ScalarString{
@@ -18994,8 +18683,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 336,
 								EndLine:   336,
-								StartPos:  6164,
-								EndPos:    6169,
+								StartPos:  5569,
+								EndPos:    5574,
 							},
 						},
 						Value: []byte("\"foo\""),
@@ -19005,8 +18694,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 336,
 								EndLine:   336,
-								StartPos:  6169,
-								EndPos:    6171,
+								StartPos:  5574,
+								EndPos:    5576,
 							},
 						},
 					},
@@ -19017,8 +18706,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 337,
 						EndLine:   337,
-						StartPos:  6175,
-						EndPos:    6187,
+						StartPos:  5578,
+						EndPos:    5590,
 					},
 				},
 				Expr: &ast.ExprFunctionCall{
@@ -19026,8 +18715,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 337,
 							EndLine:   337,
-							StartPos:  6175,
-							EndPos:    6186,
+							StartPos:  5578,
+							EndPos:    5589,
 						},
 					},
 					Function: &ast.ExprArrayDimFetch{
@@ -19035,8 +18724,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 337,
 								EndLine:   337,
-								StartPos:  6175,
-								EndPos:    6184,
+								StartPos:  5578,
+								EndPos:    5587,
 							},
 						},
 						Var: &ast.ExprShortArray{
@@ -19044,8 +18733,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 337,
 									EndLine:   337,
-									StartPos:  6175,
-									EndPos:    6178,
+									StartPos:  5578,
+									EndPos:    5581,
 								},
 							},
 							Items: []ast.Vertex{
@@ -19054,8 +18743,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 337,
 											EndLine:   337,
-											StartPos:  6176,
-											EndPos:    6177,
+											StartPos:  5579,
+											EndPos:    5580,
 										},
 									},
 									Val: &ast.ScalarLnumber{
@@ -19063,8 +18752,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 337,
 												EndLine:   337,
-												StartPos:  6176,
-												EndPos:    6177,
+												StartPos:  5579,
+												EndPos:    5580,
 											},
 										},
 										Value: []byte("1"),
@@ -19077,8 +18766,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 337,
 									EndLine:   337,
-									StartPos:  6179,
-									EndPos:    6183,
+									StartPos:  5582,
+									EndPos:    5586,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19086,8 +18775,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 337,
 										EndLine:   337,
-										StartPos:  6179,
-										EndPos:    6183,
+										StartPos:  5582,
+										EndPos:    5586,
 									},
 								},
 								Value: []byte("$foo"),
@@ -19099,8 +18788,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 337,
 								EndLine:   337,
-								StartPos:  6184,
-								EndPos:    6186,
+								StartPos:  5587,
+								EndPos:    5589,
 							},
 						},
 					},
@@ -19111,8 +18800,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 338,
 						EndLine:   338,
-						StartPos:  6190,
-						EndPos:    6199,
+						StartPos:  5591,
+						EndPos:    5600,
 					},
 				},
 				Expr: &ast.ExprVariable{
@@ -19120,8 +18809,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 338,
 							EndLine:   338,
-							StartPos:  6190,
-							EndPos:    6198,
+							StartPos:  5591,
+							EndPos:    5599,
 						},
 					},
 					VarName: &ast.ExprFunctionCall{
@@ -19129,8 +18818,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 338,
 								EndLine:   338,
-								StartPos:  6192,
-								EndPos:    6197,
+								StartPos:  5593,
+								EndPos:    5598,
 							},
 						},
 						Function: &ast.NameName{
@@ -19138,8 +18827,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 338,
 									EndLine:   338,
-									StartPos:  6192,
-									EndPos:    6195,
+									StartPos:  5593,
+									EndPos:    5596,
 								},
 							},
 							Parts: []ast.Vertex{
@@ -19148,8 +18837,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 338,
 											EndLine:   338,
-											StartPos:  6192,
-											EndPos:    6195,
+											StartPos:  5593,
+											EndPos:    5596,
 										},
 									},
 									Value: []byte("foo"),
@@ -19161,8 +18850,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 338,
 									EndLine:   338,
-									StartPos:  6195,
-									EndPos:    6197,
+									StartPos:  5596,
+									EndPos:    5598,
 								},
 							},
 						},
@@ -19174,8 +18863,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 340,
 						EndLine:   340,
-						StartPos:  6203,
-						EndPos:    6215,
+						StartPos:  5602,
+						EndPos:    5614,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -19183,8 +18872,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 340,
 							EndLine:   340,
-							StartPos:  6203,
-							EndPos:    6214,
+							StartPos:  5602,
+							EndPos:    5613,
 						},
 					},
 					Class: &ast.NameName{
@@ -19192,8 +18881,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 340,
 								EndLine:   340,
-								StartPos:  6203,
-								EndPos:    6206,
+								StartPos:  5602,
+								EndPos:    5605,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -19202,8 +18891,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 340,
 										EndLine:   340,
-										StartPos:  6203,
-										EndPos:    6206,
+										StartPos:  5602,
+										EndPos:    5605,
 									},
 								},
 								Value: []byte("Foo"),
@@ -19215,8 +18904,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 340,
 								EndLine:   340,
-								StartPos:  6208,
-								EndPos:    6212,
+								StartPos:  5607,
+								EndPos:    5611,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -19224,8 +18913,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 340,
 									EndLine:   340,
-									StartPos:  6208,
-									EndPos:    6212,
+									StartPos:  5607,
+									EndPos:    5611,
 								},
 							},
 							Value: []byte("$bar"),
@@ -19236,8 +18925,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 340,
 								EndLine:   340,
-								StartPos:  6212,
-								EndPos:    6214,
+								StartPos:  5611,
+								EndPos:    5613,
 							},
 						},
 					},
@@ -19248,8 +18937,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 341,
 						EndLine:   341,
-						StartPos:  6218,
-						EndPos:    6235,
+						StartPos:  5615,
+						EndPos:    5632,
 					},
 				},
 				Expr: &ast.ExprStaticCall{
@@ -19257,8 +18946,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 341,
 							EndLine:   341,
-							StartPos:  6218,
-							EndPos:    6234,
+							StartPos:  5615,
+							EndPos:    5631,
 						},
 					},
 					Class: &ast.NameName{
@@ -19266,8 +18955,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 341,
 								EndLine:   341,
-								StartPos:  6218,
-								EndPos:    6221,
+								StartPos:  5615,
+								EndPos:    5618,
 							},
 						},
 						Parts: []ast.Vertex{
@@ -19276,8 +18965,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 341,
 										EndLine:   341,
-										StartPos:  6218,
-										EndPos:    6221,
+										StartPos:  5615,
+										EndPos:    5618,
 									},
 								},
 								Value: []byte("Foo"),
@@ -19289,8 +18978,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 341,
 								EndLine:   341,
-								StartPos:  6224,
-								EndPos:    6231,
+								StartPos:  5621,
+								EndPos:    5628,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19298,8 +18987,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 341,
 									EndLine:   341,
-									StartPos:  6224,
-									EndPos:    6228,
+									StartPos:  5621,
+									EndPos:    5625,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19307,8 +18996,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 341,
 										EndLine:   341,
-										StartPos:  6224,
-										EndPos:    6228,
+										StartPos:  5621,
+										EndPos:    5625,
 									},
 								},
 								Value: []byte("$bar"),
@@ -19319,8 +19008,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 341,
 									EndLine:   341,
-									StartPos:  6229,
-									EndPos:    6230,
+									StartPos:  5626,
+									EndPos:    5627,
 								},
 							},
 							Value: []byte("0"),
@@ -19331,8 +19020,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 341,
 								EndLine:   341,
-								StartPos:  6232,
-								EndPos:    6234,
+								StartPos:  5629,
+								EndPos:    5631,
 							},
 						},
 					},
@@ -19343,8 +19032,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 343,
 						EndLine:   343,
-						StartPos:  6241,
-						EndPos:    6252,
+						StartPos:  5634,
+						EndPos:    5645,
 					},
 				},
 				Expr: &ast.ExprPropertyFetch{
@@ -19352,8 +19041,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 343,
 							EndLine:   343,
-							StartPos:  6241,
-							EndPos:    6251,
+							StartPos:  5634,
+							EndPos:    5644,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -19361,8 +19050,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 343,
 								EndLine:   343,
-								StartPos:  6241,
-								EndPos:    6245,
+								StartPos:  5634,
+								EndPos:    5638,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -19370,8 +19059,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 343,
 									EndLine:   343,
-									StartPos:  6241,
-									EndPos:    6245,
+									StartPos:  5634,
+									EndPos:    5638,
 								},
 							},
 							Value: []byte("$foo"),
@@ -19382,8 +19071,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 343,
 								EndLine:   343,
-								StartPos:  6247,
-								EndPos:    6251,
+								StartPos:  5640,
+								EndPos:    5644,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -19391,8 +19080,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 343,
 									EndLine:   343,
-									StartPos:  6247,
-									EndPos:    6251,
+									StartPos:  5640,
+									EndPos:    5644,
 								},
 							},
 							Value: []byte("$bar"),
@@ -19405,8 +19094,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 344,
 						EndLine:   344,
-						StartPos:  6255,
-						EndPos:    6271,
+						StartPos:  5646,
+						EndPos:    5662,
 					},
 				},
 				Expr: &ast.ExprPropertyFetch{
@@ -19414,8 +19103,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 344,
 							EndLine:   344,
-							StartPos:  6255,
-							EndPos:    6269,
+							StartPos:  5646,
+							EndPos:    5660,
 						},
 					},
 					Var: &ast.ExprVariable{
@@ -19423,8 +19112,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 344,
 								EndLine:   344,
-								StartPos:  6255,
-								EndPos:    6259,
+								StartPos:  5646,
+								EndPos:    5650,
 							},
 						},
 						VarName: &ast.Identifier{
@@ -19432,8 +19121,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 344,
 									EndLine:   344,
-									StartPos:  6255,
-									EndPos:    6259,
+									StartPos:  5646,
+									EndPos:    5650,
 								},
 							},
 							Value: []byte("$foo"),
@@ -19444,8 +19133,8 @@ func TestPhp7(t *testing.T) {
 							Position: &position.Position{
 								StartLine: 344,
 								EndLine:   344,
-								StartPos:  6262,
-								EndPos:    6269,
+								StartPos:  5653,
+								EndPos:    5660,
 							},
 						},
 						Var: &ast.ExprVariable{
@@ -19453,8 +19142,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 344,
 									EndLine:   344,
-									StartPos:  6262,
-									EndPos:    6266,
+									StartPos:  5653,
+									EndPos:    5657,
 								},
 							},
 							VarName: &ast.Identifier{
@@ -19462,8 +19151,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 344,
 										EndLine:   344,
-										StartPos:  6262,
-										EndPos:    6266,
+										StartPos:  5653,
+										EndPos:    5657,
 									},
 								},
 								Value: []byte("$bar"),
@@ -19474,8 +19163,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 344,
 									EndLine:   344,
-									StartPos:  6267,
-									EndPos:    6268,
+									StartPos:  5658,
+									EndPos:    5659,
 								},
 							},
 							Value: []byte("0"),
@@ -19488,8 +19177,8 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 346,
 						EndLine:   346,
-						StartPos:  6275,
-						EndPos:    6297,
+						StartPos:  5664,
+						EndPos:    5686,
 					},
 				},
 				Expr: &ast.ExprShortArray{
@@ -19497,8 +19186,8 @@ func TestPhp7(t *testing.T) {
 						Position: &position.Position{
 							StartLine: 346,
 							EndLine:   346,
-							StartPos:  6275,
-							EndPos:    6296,
+							StartPos:  5664,
+							EndPos:    5685,
 						},
 					},
 					Items: []ast.Vertex{
@@ -19507,8 +19196,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 346,
 									EndLine:   346,
-									StartPos:  6276,
-									EndPos:    6282,
+									StartPos:  5665,
+									EndPos:    5671,
 								},
 							},
 							Key: &ast.ScalarLnumber{
@@ -19516,8 +19205,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 346,
 										EndLine:   346,
-										StartPos:  6276,
-										EndPos:    6277,
+										StartPos:  5665,
+										EndPos:    5666,
 									},
 								},
 								Value: []byte("1"),
@@ -19527,8 +19216,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 346,
 										EndLine:   346,
-										StartPos:  6279,
-										EndPos:    6282,
+										StartPos:  5668,
+										EndPos:    5671,
 									},
 								},
 								Var: &ast.ExprVariable{
@@ -19536,8 +19225,8 @@ func TestPhp7(t *testing.T) {
 										Position: &position.Position{
 											StartLine: 346,
 											EndLine:   346,
-											StartPos:  6280,
-											EndPos:    6282,
+											StartPos:  5669,
+											EndPos:    5671,
 										},
 									},
 									VarName: &ast.Identifier{
@@ -19545,8 +19234,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 346,
 												EndLine:   346,
-												StartPos:  6280,
-												EndPos:    6282,
+												StartPos:  5669,
+												EndPos:    5671,
 											},
 										},
 										Value: []byte("$a"),
@@ -19559,8 +19248,8 @@ func TestPhp7(t *testing.T) {
 								Position: &position.Position{
 									StartLine: 346,
 									EndLine:   346,
-									StartPos:  6284,
-									EndPos:    6295,
+									StartPos:  5673,
+									EndPos:    5684,
 								},
 							},
 							Key: &ast.ScalarLnumber{
@@ -19568,8 +19257,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 346,
 										EndLine:   346,
-										StartPos:  6284,
-										EndPos:    6285,
+										StartPos:  5673,
+										EndPos:    5674,
 									},
 								},
 								Value: []byte("2"),
@@ -19579,8 +19268,8 @@ func TestPhp7(t *testing.T) {
 									Position: &position.Position{
 										StartLine: 346,
 										EndLine:   346,
-										StartPos:  6287,
-										EndPos:    6295,
+										StartPos:  5676,
+										EndPos:    5684,
 									},
 								},
 								Items: []ast.Vertex{
@@ -19589,8 +19278,8 @@ func TestPhp7(t *testing.T) {
 											Position: &position.Position{
 												StartLine: 346,
 												EndLine:   346,
-												StartPos:  6292,
-												EndPos:    6294,
+												StartPos:  5681,
+												EndPos:    5683,
 											},
 										},
 										Val: &ast.ExprVariable{
@@ -19598,8 +19287,8 @@ func TestPhp7(t *testing.T) {
 												Position: &position.Position{
 													StartLine: 346,
 													EndLine:   346,
-													StartPos:  6292,
-													EndPos:    6294,
+													StartPos:  5681,
+													EndPos:    5683,
 												},
 											},
 											VarName: &ast.Identifier{
@@ -19607,8 +19296,8 @@ func TestPhp7(t *testing.T) {
 													Position: &position.Position{
 														StartLine: 346,
 														EndLine:   346,
-														StartPos:  6292,
-														EndPos:    6294,
+														StartPos:  5681,
+														EndPos:    5683,
 													},
 												},
 												Value: []byte("$b"),
@@ -19626,15 +19315,15 @@ func TestPhp7(t *testing.T) {
 					Position: &position.Position{
 						StartLine: 348,
 						EndLine:   348,
-						StartPos:  6301,
-						EndPos:    6319,
+						StartPos:  5688,
+						EndPos:    5706,
 					},
 				},
 			},
 		},
 	}
 
-	lexer := scanner.NewLexer([]byte(src), "7.4", false, nil)
+	lexer := scanner.NewLexer(src, "7.4", false, nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
diff --git a/internal/php7/test.php b/internal/php7/test.php
new file mode 100644
index 0000000..1260892
--- /dev/null
+++ b/internal/php7/test.php
@@ -0,0 +1,350 @@
+<?
+foo($a, ...$b);
+$foo($a, ...$b);
+$foo->bar($a, ...$b);
+foo::bar($a, ...$b);
+$foo::bar($a, ...$b);
+new foo($a, ...$b);
+/** anonymous class */
+new class ($a, ...$b) {};
+new class {};
+new $foo;
+new $foo[1];
+new $foo{$bar};
+new $foo->bar;
+new $foo::$bar;
+new static::$bar;
+
+function foo(?bar $bar=null, baz &...$baz) {}
+class foo {public function foo(?bar $bar=null, baz &...$baz) {}}
+function(?bar $bar=null, baz &...$baz) {};
+static function(?bar $bar=null, baz &...$baz) {};
+
+1234567890123456789;
+12345678901234567890;
+0.;
+0b0111111111111111111111111111111111111111111111111111111111111111;
+0b1111111111111111111111111111111111111111111111111111111111111111;
+0x007111111111111111;
+0x8111111111111111;
+__CLASS__;
+__DIR__;
+__FILE__;
+__FUNCTION__;
+__LINE__;
+__NAMESPACE__;
+__METHOD__;
+__TRAIT__;
+
+"test $var";
+"test $var[1]";
+"test $var[-1]";
+"test $var[1234567890123456789012345678901234567890]";
+"test $var[-1234567890123456789012345678901234567890]";
+"test $var[bar]";
+"test $var[$bar]";
+"$foo $bar";
+"test $foo->bar()";
+"test ${foo}";
+"test ${foo[0]}";
+"test ${$foo}";
+"test {$foo->bar()}";
+
+if ($a) :
+endif;
+if ($a) :
+elseif ($b):
+endif;
+if ($a) :
+else:
+endif;
+if ($a) :
+elseif ($b):
+elseif ($c):
+else:
+endif;
+
+while (1) { break; }
+while (1) { break 2; }
+while (1) : break(3); endwhile;
+class foo{ public const FOO = 1, BAR = 2; }
+class foo{ const FOO = 1, BAR = 2; }
+class foo{ function bar() {} }
+class foo{ public static function &bar() {} }
+class foo{ public static function &bar(): void {} }
+abstract class foo{ }
+final class foo extends bar { }
+final class foo implements bar { }
+final class foo implements bar, baz { }
+new class() extends foo implements bar, baz { };
+
+const FOO = 1, BAR = 2;
+while (1) { continue; }
+while (1) { continue 2; }
+while (1) { continue(3); }
+declare(ticks=1);
+declare(ticks=1) {}
+declare(ticks=1): enddeclare;
+do {} while(1);
+echo $a, 1;
+echo($a);
+for($i = 0; $i < 10; $i++, $i++) {}
+for(; $i < 10; $i++, $i++) : endfor;
+foreach ($a as $v) {}
+foreach ($a as $v) : endforeach;
+foreach ($a as $k => $v) {}
+foreach ($a as $k => &$v) {}
+foreach ($a as $k => list($v)) {}
+foreach ($a as $k => [$v]) {}
+function foo() {}
+function foo() {return;}
+function &foo() {return 1;}
+function &foo(): void {}
+global $a, $b;
+a:
+goto a;
+if ($a) {}
+if ($a) {} elseif ($b) {}
+if ($a) {} else {}
+if ($a) {} elseif ($b) {} elseif ($c) {} else {}
+if ($a) {} elseif ($b) {} else if ($c) {} else {}
+?> <div></div> <?
+interface Foo {}
+interface Foo extends Bar {}
+interface Foo extends Bar, Baz {}
+namespace Foo;
+namespace Foo {}
+namespace {}
+class foo {var $a;}
+class foo {public static $a, $b = 1;}
+static $a, $b = 1;
+
+switch (1) :
+    case 1:
+    default:
+    case 2:
+endswitch;
+
+switch (1) :;
+    case 1;
+    case 2;
+endswitch;
+
+switch (1) {
+    case 1: break;
+    case 2: break;
+}
+
+switch (1) {;
+    case 1; break;
+    case 2; break;
+}
+
+throw $e;
+
+trait Foo {}
+class Foo { use Bar; }
+class Foo { use Bar, Baz {} }
+class Foo { use Bar, Baz { one as include; } }
+class Foo { use Bar, Baz { one as public; } }
+class Foo { use Bar, Baz { one as public two; } }
+class Foo { use Bar, Baz { Bar::one insteadof Baz, Quux; Baz::one as two; } }
+
+try {}
+try {} catch (Exception $e) {}
+try {} catch (Exception|RuntimeException $e) {}
+try {} catch (Exception $e) {} catch (RuntimeException $e) {}
+try {} catch (Exception $e) {} finally {}
+
+unset($a, $b,);
+
+use Foo;
+use \Foo;
+use \Foo as Bar;
+use Foo, Bar;
+use Foo, Bar as Baz;
+use function Foo, \Bar;
+use function Foo as foo, \Bar as bar;
+use const Foo, \Bar;
+use const Foo as foo, \Bar as bar;
+
+use \Foo\{Bar, Baz};
+use Foo\{Bar, Baz as quux};
+use function Foo\{Bar, Baz};
+use const \Foo\{Bar, Baz};
+use Foo\{const Bar, function Baz};
+
+$a[1];
+$a[1][2];
+array();
+array(1);
+array(1=>1, &$b,);
+~$a;
+!$a;
+
+Foo::Bar;
+$foo::Bar;
+clone($a);
+clone $a;
+function(){};
+function($a, $b) use ($c, &$d) {};
+function(): void {};
+foo;
+namespace\foo;
+\foo;
+
+empty($a);
+@$a;
+eval($a);
+exit;
+exit($a);
+die;
+die($a);
+foo();
+namespace\foo();
+\foo();
+$foo();
+
+$a--;
+$a++;
+--$a;
+++$a;
+
+include $a;
+include_once $a;
+require $a;
+require_once $a;
+
+$a instanceof Foo;
+$a instanceof namespace\Foo;
+$a instanceof \Foo;
+
+isset($a, $b);
+list($a) = $b;
+list($a[]) = $b;
+list(list($a)) = $b;
+
+$a->foo();
+new Foo();
+new namespace\Foo();
+new \Foo();
+new class ($a, ...$b) {};
+print($a);
+$a->foo;
+`cmd $a`;
+`cmd`;
+``;
+[];
+[1];
+[1=>1, &$b,];
+
+[$a] = $b;
+[$a[]] = $b;
+[list($a)] = $b;
+Foo::bar();
+namespace\Foo::bar();
+\Foo::bar();
+Foo::$bar;
+$foo::$bar;
+namespace\Foo::$bar;
+\Foo::$bar;
+$a ? $b : $c;
+$a ? : $c;
+$a ? $b ? $c : $d : $e;
+$a ? $b : $c ? $d : $e;
+-$a;
++$a;
+$$a;
+yield;
+yield $a;
+yield $a => $b;
+yield from $a;
+
+(array)$a;
+(boolean)$a;
+(bool)$a;
+(double)$a;
+(float)$a;
+(integer)$a;
+(int)$a;
+(object)$a;
+(string)$a;
+(unset)$a;
+
+$a & $b;
+$a | $b;
+$a ^ $b;
+$a && $b;
+$a || $b;
+$a ?? $b;
+$a . $b;
+$a / $b;
+$a == $b;
+$a >= $b;
+$a > $b;
+$a === $b;
+$a and $b;
+$a or $b;
+$a xor $b;
+$a - $b;
+$a % $b;
+$a * $b;
+$a != $b;
+$a !== $b;
+$a + $b;
+$a ** $b;
+$a << $b;
+$a >> $b;
+$a <= $b;
+$a < $b;
+$a <=> $b;
+
+$a =& $b;
+$a = $b;
+$a &= $b;
+$a |= $b;
+$a ^= $b;
+$a .= $b;
+$a /= $b;
+$a -= $b;
+$a %= $b;
+$a *= $b;
+$a += $b;
+$a **= $b;
+$a <<= $b;
+$a >>= $b;
+
+class foo {public function class() {} }
+\foo\bar();
+
+function foo(&$a, ...$b) {
+
+    function bar() {}
+    class Baz {}
+    trait Quux{}
+    interface Quuux {}
+}
+
+function foo(&$a = 1, ...$b = 1, $c = 1) {}
+function foo(array $a, callable $b) {}
+abstract final class foo { abstract protected static function bar(); final private function baz() {} }
+
+(new Foo)->bar;
+(new Foo)();
+[$foo][0]();
+foo[1]();
+"foo"();
+[1]{$foo}();
+${foo()};
+
+Foo::$bar();
+Foo::{$bar[0]}();
+
+$foo->$bar;
+$foo->{$bar[0]};
+
+[1=>&$a, 2=>list($b)];
+
+__halt_compiler();
+
+parsing process must be terminated
\ No newline at end of file
diff --git a/pkg/ast/ast.go b/pkg/ast/ast.go
index 88e017e..41b540b 100644
--- a/pkg/ast/ast.go
+++ b/pkg/ast/ast.go
@@ -20,6 +20,8 @@ type Visitor interface {
 type NodeVisitor interface {
 	Root(n *Root)
 	Nullable(n *Nullable)
+	Reference(n *Reference)
+	Variadic(n *Variadic)
 	Parameter(n *Parameter)
 	Identifier(n *Identifier)
 	ArgumentList(n *ArgumentList)
diff --git a/pkg/ast/node.go b/pkg/ast/node.go
index 99b34a3..0435c7c 100644
--- a/pkg/ast/node.go
+++ b/pkg/ast/node.go
@@ -36,11 +36,29 @@ func (n *Nullable) Accept(v NodeVisitor) {
 	v.Nullable(n)
 }
 
+// Reference node
+type Reference struct {
+	Node
+	Var Vertex
+}
+
+func (n *Reference) Accept(v NodeVisitor) {
+	v.Reference(n)
+}
+
+// Variadic node
+type Variadic struct {
+	Node
+	Var Vertex
+}
+
+func (n *Variadic) Accept(v NodeVisitor) {
+	v.Variadic(n)
+}
+
 // Parameter node
 type Parameter struct {
 	Node
-	ByRef        bool
-	Variadic     bool
 	Type         Vertex
 	Var          Vertex
 	DefaultValue Vertex
diff --git a/pkg/ast/traverser/dfs.go b/pkg/ast/traverser/dfs.go
index 7a13184..d25b426 100644
--- a/pkg/ast/traverser/dfs.go
+++ b/pkg/ast/traverser/dfs.go
@@ -40,6 +40,30 @@ func (t *DFS) Traverse(n ast.Vertex) {
 			t.Traverse(nn.Expr)
 			t.visitor.Leave("Expr", true)
 		}
+	case *ast.Reference:
+		if nn == nil {
+			return
+		}
+		if !t.visitor.EnterNode(nn) {
+			return
+		}
+		if nn.Var != nil {
+			t.visitor.Enter("Var", true)
+			t.Traverse(nn.Var)
+			t.visitor.Leave("Var", true)
+		}
+	case *ast.Variadic:
+		if nn == nil {
+			return
+		}
+		if !t.visitor.EnterNode(nn) {
+			return
+		}
+		if nn.Var != nil {
+			t.visitor.Enter("Var", true)
+			t.Traverse(nn.Var)
+			t.visitor.Leave("Var", true)
+		}
 	case *ast.Parameter:
 		if nn == nil {
 			return
diff --git a/pkg/ast/visitor/dump.go b/pkg/ast/visitor/dump.go
index 5273c21..9346d75 100644
--- a/pkg/ast/visitor/dump.go
+++ b/pkg/ast/visitor/dump.go
@@ -33,10 +33,18 @@ func (v *Dump) print(str string) {
 }
 
 func (v *Dump) printIndent(indentDepth int) {
+	if indentDepth < 0 {
+		indentDepth = 0
+	}
+
 	v.print(strings.Repeat("\t", indentDepth))
 }
 
 func (v *Dump) printIndentIfNotSingle(indentDepth int) {
+	if indentDepth < 0 {
+		indentDepth = 0
+	}
+
 	if !v.stack[v.depth-1].singleNode {
 		v.print(strings.Repeat("\t", indentDepth))
 	}
@@ -173,20 +181,22 @@ func (v *Dump) Nullable(n *ast.Nullable) {
 	v.printNode(n.GetNode())
 }
 
+func (v *Dump) Reference(n *ast.Reference) {
+	v.printIndentIfNotSingle(v.indent - 1)
+	v.print("&ast.Reference{\n")
+	v.printNode(n.GetNode())
+}
+
+func (v *Dump) Variadic(n *ast.Variadic) {
+	v.printIndentIfNotSingle(v.indent - 1)
+	v.print("&ast.Variadic{\n")
+	v.printNode(n.GetNode())
+}
+
 func (v *Dump) Parameter(n *ast.Parameter) {
 	v.printIndent(v.indent - 1)
 	v.print("&ast.Parameter{\n")
 	v.printNode(n.GetNode())
-
-	if n.ByRef {
-		v.printIndent(v.indent)
-		v.print("ByRef: true,\n")
-	}
-
-	if n.Variadic {
-		v.printIndent(v.indent)
-		v.print("Variadic: true,\n")
-	}
 }
 
 func (v *Dump) Identifier(n *ast.Identifier) {
diff --git a/pkg/ast/visitor/dump_test.go b/pkg/ast/visitor/dump_test.go
index c257ed5..cc9a387 100644
--- a/pkg/ast/visitor/dump_test.go
+++ b/pkg/ast/visitor/dump_test.go
@@ -30,8 +30,7 @@ func ExampleDump() {
 		Stmts: []ast.Vertex{
 			&ast.Identifier{},
 			&ast.Parameter{
-				Variadic: true,
-				Var:      &ast.ExprVariable{},
+				Var: &ast.ExprVariable{},
 			},
 			&ast.StmtInlineHtml{
 				Value: []byte("foo"),
@@ -64,7 +63,6 @@ func ExampleDump() {
 	//			Value: []byte(""),
 	//		},
 	//		&ast.Parameter{
-	//			Variadic: true,
 	//			Var: &ast.ExprVariable{
 	//			},
 	//		},
diff --git a/pkg/ast/visitor/namespace_resolver_test.go b/pkg/ast/visitor/namespace_resolver_test.go
index 607aa9e..6cab1d0 100644
--- a/pkg/ast/visitor/namespace_resolver_test.go
+++ b/pkg/ast/visitor/namespace_resolver_test.go
@@ -502,10 +502,8 @@ func TestResolveFunctionName(t *testing.T) {
 		FunctionName: &ast.Identifier{Value: []byte("A")},
 		Params: []ast.Vertex{
 			&ast.Parameter{
-				ByRef:    false,
-				Variadic: false,
-				Type:     nameAB,
-				Var:      &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("foo")}},
+				Type: nameAB,
+				Var:  &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("foo")}},
 			},
 		},
 		ReturnType: &ast.Nullable{Expr: nameBC},
@@ -540,10 +538,8 @@ func TestResolveMethodName(t *testing.T) {
 		MethodName: &ast.Identifier{Value: []byte("A")},
 		Params: []ast.Vertex{
 			&ast.Parameter{
-				ByRef:    false,
-				Variadic: false,
-				Type:     nameAB,
-				Var:      &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("foo")}},
+				Type: nameAB,
+				Var:  &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("foo")}},
 			},
 		},
 		ReturnType: &ast.Nullable{Expr: nameBC},
@@ -573,10 +569,8 @@ func TestResolveClosureName(t *testing.T) {
 		Static:     false,
 		Params: []ast.Vertex{
 			&ast.Parameter{
-				ByRef:    false,
-				Variadic: false,
-				Type:     nameAB,
-				Var:      &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("foo")}},
+				Type: nameAB,
+				Var:  &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("foo")}},
 			},
 		},
 		ClosureUse: nil,
diff --git a/pkg/ast/visitor/null.go b/pkg/ast/visitor/null.go
index bdcacbf..6fd6261 100644
--- a/pkg/ast/visitor/null.go
+++ b/pkg/ast/visitor/null.go
@@ -30,6 +30,14 @@ func (v *Null) Nullable(_ *ast.Nullable) {
 	// do nothing
 }
 
+func (v *Null) Reference(_ *ast.Reference) {
+	// do nothing
+}
+
+func (v *Null) Variadic(_ *ast.Variadic) {
+	// do nothing
+}
+
 func (v *Null) Parameter(_ *ast.Parameter) {
 	// do nothing
 }
diff --git a/pkg/printer/pretty_printer.go b/pkg/printer/pretty_printer.go
index 37a1a71..77375ea 100644
--- a/pkg/printer/pretty_printer.go
+++ b/pkg/printer/pretty_printer.go
@@ -64,6 +64,10 @@ func (p *PrettyPrinter) printNode(n ast.Vertex) {
 		p.printNodeRoot(n)
 	case *ast.Identifier:
 		p.printNodeIdentifier(n)
+	case *ast.Reference:
+		p.printNodeReference(n)
+	case *ast.Variadic:
+		p.printNodeVariadic(n)
 	case *ast.Parameter:
 		p.printNodeParameter(n)
 	case *ast.Nullable:
@@ -434,6 +438,20 @@ func (p *PrettyPrinter) printNodeIdentifier(n ast.Vertex) {
 	io.WriteString(p.w, v)
 }
 
+func (p *PrettyPrinter) printNodeReference(n ast.Vertex) {
+	nn := n.(*ast.Reference)
+
+	io.WriteString(p.w, "&")
+	p.Print(nn.Var)
+}
+
+func (p *PrettyPrinter) printNodeVariadic(n ast.Vertex) {
+	nn := n.(*ast.Variadic)
+
+	io.WriteString(p.w, "...")
+	p.Print(nn.Var)
+}
+
 func (p *PrettyPrinter) printNodeParameter(n ast.Vertex) {
 	nn := n.(*ast.Parameter)
 
@@ -442,14 +460,6 @@ func (p *PrettyPrinter) printNodeParameter(n ast.Vertex) {
 		io.WriteString(p.w, " ")
 	}
 
-	if nn.ByRef {
-		io.WriteString(p.w, "&")
-	}
-
-	if nn.Variadic {
-		io.WriteString(p.w, "...")
-	}
-
 	p.Print(nn.Var)
 
 	if nn.DefaultValue != nil {
diff --git a/pkg/printer/pretty_printer_test.go b/pkg/printer/pretty_printer_test.go
index 0403ba3..a686aff 100644
--- a/pkg/printer/pretty_printer_test.go
+++ b/pkg/printer/pretty_printer_test.go
@@ -119,10 +119,14 @@ func TestPrintParameter(t *testing.T) {
 
 	p := printer.NewPrettyPrinter(o, "    ")
 	p.Print(&ast.Parameter{
-		ByRef:        false,
-		Variadic:     true,
-		Type:         &ast.NameFullyQualified{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
-		Var:          &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("var")}},
+		Type: &ast.NameFullyQualified{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
+		Var: &ast.Variadic{
+			Var: &ast.ExprVariable{
+				VarName: &ast.Identifier{
+					Value: []byte("var"),
+				},
+			},
+		},
 		DefaultValue: &ast.ScalarString{Value: []byte("'default'")},
 	})
 
@@ -140,10 +144,8 @@ func TestPrintNullable(t *testing.T) {
 	p := printer.NewPrettyPrinter(o, "    ")
 	p.Print(&ast.Nullable{
 		Expr: &ast.Parameter{
-			ByRef:        false,
-			Variadic:     true,
 			Type:         &ast.NameFullyQualified{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
-			Var:          &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("var")}},
+			Var:          &ast.Variadic{Var: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("var")}}},
 			DefaultValue: &ast.ScalarString{Value: []byte("'default'")},
 		},
 	})
@@ -1389,9 +1391,7 @@ func TestPrintExprClosure(t *testing.T) {
 				ReturnsRef: true,
 				Params: []ast.Vertex{
 					&ast.Parameter{
-						ByRef:    true,
-						Variadic: false,
-						Var:      &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("var")}},
+						Var: &ast.Reference{Var: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("var")}}},
 					},
 				},
 				ClosureUse: &ast.ExprClosureUse{
@@ -2446,14 +2446,12 @@ func TestPrintStmtClassMethod(t *testing.T) {
 		MethodName: &ast.Identifier{Value: []byte("foo")},
 		Params: []ast.Vertex{
 			&ast.Parameter{
-				ByRef:        true,
 				Type:         &ast.Nullable{Expr: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("int")}}}},
-				Var:          &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("a")}},
+				Var:          &ast.Reference{Var: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("a")}}},
 				DefaultValue: &ast.ExprConstFetch{Const: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("null")}}}},
 			},
 			&ast.Parameter{
-				Variadic: true,
-				Var:      &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("b")}},
+				Var: &ast.Variadic{Var: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("b")}}},
 			},
 		},
 		ReturnType: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("void")}}},
@@ -2484,14 +2482,12 @@ func TestPrintStmtAbstractClassMethod(t *testing.T) {
 		MethodName: &ast.Identifier{Value: []byte("foo")},
 		Params: []ast.Vertex{
 			&ast.Parameter{
-				ByRef:        true,
 				Type:         &ast.Nullable{Expr: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("int")}}}},
-				Var:          &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("a")}},
+				Var:          &ast.Reference{Var: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("a")}}},
 				DefaultValue: &ast.ExprConstFetch{Const: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("null")}}}},
 			},
 			&ast.Parameter{
-				Variadic: true,
-				Var:      &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("b")}},
+				Var: &ast.Variadic{Var: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("b")}}},
 			},
 		},
 		ReturnType: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("void")}}},
@@ -3197,9 +3193,7 @@ func TestPrintStmtFunction(t *testing.T) {
 				FunctionName: &ast.Identifier{Value: []byte("foo")},
 				Params: []ast.Vertex{
 					&ast.Parameter{
-						ByRef:    true,
-						Variadic: false,
-						Var:      &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("var")}},
+						Var: &ast.Reference{Var: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("var")}}},
 					},
 				},
 				ReturnType: &ast.NameFullyQualified{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
diff --git a/pkg/printer/printer.go b/pkg/printer/printer.go
index 09399dd..47a82fb 100644
--- a/pkg/printer/printer.go
+++ b/pkg/printer/printer.go
@@ -79,6 +79,10 @@ func (p *Printer) printNode(n ast.Vertex) {
 		p.printNodeRoot(n)
 	case *ast.Identifier:
 		p.printNodeIdentifier(n)
+	case *ast.Reference:
+		p.printNodeReference(n)
+	case *ast.Variadic:
+		p.printNodeVariadic(n)
 	case *ast.Parameter:
 		p.printNodeParameter(n)
 	case *ast.Nullable:
@@ -444,6 +448,26 @@ func (p *Printer) printNodeIdentifier(n ast.Vertex) {
 	p.printFreeFloating(nn, token.End)
 }
 
+func (p *Printer) printNodeReference(n ast.Vertex) {
+	nn := n.(*ast.Reference)
+	p.printFreeFloating(nn, token.Start)
+
+	io.WriteString(p.w, "&")
+	p.Print(nn.Var)
+
+	p.printFreeFloating(nn, token.End)
+}
+
+func (p *Printer) printNodeVariadic(n ast.Vertex) {
+	nn := n.(*ast.Variadic)
+	p.printFreeFloating(nn, token.Start)
+
+	io.WriteString(p.w, "...")
+	p.Print(nn.Var)
+
+	p.printFreeFloating(nn, token.End)
+}
+
 func (p *Printer) printNodeParameter(n ast.Vertex) {
 	nn := n.(*ast.Parameter)
 	p.printFreeFloating(nn, token.Start)
@@ -451,22 +475,10 @@ func (p *Printer) printNodeParameter(n ast.Vertex) {
 	if nn.Type != nil {
 		p.Print(nn.Type)
 	}
-	p.printFreeFloating(nn, token.OptionalType)
-
-	if nn.ByRef {
-		io.WriteString(p.w, "&")
-	}
-	p.printFreeFloating(nn, token.Ampersand)
-
-	if nn.Variadic {
-		io.WriteString(p.w, "...")
-	}
-	p.printFreeFloating(nn, token.Variadic)
 
 	p.Print(nn.Var)
 
 	if nn.DefaultValue != nil {
-		p.printFreeFloating(nn, token.Var)
 		io.WriteString(p.w, "=")
 		p.Print(nn.DefaultValue)
 	}
diff --git a/pkg/printer/printer_parsed_php7_test.go b/pkg/printer/printer_parsed_php7_test.go
index 900ae22..a68c502 100644
--- a/pkg/printer/printer_parsed_php7_test.go
+++ b/pkg/printer/printer_parsed_php7_test.go
@@ -107,6 +107,18 @@ func TestParseAndPrintIdentifier(t *testing.T) {
 	}
 }
 
+func TestParseAndPrintParameterTMP(t *testing.T) {
+
+	src := `<?php
+	function foo ( foo & ... $foo = null ) {}`
+
+	actual := print(parse(src))
+
+	if src != actual {
+		t.Errorf("\nexpected: %s\ngot: %s\n", src, actual)
+	}
+}
+
 func TestParseAndPrintParameter(t *testing.T) {
 
 	src := `<?php
diff --git a/pkg/printer/printer_test.go b/pkg/printer/printer_test.go
index cf8a36f..250545c 100644
--- a/pkg/printer/printer_test.go
+++ b/pkg/printer/printer_test.go
@@ -141,8 +141,6 @@ func TestPrinterPrintParameter(t *testing.T) {
 
 	p := printer.NewPrinter(o)
 	p.Print(&ast.Parameter{
-		ByRef:    false,
-		Variadic: true,
 		Type: &ast.NameFullyQualified{
 			Parts: []ast.Vertex{
 				&ast.NameNamePart{
@@ -150,8 +148,10 @@ func TestPrinterPrintParameter(t *testing.T) {
 				},
 			},
 		},
-		Var: &ast.ExprVariable{
-			VarName: &ast.Identifier{Value: []byte("$var")},
+		Var: &ast.Variadic{
+			Var: &ast.ExprVariable{
+				VarName: &ast.Identifier{Value: []byte("$var")},
+			},
 		},
 		DefaultValue: &ast.ScalarString{
 			Value: []byte("'default'"),
@@ -172,8 +172,6 @@ func TestPrinterPrintNullable(t *testing.T) {
 	p := printer.NewPrinter(o)
 	p.Print(&ast.Nullable{
 		Expr: &ast.Parameter{
-			ByRef:    true,
-			Variadic: false,
 			Type: &ast.NameFullyQualified{
 				Parts: []ast.Vertex{
 					&ast.NameNamePart{
@@ -181,8 +179,10 @@ func TestPrinterPrintNullable(t *testing.T) {
 					},
 				},
 			},
-			Var: &ast.ExprVariable{
-				VarName: &ast.Identifier{Value: []byte("$var")},
+			Var: &ast.Reference{
+				Var: &ast.ExprVariable{
+					VarName: &ast.Identifier{Value: []byte("$var")},
+				},
 			},
 			DefaultValue: &ast.ScalarString{
 				Value: []byte("'default'"),
@@ -1703,10 +1703,10 @@ func TestPrinterPrintExprClosure(t *testing.T) {
 		ReturnsRef: true,
 		Params: []ast.Vertex{
 			&ast.Parameter{
-				ByRef:    true,
-				Variadic: false,
-				Var: &ast.ExprVariable{
-					VarName: &ast.Identifier{Value: []byte("$var")},
+				Var: &ast.Reference{
+					Var: &ast.ExprVariable{
+						VarName: &ast.Identifier{Value: []byte("$var")},
+					},
 				},
 			},
 		},
@@ -1748,10 +1748,10 @@ func TestPrinterPrintExprArrowFunction(t *testing.T) {
 			ReturnsRef: true,
 			Params: []ast.Vertex{
 				&ast.Parameter{
-					ByRef:    true,
-					Variadic: false,
-					Var: &ast.ExprVariable{
-						VarName: &ast.Identifier{Value: []byte("$var")},
+					Var: &ast.Reference{
+						Var: &ast.ExprVariable{
+							VarName: &ast.Identifier{Value: []byte("$var")},
+						},
 					},
 				},
 			},
@@ -2925,17 +2925,19 @@ func TestPrinterPrintStmtClassMethod(t *testing.T) {
 		MethodName: &ast.Identifier{Value: []byte("foo")},
 		Params: []ast.Vertex{
 			&ast.Parameter{
-				ByRef: true,
 				Type:  &ast.Nullable{Expr: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("int")}}}},
-				Var: &ast.ExprVariable{
-					VarName: &ast.Identifier{Value: []byte("$a")},
+				Var: &ast.Reference{
+					Var: &ast.ExprVariable{
+						VarName: &ast.Identifier{Value: []byte("$a")},
+					},
 				},
 				DefaultValue: &ast.ExprConstFetch{Const: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("null")}}}},
 			},
 			&ast.Parameter{
-				Variadic: true,
-				Var: &ast.ExprVariable{
-					VarName: &ast.Identifier{Value: []byte("$b")},
+				Var: &ast.Variadic{
+					Var: &ast.ExprVariable{
+						VarName: &ast.Identifier{Value: []byte("$b")},
+					},
 				},
 			},
 		},
@@ -2972,17 +2974,19 @@ func TestPrinterPrintStmtAbstractClassMethod(t *testing.T) {
 		MethodName: &ast.Identifier{Value: []byte("foo")},
 		Params: []ast.Vertex{
 			&ast.Parameter{
-				ByRef: true,
 				Type:  &ast.Nullable{Expr: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("int")}}}},
-				Var: &ast.ExprVariable{
-					VarName: &ast.Identifier{Value: []byte("$a")},
+				Var: &ast.Reference{
+					Var: &ast.ExprVariable{
+						VarName: &ast.Identifier{Value: []byte("$a")},
+					},
 				},
 				DefaultValue: &ast.ExprConstFetch{Const: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("null")}}}},
 			},
 			&ast.Parameter{
-				Variadic: true,
-				Var: &ast.ExprVariable{
-					VarName: &ast.Identifier{Value: []byte("$b")},
+				Var: &ast.Variadic{
+					Var: &ast.ExprVariable{
+						VarName: &ast.Identifier{Value: []byte("$b")},
+					},
 				},
 			},
 		},
@@ -3607,10 +3611,10 @@ func TestPrinterPrintStmtFunction(t *testing.T) {
 		FunctionName: &ast.Identifier{Value: []byte("foo")},
 		Params: []ast.Vertex{
 			&ast.Parameter{
-				ByRef:    true,
-				Variadic: false,
-				Var: &ast.ExprVariable{
-					VarName: &ast.Identifier{Value: []byte("$var")},
+				Var: &ast.Reference{
+					Var: &ast.ExprVariable{
+						VarName: &ast.Identifier{Value: []byte("$var")},
+					},
 				},
 			},
 		},