From feebb017c47fe71b7b509da3eb1666b92645afee Mon Sep 17 00:00:00 2001
From: Vadym Slizov <vadym.slizov@miacar.ch>
Date: Mon, 3 Aug 2020 21:22:53 +0200
Subject: [PATCH] [refactoring] update `use` ast structure

---
 internal/php5/parser_test.go               |  897 ++++++-----
 internal/php5/php5.go                      |  Bin 333216 -> 332402 bytes
 internal/php5/php5.y                       |   97 +-
 internal/php5/php5_test.go                 |  896 ++++++-----
 internal/php7/parser_test.go               | 1623 +++++++++++--------
 internal/php7/php7.go                      |  Bin 273775 -> 273828 bytes
 internal/php7/php7.y                       |  103 +-
 internal/php7/php7_test.go                 | 1624 ++++++++++++--------
 pkg/ast/ast.go                             |    4 +-
 pkg/ast/node.go                            |   52 +-
 pkg/ast/traverser/dfs.go                   |   90 +-
 pkg/ast/visitor/dump.go                    |   24 +-
 pkg/ast/visitor/namespace_resolver.go      |   62 +-
 pkg/ast/visitor/namespace_resolver_test.go |  161 +-
 pkg/ast/visitor/null.go                    |   16 +-
 pkg/printer/pretty_printer.go              |   80 +-
 pkg/printer/pretty_printer_test.go         |  113 +-
 pkg/printer/printer.go                     |  182 ++-
 pkg/printer/printer_test.go                |  115 +-
 pkg/token/position.go                      |    1 -
 pkg/token/position_string.go               |  151 +-
 21 files changed, 3610 insertions(+), 2681 deletions(-)

diff --git a/internal/php5/parser_test.go b/internal/php5/parser_test.go
index dcb70ae..b210323 100644
--- a/internal/php5/parser_test.go
+++ b/internal/php5/parser_test.go
@@ -11442,7 +11442,7 @@ func TestStmtUse(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -11451,17 +11451,17 @@ func TestStmtUse(t *testing.T) {
 						EndPos:    11,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  7,
-								EndPos:    10,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    10,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
@@ -11470,17 +11470,27 @@ func TestStmtUse(t *testing.T) {
 									EndPos:    10,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  7,
-											EndPos:    10,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  7,
+										EndPos:    10,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  7,
+												EndPos:    10,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
@@ -11510,7 +11520,7 @@ func TestStmtUse_FullyQualified(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -11519,17 +11529,17 @@ func TestStmtUse_FullyQualified(t *testing.T) {
 						EndPos:    12,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    11,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    11,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
@@ -11538,17 +11548,27 @@ func TestStmtUse_FullyQualified(t *testing.T) {
 									EndPos:    11,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  8,
-											EndPos:    11,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  8,
+										EndPos:    11,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  8,
+												EndPos:    11,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
@@ -11578,7 +11598,7 @@ func TestStmtUse_FullyQualifiedAlias(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -11587,49 +11607,59 @@ func TestStmtUse_FullyQualifiedAlias(t *testing.T) {
 						EndPos:    19,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    18,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    18,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  8,
-									EndPos:    11,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  8,
-											EndPos:    11,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  15,
 									EndPos:    18,
 								},
 							},
-							Value: []byte("Bar"),
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  8,
+										EndPos:    11,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  8,
+												EndPos:    11,
+											},
+										},
+										Value: []byte("Foo"),
+									},
+								},
+							},
+							Alias: &ast.Identifier{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  15,
+										EndPos:    18,
+									},
+								},
+								Value: []byte("Bar"),
+							},
 						},
 					},
 				},
@@ -11657,7 +11687,7 @@ func TestStmtUse_List(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -11666,17 +11696,17 @@ func TestStmtUse_List(t *testing.T) {
 						EndPos:    16,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  7,
-								EndPos:    10,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    15,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
@@ -11685,31 +11715,31 @@ func TestStmtUse_List(t *testing.T) {
 									EndPos:    10,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  7,
-											EndPos:    10,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  7,
+										EndPos:    10,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  7,
+												EndPos:    10,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  12,
-								EndPos:    15,
-							},
-						},
-						Use: &ast.NameName{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
@@ -11718,17 +11748,27 @@ func TestStmtUse_List(t *testing.T) {
 									EndPos:    15,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  12,
-											EndPos:    15,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    15,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  12,
+												EndPos:    15,
+											},
+										},
+										Value: []byte("Bar"),
 									},
-									Value: []byte("Bar"),
 								},
 							},
 						},
@@ -11758,7 +11798,7 @@ func TestStmtUse_ListAlias(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -11767,17 +11807,17 @@ func TestStmtUse_ListAlias(t *testing.T) {
 						EndPos:    23,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  7,
-								EndPos:    10,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    22,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
@@ -11786,63 +11826,73 @@ func TestStmtUse_ListAlias(t *testing.T) {
 									EndPos:    10,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  7,
-											EndPos:    10,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  7,
+										EndPos:    10,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  7,
+												EndPos:    10,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  12,
-								EndPos:    22,
-							},
-						},
-						Use: &ast.NameName{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  12,
-									EndPos:    15,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  12,
-											EndPos:    15,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  19,
 									EndPos:    22,
 								},
 							},
-							Value: []byte("Baz"),
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    15,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  12,
+												EndPos:    15,
+											},
+										},
+										Value: []byte("Bar"),
+									},
+								},
+							},
+							Alias: &ast.Identifier{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  19,
+										EndPos:    22,
+									},
+								},
+								Value: []byte("Baz"),
+							},
 						},
 					},
 				},
@@ -11870,7 +11920,7 @@ func TestStmtUse_ListFunctionType(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -11879,38 +11929,46 @@ func TestStmtUse_ListFunctionType(t *testing.T) {
 						EndPos:    26,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
-							EndPos:    15,
+							EndPos:    25,
 						},
 					},
-					Value: []byte("function"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    15,
+							},
+						},
+						Value: []byte("function"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  16,
-								EndPos:    19,
+								EndPos:    25,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  16,
-									EndPos:    19,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  16,
+										EndPos:    19,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -11919,31 +11977,31 @@ func TestStmtUse_ListFunctionType(t *testing.T) {
 											EndPos:    19,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  16,
+													EndPos:    19,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  22,
-								EndPos:    25,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  22,
-									EndPos:    25,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  22,
+										EndPos:    25,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -11952,7 +12010,19 @@ func TestStmtUse_ListFunctionType(t *testing.T) {
 											EndPos:    25,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  22,
+													EndPos:    25,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
 								},
 							},
 						},
@@ -11982,7 +12052,7 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -11991,38 +12061,46 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) {
 						EndPos:    40,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
-							EndPos:    15,
+							EndPos:    39,
 						},
 					},
-					Value: []byte("function"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    15,
+							},
+						},
+						Value: []byte("function"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  16,
-								EndPos:    26,
+								EndPos:    39,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  16,
-									EndPos:    19,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  16,
+										EndPos:    26,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -12031,42 +12109,42 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) {
 											EndPos:    19,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  16,
+													EndPos:    19,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  23,
+											EndPos:    26,
+										},
+									},
+									Value: []byte("foo"),
 								},
 							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  23,
-									EndPos:    26,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  29,
+										EndPos:    39,
+									},
 								},
-							},
-							Value: []byte("foo"),
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  29,
-								EndPos:    39,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  29,
-									EndPos:    32,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -12075,21 +12153,33 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) {
 											EndPos:    32,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  29,
+													EndPos:    32,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  36,
+											EndPos:    39,
+										},
+									},
+									Value: []byte("bar"),
 								},
 							},
 						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  36,
-									EndPos:    39,
-								},
-							},
-							Value: []byte("bar"),
-						},
 					},
 				},
 			},
@@ -12116,7 +12206,7 @@ func TestStmtUse_ListConstType(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -12125,38 +12215,47 @@ func TestStmtUse_ListConstType(t *testing.T) {
 						EndPos:    23,
 					},
 				},
-				UseType: &ast.Identifier{
+
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
-							EndPos:    12,
+							EndPos:    22,
 						},
 					},
-					Value: []byte("const"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    12,
+							},
+						},
+						Value: []byte("const"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  13,
-								EndPos:    16,
+								EndPos:    22,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  13,
-									EndPos:    16,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  13,
+										EndPos:    16,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -12165,31 +12264,31 @@ func TestStmtUse_ListConstType(t *testing.T) {
 											EndPos:    16,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  13,
+													EndPos:    16,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  19,
-								EndPos:    22,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  19,
-									EndPos:    22,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  19,
+										EndPos:    22,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -12198,7 +12297,19 @@ func TestStmtUse_ListConstType(t *testing.T) {
 											EndPos:    22,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  19,
+													EndPos:    22,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
 								},
 							},
 						},
@@ -12228,7 +12339,7 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -12237,38 +12348,46 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) {
 						EndPos:    37,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
-							EndPos:    12,
+							EndPos:    36,
 						},
 					},
-					Value: []byte("const"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    12,
+							},
+						},
+						Value: []byte("const"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  13,
-								EndPos:    23,
+								EndPos:    36,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  13,
-									EndPos:    16,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  13,
+										EndPos:    23,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -12277,42 +12396,42 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) {
 											EndPos:    16,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  13,
+													EndPos:    16,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  20,
+											EndPos:    23,
+										},
+									},
+									Value: []byte("foo"),
 								},
 							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  20,
-									EndPos:    23,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  26,
+										EndPos:    36,
+									},
 								},
-							},
-							Value: []byte("foo"),
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  26,
-								EndPos:    36,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  26,
-									EndPos:    29,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -12321,21 +12440,33 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) {
 											EndPos:    29,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  26,
+													EndPos:    29,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  33,
+											EndPos:    36,
+										},
+									},
+									Value: []byte("bar"),
 								},
 							},
 						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  33,
-									EndPos:    36,
-								},
-							},
-							Value: []byte("bar"),
-						},
 					},
 				},
 			},
diff --git a/internal/php5/php5.go b/internal/php5/php5.go
index 162c38257aff062d8a898e9dbc2cce8a38d5a841..7a695b705f4fc19c926cd96b45f73dc97d44ff07 100644
GIT binary patch
delta 10034
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

delta 10016
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
N4!T%UdgYLW{{qJh5qJOq

diff --git a/internal/php5/php5.y b/internal/php5/php5.y
index 50aa2a5..3e87194 100644
--- a/internal/php5/php5.y
+++ b/internal/php5/php5.y
@@ -428,49 +428,56 @@ top_statement:
             }
     |   T_USE use_declarations ';'
             {
-                $$ = &ast.StmtUseList{ast.Node{}, nil, $2}
+                useList := &ast.StmtUseList{ast.Node{}, $2}
+                $$ = &ast.StmtUse{ast.Node{}, useList}
 
                 // save position
+                useList.GetNode().Position = position.NewNodeListPosition($2)
                 $$.GetNode().Position = position.NewTokensPosition($1, $3)
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $3.Tokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $3.Tokens)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.Tokens)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
     |   T_USE T_FUNCTION use_function_declarations ';'
             {
-                useType := &ast.Identifier{ast.Node{}, $2.Value}
-                $$ = &ast.StmtUseList{ast.Node{}, useType, $3}
+                identifier := &ast.Identifier{ast.Node{}, $2.Value}
+                useList := &ast.StmtUseList{ast.Node{}, $3}
+                useType := &ast.StmtUseType{ast.Node{}, identifier, useList}
+                $$ = &ast.StmtUse{ast.Node{}, useType}
 
                 // save position
-                useType.GetNode().Position = position.NewTokenPosition($2)
+                identifier.GetNode().Position = position.NewTokenPosition($2)
+                useList.GetNode().Position = position.NewNodeListPosition($3)
+                useType.GetNode().Position = position.NewTokenNodePosition($2, useList)
                 $$.GetNode().Position = position.NewTokensPosition($1, $4)
 
                 // save comments
+                yylex.(*Parser).setFreeFloating(identifier, token.Start, $2.Tokens)
                 yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(useType, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $4.Tokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $4.Tokens)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.End, $4.Tokens)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
     |   T_USE T_CONST use_const_declarations ';'
             {
-                useType := &ast.Identifier{ast.Node{}, $2.Value}
-                $$ = &ast.StmtUseList{ast.Node{}, useType, $3}
+                identifier := &ast.Identifier{ast.Node{}, $2.Value}
+                useList := &ast.StmtUseList{ast.Node{}, $3}
+                useType := &ast.StmtUseType{ast.Node{}, identifier, useList}
+                $$ = &ast.StmtUse{ast.Node{}, useType}
 
                 // save position
-                useType.GetNode().Position = position.NewTokenPosition($2)
+                identifier.GetNode().Position = position.NewTokenPosition($2)
+                useList.GetNode().Position = position.NewNodeListPosition($3)
+                useType.GetNode().Position = position.NewTokenNodePosition($2, useList)
                 $$.GetNode().Position = position.NewTokensPosition($1, $4)
 
                 // save comments
+                yylex.(*Parser).setFreeFloating(identifier, token.Start, $2.Tokens)
                 yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(useType, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $4.Tokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $4.Tokens)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.End, $4.Tokens)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -511,22 +518,19 @@ use_declaration:
         namespace_name
             {
                 name := &ast.NameName{ast.Node{}, $1}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, nil}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, nil}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($1)
                 $$.GetNode().Position = position.NewNodeListPosition($1)
 
-                // save comments
-                yylex.(*Parser).MoveFreeFloating($1[0], $$)
-
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
     |   namespace_name T_AS T_STRING
             {
                 name := &ast.NameName{ast.Node{}, $1}
                 alias := &ast.Identifier{ast.Node{}, $3.Value}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, alias}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, alias}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($1)
@@ -534,7 +538,6 @@ use_declaration:
                 $$.GetNode().Position = position.NewNodeListTokenPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).MoveFreeFloating($1[0], $$)
                 yylex.(*Parser).setFreeFloating(name, token.End, $2.Tokens)
                 yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Tokens)
 
@@ -543,16 +546,14 @@ use_declaration:
     |   T_NS_SEPARATOR namespace_name
             {
                 name := &ast.NameName{ast.Node{}, $2}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, nil}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, nil}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($2)
                 $$.GetNode().Position = position.NewNodeListPosition($2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setToken($$, token.Slash, $1.Tokens)
-                yylex.(*Parser).MoveFreeFloating($2[0], name)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.Tokens)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -560,7 +561,7 @@ use_declaration:
             {
                 name := &ast.NameName{ast.Node{}, $2}
                 alias := &ast.Identifier{ast.Node{}, $4.Value}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, alias}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, alias}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($2)
@@ -568,9 +569,7 @@ use_declaration:
                 $$.GetNode().Position = position.NewNodeListTokenPosition($2, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setToken($$, token.Slash, $1.Tokens)
-                yylex.(*Parser).MoveFreeFloating($2[0], name)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.Tokens)
                 yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
                 yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Tokens)
 
@@ -600,22 +599,19 @@ use_function_declaration:
         namespace_name
             {
                 name := &ast.NameName{ast.Node{}, $1}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, nil}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, nil}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($1)
                 $$.GetNode().Position = position.NewNodeListPosition($1)
 
-                // save comments
-                yylex.(*Parser).MoveFreeFloating($1[0], $$)
-
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
     |   namespace_name T_AS T_STRING
             {
                 name := &ast.NameName{ast.Node{}, $1}
                 alias := &ast.Identifier{ast.Node{}, $3.Value}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, alias}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, alias}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($1)
@@ -623,7 +619,6 @@ use_function_declaration:
                 $$.GetNode().Position = position.NewNodeListTokenPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).MoveFreeFloating($1[0], $$)
                 yylex.(*Parser).setFreeFloating(name, token.End, $2.Tokens)
                 yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Tokens)
 
@@ -632,16 +627,14 @@ use_function_declaration:
     |   T_NS_SEPARATOR namespace_name
             {
                 name := &ast.NameName{ast.Node{}, $2}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, nil}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, nil}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($2)
                 $$.GetNode().Position = position.NewNodeListPosition($2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setToken($$, token.Slash, $1.Tokens)
-                yylex.(*Parser).MoveFreeFloating($2[0], name)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.Tokens)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -649,7 +642,7 @@ use_function_declaration:
             {
                 name := &ast.NameName{ast.Node{}, $2}
                 alias := &ast.Identifier{ast.Node{}, $4.Value}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, alias}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, alias}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($2)
@@ -657,9 +650,7 @@ use_function_declaration:
                 $$.GetNode().Position = position.NewNodeListTokenPosition($2, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setToken($$, token.Slash, $1.Tokens)
-                yylex.(*Parser).MoveFreeFloating($2[0], name)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.Tokens)
                 yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
                 yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Tokens)
 
@@ -689,22 +680,19 @@ use_const_declaration:
         namespace_name
             {
                 name := &ast.NameName{ast.Node{}, $1}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, nil}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, nil}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($1)
                 $$.GetNode().Position = position.NewNodeListPosition($1)
 
-                // save comments
-                yylex.(*Parser).MoveFreeFloating($1[0], $$)
-
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
     |   namespace_name T_AS T_STRING
             {
                 name := &ast.NameName{ast.Node{}, $1}
                 alias := &ast.Identifier{ast.Node{}, $3.Value}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, alias}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, alias}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($1)
@@ -712,7 +700,6 @@ use_const_declaration:
                 $$.GetNode().Position = position.NewNodeListTokenPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).MoveFreeFloating($1[0], $$)
                 yylex.(*Parser).setFreeFloating(name, token.End, $2.Tokens)
                 yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Tokens)
 
@@ -721,16 +708,14 @@ use_const_declaration:
     |   T_NS_SEPARATOR namespace_name
             {
                 name := &ast.NameName{ast.Node{}, $2}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, nil}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, nil}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($2)
                 $$.GetNode().Position = position.NewNodeListPosition($2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setToken($$, token.Slash, $1.Tokens)
-                yylex.(*Parser).MoveFreeFloating($2[0], name)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.Tokens)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -738,7 +723,7 @@ use_const_declaration:
             {
                 name := &ast.NameName{ast.Node{}, $2}
                 alias := &ast.Identifier{ast.Node{}, $4.Value}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, alias}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, alias}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($2)
@@ -746,9 +731,7 @@ use_const_declaration:
                 $$.GetNode().Position = position.NewNodeListTokenPosition($2, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setToken($$, token.Slash, $1.Tokens)
-                yylex.(*Parser).MoveFreeFloating($2[0], name)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.Tokens)
                 yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
                 yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Tokens)
 
diff --git a/internal/php5/php5_test.go b/internal/php5/php5_test.go
index d36ab6d..7c4c4c6 100644
--- a/internal/php5/php5_test.go
+++ b/internal/php5/php5_test.go
@@ -8525,7 +8525,7 @@ func TestPhp5(t *testing.T) {
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 154,
@@ -8534,17 +8534,17 @@ func TestPhp5(t *testing.T) {
 						EndPos:    3289,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 154,
-								EndLine:   154,
-								StartPos:  3285,
-								EndPos:    3288,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 154,
+							EndLine:   154,
+							StartPos:  3285,
+							EndPos:    3288,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 154,
@@ -8553,24 +8553,34 @@ func TestPhp5(t *testing.T) {
 									EndPos:    3288,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 154,
-											EndLine:   154,
-											StartPos:  3285,
-											EndPos:    3288,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 154,
+										EndLine:   154,
+										StartPos:  3285,
+										EndPos:    3288,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 154,
+												EndLine:   154,
+												StartPos:  3285,
+												EndPos:    3288,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 155,
@@ -8579,17 +8589,17 @@ func TestPhp5(t *testing.T) {
 						EndPos:    3299,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 155,
-								EndLine:   155,
-								StartPos:  3295,
-								EndPos:    3298,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 155,
+							EndLine:   155,
+							StartPos:  3295,
+							EndPos:    3298,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 155,
@@ -8598,24 +8608,34 @@ func TestPhp5(t *testing.T) {
 									EndPos:    3298,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 155,
-											EndLine:   155,
-											StartPos:  3295,
-											EndPos:    3298,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 155,
+										EndLine:   155,
+										StartPos:  3295,
+										EndPos:    3298,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 155,
+												EndLine:   155,
+												StartPos:  3295,
+												EndPos:    3298,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 156,
@@ -8624,54 +8644,64 @@ func TestPhp5(t *testing.T) {
 						EndPos:    3316,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 156,
-								EndLine:   156,
-								StartPos:  3305,
-								EndPos:    3315,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 156,
+							EndLine:   156,
+							StartPos:  3305,
+							EndPos:    3315,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 156,
 									EndLine:   156,
 									StartPos:  3305,
-									EndPos:    3308,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 156,
-											EndLine:   156,
-											StartPos:  3305,
-											EndPos:    3308,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 156,
-									EndLine:   156,
-									StartPos:  3312,
 									EndPos:    3315,
 								},
 							},
-							Value: []byte("Bar"),
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 156,
+										EndLine:   156,
+										StartPos:  3305,
+										EndPos:    3308,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 156,
+												EndLine:   156,
+												StartPos:  3305,
+												EndPos:    3308,
+											},
+										},
+										Value: []byte("Foo"),
+									},
+								},
+							},
+							Alias: &ast.Identifier{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 156,
+										EndLine:   156,
+										StartPos:  3312,
+										EndPos:    3315,
+									},
+								},
+								Value: []byte("Bar"),
+							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 157,
@@ -8680,17 +8710,17 @@ func TestPhp5(t *testing.T) {
 						EndPos:    3330,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 157,
-								EndLine:   157,
-								StartPos:  3321,
-								EndPos:    3324,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 157,
+							EndLine:   157,
+							StartPos:  3321,
+							EndPos:    3329,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 157,
@@ -8699,31 +8729,31 @@ func TestPhp5(t *testing.T) {
 									EndPos:    3324,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 157,
-											EndLine:   157,
-											StartPos:  3321,
-											EndPos:    3324,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 157,
+										EndLine:   157,
+										StartPos:  3321,
+										EndPos:    3324,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 157,
+												EndLine:   157,
+												StartPos:  3321,
+												EndPos:    3324,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 157,
-								EndLine:   157,
-								StartPos:  3326,
-								EndPos:    3329,
-							},
-						},
-						Use: &ast.NameName{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 157,
@@ -8732,24 +8762,34 @@ func TestPhp5(t *testing.T) {
 									EndPos:    3329,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 157,
-											EndLine:   157,
-											StartPos:  3326,
-											EndPos:    3329,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 157,
+										EndLine:   157,
+										StartPos:  3326,
+										EndPos:    3329,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 157,
+												EndLine:   157,
+												StartPos:  3326,
+												EndPos:    3329,
+											},
+										},
+										Value: []byte("Bar"),
 									},
-									Value: []byte("Bar"),
 								},
 							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 158,
@@ -8758,17 +8798,17 @@ func TestPhp5(t *testing.T) {
 						EndPos:    3351,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 158,
-								EndLine:   158,
-								StartPos:  3335,
-								EndPos:    3338,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 158,
+							EndLine:   158,
+							StartPos:  3335,
+							EndPos:    3350,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 158,
@@ -8777,68 +8817,78 @@ func TestPhp5(t *testing.T) {
 									EndPos:    3338,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 158,
-											EndLine:   158,
-											StartPos:  3335,
-											EndPos:    3338,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 158,
+										EndLine:   158,
+										StartPos:  3335,
+										EndPos:    3338,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 158,
+												EndLine:   158,
+												StartPos:  3335,
+												EndPos:    3338,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 158,
-								EndLine:   158,
-								StartPos:  3340,
-								EndPos:    3350,
-							},
-						},
-						Use: &ast.NameName{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 158,
 									EndLine:   158,
 									StartPos:  3340,
-									EndPos:    3343,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 158,
-											EndLine:   158,
-											StartPos:  3340,
-											EndPos:    3343,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 158,
-									EndLine:   158,
-									StartPos:  3347,
 									EndPos:    3350,
 								},
 							},
-							Value: []byte("Baz"),
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 158,
+										EndLine:   158,
+										StartPos:  3340,
+										EndPos:    3343,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 158,
+												EndLine:   158,
+												StartPos:  3340,
+												EndPos:    3343,
+											},
+										},
+										Value: []byte("Bar"),
+									},
+								},
+							},
+							Alias: &ast.Identifier{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 158,
+										EndLine:   158,
+										StartPos:  3347,
+										EndPos:    3350,
+									},
+								},
+								Value: []byte("Baz"),
+							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 159,
@@ -8847,38 +8897,46 @@ func TestPhp5(t *testing.T) {
 						EndPos:    3375,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 159,
 							EndLine:   159,
 							StartPos:  3356,
-							EndPos:    3364,
+							EndPos:    3374,
 						},
 					},
-					Value: []byte("function"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 159,
+								EndLine:   159,
+								StartPos:  3356,
+								EndPos:    3364,
+							},
+						},
+						Value: []byte("function"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 159,
 								EndLine:   159,
 								StartPos:  3365,
-								EndPos:    3368,
+								EndPos:    3374,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 159,
-									EndLine:   159,
-									StartPos:  3365,
-									EndPos:    3368,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 159,
+										EndLine:   159,
+										StartPos:  3365,
+										EndPos:    3368,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 159,
@@ -8887,31 +8945,31 @@ func TestPhp5(t *testing.T) {
 											EndPos:    3368,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 159,
+													EndLine:   159,
+													StartPos:  3365,
+													EndPos:    3368,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 159,
-								EndLine:   159,
-								StartPos:  3371,
-								EndPos:    3374,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 159,
-									EndLine:   159,
-									StartPos:  3371,
-									EndPos:    3374,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 159,
+										EndLine:   159,
+										StartPos:  3371,
+										EndPos:    3374,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 159,
@@ -8920,14 +8978,26 @@ func TestPhp5(t *testing.T) {
 											EndPos:    3374,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 159,
+													EndLine:   159,
+													StartPos:  3371,
+													EndPos:    3374,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
 								},
 							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 160,
@@ -8936,38 +9006,46 @@ func TestPhp5(t *testing.T) {
 						EndPos:    3413,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 160,
 							EndLine:   160,
 							StartPos:  3380,
-							EndPos:    3388,
+							EndPos:    3412,
 						},
 					},
-					Value: []byte("function"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 160,
+								EndLine:   160,
+								StartPos:  3380,
+								EndPos:    3388,
+							},
+						},
+						Value: []byte("function"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 160,
 								EndLine:   160,
 								StartPos:  3389,
-								EndPos:    3399,
+								EndPos:    3412,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 160,
-									EndLine:   160,
-									StartPos:  3389,
-									EndPos:    3392,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 160,
+										EndLine:   160,
+										StartPos:  3389,
+										EndPos:    3399,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 160,
@@ -8976,42 +9054,42 @@ func TestPhp5(t *testing.T) {
 											EndPos:    3392,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 160,
+													EndLine:   160,
+													StartPos:  3389,
+													EndPos:    3392,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 160,
+											EndLine:   160,
+											StartPos:  3396,
+											EndPos:    3399,
+										},
+									},
+									Value: []byte("foo"),
 								},
 							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 160,
-									EndLine:   160,
-									StartPos:  3396,
-									EndPos:    3399,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 160,
+										EndLine:   160,
+										StartPos:  3402,
+										EndPos:    3412,
+									},
 								},
-							},
-							Value: []byte("foo"),
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 160,
-								EndLine:   160,
-								StartPos:  3402,
-								EndPos:    3412,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 160,
-									EndLine:   160,
-									StartPos:  3402,
-									EndPos:    3405,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 160,
@@ -9020,25 +9098,37 @@ func TestPhp5(t *testing.T) {
 											EndPos:    3405,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 160,
+													EndLine:   160,
+													StartPos:  3402,
+													EndPos:    3405,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 160,
+											EndLine:   160,
+											StartPos:  3409,
+											EndPos:    3412,
+										},
+									},
+									Value: []byte("bar"),
 								},
 							},
 						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 160,
-									EndLine:   160,
-									StartPos:  3409,
-									EndPos:    3412,
-								},
-							},
-							Value: []byte("bar"),
-						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 161,
@@ -9047,38 +9137,46 @@ func TestPhp5(t *testing.T) {
 						EndPos:    3434,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 161,
 							EndLine:   161,
 							StartPos:  3418,
-							EndPos:    3423,
+							EndPos:    3433,
 						},
 					},
-					Value: []byte("const"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 161,
+								EndLine:   161,
+								StartPos:  3418,
+								EndPos:    3423,
+							},
+						},
+						Value: []byte("const"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 161,
 								EndLine:   161,
 								StartPos:  3424,
-								EndPos:    3427,
+								EndPos:    3433,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 161,
-									EndLine:   161,
-									StartPos:  3424,
-									EndPos:    3427,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 161,
+										EndLine:   161,
+										StartPos:  3424,
+										EndPos:    3427,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 161,
@@ -9087,31 +9185,31 @@ func TestPhp5(t *testing.T) {
 											EndPos:    3427,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 161,
+													EndLine:   161,
+													StartPos:  3424,
+													EndPos:    3427,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 161,
-								EndLine:   161,
-								StartPos:  3430,
-								EndPos:    3433,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 161,
-									EndLine:   161,
-									StartPos:  3430,
-									EndPos:    3433,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 161,
+										EndLine:   161,
+										StartPos:  3430,
+										EndPos:    3433,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 161,
@@ -9120,14 +9218,26 @@ func TestPhp5(t *testing.T) {
 											EndPos:    3433,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 161,
+													EndLine:   161,
+													StartPos:  3430,
+													EndPos:    3433,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
 								},
 							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 162,
@@ -9136,38 +9246,46 @@ func TestPhp5(t *testing.T) {
 						EndPos:    3469,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 162,
 							EndLine:   162,
 							StartPos:  3439,
-							EndPos:    3444,
+							EndPos:    3468,
 						},
 					},
-					Value: []byte("const"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 162,
+								EndLine:   162,
+								StartPos:  3439,
+								EndPos:    3444,
+							},
+						},
+						Value: []byte("const"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 162,
 								EndLine:   162,
 								StartPos:  3445,
-								EndPos:    3455,
+								EndPos:    3468,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 162,
-									EndLine:   162,
-									StartPos:  3445,
-									EndPos:    3448,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 162,
+										EndLine:   162,
+										StartPos:  3445,
+										EndPos:    3455,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 162,
@@ -9176,42 +9294,42 @@ func TestPhp5(t *testing.T) {
 											EndPos:    3448,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 162,
+													EndLine:   162,
+													StartPos:  3445,
+													EndPos:    3448,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 162,
+											EndLine:   162,
+											StartPos:  3452,
+											EndPos:    3455,
+										},
+									},
+									Value: []byte("foo"),
 								},
 							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 162,
-									EndLine:   162,
-									StartPos:  3452,
-									EndPos:    3455,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 162,
+										EndLine:   162,
+										StartPos:  3458,
+										EndPos:    3468,
+									},
 								},
-							},
-							Value: []byte("foo"),
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 162,
-								EndLine:   162,
-								StartPos:  3458,
-								EndPos:    3468,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 162,
-									EndLine:   162,
-									StartPos:  3458,
-									EndPos:    3461,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 162,
@@ -9220,21 +9338,33 @@ func TestPhp5(t *testing.T) {
 											EndPos:    3461,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 162,
+													EndLine:   162,
+													StartPos:  3458,
+													EndPos:    3461,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 162,
+											EndLine:   162,
+											StartPos:  3465,
+											EndPos:    3468,
+										},
+									},
+									Value: []byte("bar"),
 								},
 							},
 						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 162,
-									EndLine:   162,
-									StartPos:  3465,
-									EndPos:    3468,
-								},
-							},
-							Value: []byte("bar"),
-						},
 					},
 				},
 			},
diff --git a/internal/php7/parser_test.go b/internal/php7/parser_test.go
index 47a0eca..22f0676 100644
--- a/internal/php7/parser_test.go
+++ b/internal/php7/parser_test.go
@@ -12422,7 +12422,7 @@ func TestStmtUse(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -12431,17 +12431,17 @@ func TestStmtUse(t *testing.T) {
 						EndPos:    11,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  7,
-								EndPos:    10,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    10,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
@@ -12450,17 +12450,27 @@ func TestStmtUse(t *testing.T) {
 									EndPos:    10,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  7,
-											EndPos:    10,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  7,
+										EndPos:    10,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  7,
+												EndPos:    10,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
@@ -12490,7 +12500,7 @@ func TestStmtUse_FullyQualified(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -12499,17 +12509,17 @@ func TestStmtUse_FullyQualified(t *testing.T) {
 						EndPos:    12,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    11,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    11,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
@@ -12518,17 +12528,27 @@ func TestStmtUse_FullyQualified(t *testing.T) {
 									EndPos:    11,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  8,
-											EndPos:    11,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  8,
+										EndPos:    11,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  8,
+												EndPos:    11,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
@@ -12558,7 +12578,7 @@ func TestStmtUse_FullyQualifiedAlias(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -12567,49 +12587,59 @@ func TestStmtUse_FullyQualifiedAlias(t *testing.T) {
 						EndPos:    19,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    18,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    18,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  8,
-									EndPos:    11,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  8,
-											EndPos:    11,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  15,
 									EndPos:    18,
 								},
 							},
-							Value: []byte("Bar"),
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  8,
+										EndPos:    11,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  8,
+												EndPos:    11,
+											},
+										},
+										Value: []byte("Foo"),
+									},
+								},
+							},
+							Alias: &ast.Identifier{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  15,
+										EndPos:    18,
+									},
+								},
+								Value: []byte("Bar"),
+							},
 						},
 					},
 				},
@@ -12637,7 +12667,7 @@ func TestStmtUse_List(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -12646,17 +12676,17 @@ func TestStmtUse_List(t *testing.T) {
 						EndPos:    16,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  7,
-								EndPos:    10,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    15,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
@@ -12665,31 +12695,31 @@ func TestStmtUse_List(t *testing.T) {
 									EndPos:    10,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  7,
-											EndPos:    10,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  7,
+										EndPos:    10,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  7,
+												EndPos:    10,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  12,
-								EndPos:    15,
-							},
-						},
-						Use: &ast.NameName{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
@@ -12698,17 +12728,27 @@ func TestStmtUse_List(t *testing.T) {
 									EndPos:    15,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  12,
-											EndPos:    15,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    15,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  12,
+												EndPos:    15,
+											},
+										},
+										Value: []byte("Bar"),
 									},
-									Value: []byte("Bar"),
 								},
 							},
 						},
@@ -12738,7 +12778,7 @@ func TestStmtUse_ListAlias(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -12747,17 +12787,17 @@ func TestStmtUse_ListAlias(t *testing.T) {
 						EndPos:    23,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  7,
-								EndPos:    10,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    22,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
@@ -12766,63 +12806,73 @@ func TestStmtUse_ListAlias(t *testing.T) {
 									EndPos:    10,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  7,
-											EndPos:    10,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  7,
+										EndPos:    10,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  7,
+												EndPos:    10,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  12,
-								EndPos:    22,
-							},
-						},
-						Use: &ast.NameName{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  12,
-									EndPos:    15,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  12,
-											EndPos:    15,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  19,
 									EndPos:    22,
 								},
 							},
-							Value: []byte("Baz"),
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    15,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  12,
+												EndPos:    15,
+											},
+										},
+										Value: []byte("Bar"),
+									},
+								},
+							},
+							Alias: &ast.Identifier{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  19,
+										EndPos:    22,
+									},
+								},
+								Value: []byte("Baz"),
+							},
 						},
 					},
 				},
@@ -12850,7 +12900,7 @@ func TestStmtUse_ListFunctionType(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -12859,38 +12909,46 @@ func TestStmtUse_ListFunctionType(t *testing.T) {
 						EndPos:    26,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
-							EndPos:    15,
+							EndPos:    25,
 						},
 					},
-					Value: []byte("function"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    15,
+							},
+						},
+						Value: []byte("function"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  16,
-								EndPos:    19,
+								EndPos:    25,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  16,
-									EndPos:    19,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  16,
+										EndPos:    19,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -12899,31 +12957,31 @@ func TestStmtUse_ListFunctionType(t *testing.T) {
 											EndPos:    19,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  16,
+													EndPos:    19,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  22,
-								EndPos:    25,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  22,
-									EndPos:    25,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  22,
+										EndPos:    25,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -12932,7 +12990,19 @@ func TestStmtUse_ListFunctionType(t *testing.T) {
 											EndPos:    25,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  22,
+													EndPos:    25,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
 								},
 							},
 						},
@@ -12962,7 +13032,7 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -12971,38 +13041,46 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) {
 						EndPos:    40,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
-							EndPos:    15,
+							EndPos:    39,
 						},
 					},
-					Value: []byte("function"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    15,
+							},
+						},
+						Value: []byte("function"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  16,
-								EndPos:    26,
+								EndPos:    39,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  16,
-									EndPos:    19,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  16,
+										EndPos:    26,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13011,42 +13089,42 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) {
 											EndPos:    19,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  16,
+													EndPos:    19,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  23,
+											EndPos:    26,
+										},
+									},
+									Value: []byte("foo"),
 								},
 							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  23,
-									EndPos:    26,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  29,
+										EndPos:    39,
+									},
 								},
-							},
-							Value: []byte("foo"),
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  29,
-								EndPos:    39,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  29,
-									EndPos:    32,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13055,21 +13133,33 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) {
 											EndPos:    32,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  29,
+													EndPos:    32,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  36,
+											EndPos:    39,
+										},
+									},
+									Value: []byte("bar"),
 								},
 							},
 						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  36,
-									EndPos:    39,
-								},
-							},
-							Value: []byte("bar"),
-						},
 					},
 				},
 			},
@@ -13096,7 +13186,7 @@ func TestStmtUse_ListConstType(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -13105,38 +13195,47 @@ func TestStmtUse_ListConstType(t *testing.T) {
 						EndPos:    23,
 					},
 				},
-				UseType: &ast.Identifier{
+
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
-							EndPos:    12,
+							EndPos:    22,
 						},
 					},
-					Value: []byte("const"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    12,
+							},
+						},
+						Value: []byte("const"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  13,
-								EndPos:    16,
+								EndPos:    22,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  13,
-									EndPos:    16,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  13,
+										EndPos:    16,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13145,31 +13244,31 @@ func TestStmtUse_ListConstType(t *testing.T) {
 											EndPos:    16,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  13,
+													EndPos:    16,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  19,
-								EndPos:    22,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  19,
-									EndPos:    22,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  19,
+										EndPos:    22,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13178,7 +13277,19 @@ func TestStmtUse_ListConstType(t *testing.T) {
 											EndPos:    22,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  19,
+													EndPos:    22,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
 								},
 							},
 						},
@@ -13208,7 +13319,7 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -13217,38 +13328,46 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) {
 						EndPos:    37,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
-							EndPos:    12,
+							EndPos:    36,
 						},
 					},
-					Value: []byte("const"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    12,
+							},
+						},
+						Value: []byte("const"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  13,
-								EndPos:    23,
+								EndPos:    36,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  13,
-									EndPos:    16,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  13,
+										EndPos:    23,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13257,42 +13376,42 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) {
 											EndPos:    16,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  13,
+													EndPos:    16,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  20,
+											EndPos:    23,
+										},
+									},
+									Value: []byte("foo"),
 								},
 							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  20,
-									EndPos:    23,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  26,
+										EndPos:    36,
+									},
 								},
-							},
-							Value: []byte("foo"),
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  26,
-								EndPos:    36,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  26,
-									EndPos:    29,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13301,21 +13420,33 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) {
 											EndPos:    29,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  26,
+													EndPos:    29,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  33,
+											EndPos:    36,
+										},
+									},
+									Value: []byte("bar"),
 								},
 							},
 						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  33,
-									EndPos:    36,
-								},
-							},
-							Value: []byte("bar"),
-						},
 					},
 				},
 			},
@@ -13342,7 +13473,7 @@ func TestStmtUse_GroupUse(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtGroupUse{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -13351,50 +13482,58 @@ func TestStmtUse_GroupUse(t *testing.T) {
 						EndPos:    22,
 					},
 				},
-				Prefix: &ast.NameName{
+				UseList: &ast.StmtGroupUseList{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
-							EndPos:    10,
+							EndPos:    21,
 						},
 					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  7,
-									EndPos:    10,
-								},
+					Prefix: &ast.NameName{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    10,
+							},
+						},
+						Parts: []ast.Vertex{
+							&ast.NameNamePart{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  7,
+										EndPos:    10,
+									},
+								},
+								Value: []byte("Foo"),
 							},
-							Value: []byte("Foo"),
 						},
 					},
-				},
-				UseList: []ast.Vertex{
-					&ast.StmtUse{
+					UseList: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  12,
-								EndPos:    15,
+								EndPos:    20,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  12,
-									EndPos:    15,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    15,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13403,31 +13542,31 @@ func TestStmtUse_GroupUse(t *testing.T) {
 											EndPos:    15,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  12,
+													EndPos:    15,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  17,
-								EndPos:    20,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  17,
-									EndPos:    20,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    20,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13436,7 +13575,19 @@ func TestStmtUse_GroupUse(t *testing.T) {
 											EndPos:    20,
 										},
 									},
-									Value: []byte("Baz"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  17,
+													EndPos:    20,
+												},
+											},
+											Value: []byte("Baz"),
+										},
+									},
 								},
 							},
 						},
@@ -13466,7 +13617,7 @@ func TestStmtUse_GroupUseAlias(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtGroupUse{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -13475,50 +13626,58 @@ func TestStmtUse_GroupUseAlias(t *testing.T) {
 						EndPos:    30,
 					},
 				},
-				Prefix: &ast.NameName{
+				UseList: &ast.StmtGroupUseList{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
-							EndPos:    10,
+							EndPos:    29,
 						},
 					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  7,
-									EndPos:    10,
-								},
+					Prefix: &ast.NameName{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    10,
+							},
+						},
+						Parts: []ast.Vertex{
+							&ast.NameNamePart{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  7,
+										EndPos:    10,
+									},
+								},
+								Value: []byte("Foo"),
 							},
-							Value: []byte("Foo"),
 						},
 					},
-				},
-				UseList: []ast.Vertex{
-					&ast.StmtUse{
+					UseList: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  12,
-								EndPos:    15,
+								EndPos:    28,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  12,
-									EndPos:    15,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    15,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13527,31 +13686,31 @@ func TestStmtUse_GroupUseAlias(t *testing.T) {
 											EndPos:    15,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  12,
+													EndPos:    15,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  17,
-								EndPos:    28,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  17,
-									EndPos:    20,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    28,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13560,21 +13719,33 @@ func TestStmtUse_GroupUseAlias(t *testing.T) {
 											EndPos:    20,
 										},
 									},
-									Value: []byte("Baz"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  17,
+													EndPos:    20,
+												},
+											},
+											Value: []byte("Baz"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  24,
+											EndPos:    28,
+										},
+									},
+									Value: []byte("quux"),
 								},
 							},
 						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  24,
-									EndPos:    28,
-								},
-							},
-							Value: []byte("quux"),
-						},
 					},
 				},
 			},
@@ -13601,7 +13772,7 @@ func TestStmtUse_FunctionGroupUse(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtGroupUse{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -13610,28 +13781,36 @@ func TestStmtUse_FunctionGroupUse(t *testing.T) {
 						EndPos:    31,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
-							EndPos:    15,
+							EndPos:    30,
 						},
 					},
-					Value: []byte("function"),
-				},
-				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  16,
-							EndPos:    19,
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    15,
+							},
 						},
+						Value: []byte("function"),
 					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
+					Use: &ast.StmtGroupUseList{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    30,
+							},
+						},
+						Prefix: &ast.NameName{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
@@ -13640,31 +13819,31 @@ func TestStmtUse_FunctionGroupUse(t *testing.T) {
 									EndPos:    19,
 								},
 							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-				UseList: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  21,
-								EndPos:    24,
+							Parts: []ast.Vertex{
+								&ast.NameNamePart{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  16,
+											EndPos:    19,
+										},
+									},
+									Value: []byte("Foo"),
+								},
 							},
 						},
-						Use: &ast.NameName{
+						UseList: &ast.StmtUseList{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  21,
-									EndPos:    24,
+									EndPos:    29,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+							UseDeclarations: []ast.Vertex{
+								&ast.StmtUseDeclaration{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13673,31 +13852,31 @@ func TestStmtUse_FunctionGroupUse(t *testing.T) {
 											EndPos:    24,
 										},
 									},
-									Value: []byte("Bar"),
+									Use: &ast.NameName{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  21,
+												EndPos:    24,
+											},
+										},
+										Parts: []ast.Vertex{
+											&ast.NameNamePart{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  21,
+														EndPos:    24,
+													},
+												},
+												Value: []byte("Bar"),
+											},
+										},
+									},
 								},
-							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  26,
-								EndPos:    29,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  26,
-									EndPos:    29,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								&ast.StmtUseDeclaration{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13706,7 +13885,29 @@ func TestStmtUse_FunctionGroupUse(t *testing.T) {
 											EndPos:    29,
 										},
 									},
-									Value: []byte("Baz"),
+									Use: &ast.NameName{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  26,
+												EndPos:    29,
+											},
+										},
+										Parts: []ast.Vertex{
+											&ast.NameNamePart{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  26,
+														EndPos:    29,
+													},
+												},
+												Value: []byte("Baz"),
+											},
+										},
+									},
 								},
 							},
 						},
@@ -13736,7 +13937,7 @@ func TestStmtUse_ConstGroupUse(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtGroupUse{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -13745,28 +13946,36 @@ func TestStmtUse_ConstGroupUse(t *testing.T) {
 						EndPos:    28,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
-							EndPos:    12,
+							EndPos:    27,
 						},
 					},
-					Value: []byte("const"),
-				},
-				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  13,
-							EndPos:    16,
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    12,
+							},
 						},
+						Value: []byte("const"),
 					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
+					Use: &ast.StmtGroupUseList{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    27,
+							},
+						},
+						Prefix: &ast.NameName{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
@@ -13775,31 +13984,31 @@ func TestStmtUse_ConstGroupUse(t *testing.T) {
 									EndPos:    16,
 								},
 							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-				UseList: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  18,
-								EndPos:    21,
+							Parts: []ast.Vertex{
+								&ast.NameNamePart{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  13,
+											EndPos:    16,
+										},
+									},
+									Value: []byte("Foo"),
+								},
 							},
 						},
-						Use: &ast.NameName{
+						UseList: &ast.StmtUseList{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  18,
-									EndPos:    21,
+									EndPos:    26,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+							UseDeclarations: []ast.Vertex{
+								&ast.StmtUseDeclaration{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13808,31 +14017,31 @@ func TestStmtUse_ConstGroupUse(t *testing.T) {
 											EndPos:    21,
 										},
 									},
-									Value: []byte("Bar"),
+									Use: &ast.NameName{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  18,
+												EndPos:    21,
+											},
+										},
+										Parts: []ast.Vertex{
+											&ast.NameNamePart{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  18,
+														EndPos:    21,
+													},
+												},
+												Value: []byte("Bar"),
+											},
+										},
+									},
 								},
-							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  23,
-								EndPos:    26,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  23,
-									EndPos:    26,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								&ast.StmtUseDeclaration{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13841,7 +14050,29 @@ func TestStmtUse_ConstGroupUse(t *testing.T) {
 											EndPos:    26,
 										},
 									},
-									Value: []byte("Baz"),
+									Use: &ast.NameName{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  23,
+												EndPos:    26,
+											},
+										},
+										Parts: []ast.Vertex{
+											&ast.NameNamePart{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  23,
+														EndPos:    26,
+													},
+												},
+												Value: []byte("Baz"),
+											},
+										},
+									},
 								},
 							},
 						},
@@ -13871,7 +14102,7 @@ func TestStmtUse_MixedGroupUse(t *testing.T) {
 			},
 		},
 		Stmts: []ast.Vertex{
-			&ast.StmtGroupUse{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 1,
@@ -13880,61 +14111,69 @@ func TestStmtUse_MixedGroupUse(t *testing.T) {
 						EndPos:    37,
 					},
 				},
-				Prefix: &ast.NameName{
+				UseList: &ast.StmtGroupUseList{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
-							EndPos:    10,
+							EndPos:    36,
 						},
 					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  7,
-									EndPos:    10,
-								},
-							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-				UseList: []ast.Vertex{
-					&ast.StmtUse{
+					Prefix: &ast.NameName{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
-								StartPos:  18,
-								EndPos:    21,
+								StartPos:  7,
+								EndPos:    10,
 							},
 						},
-						UseType: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  12,
-									EndPos:    17,
+						Parts: []ast.Vertex{
+							&ast.NameNamePart{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  7,
+										EndPos:    10,
+									},
 								},
+								Value: []byte("Foo"),
 							},
-							Value: []byte("const"),
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  18,
-									EndPos:    21,
-								},
+					},
+					UseList: &ast.StmtUseList{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    35,
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+						},
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseType{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    21,
+									},
+								},
+								Type: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  12,
+											EndPos:    17,
+										},
+									},
+									Value: []byte("const"),
+								},
+								Use: &ast.StmtUseDeclaration{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13943,42 +14182,52 @@ func TestStmtUse_MixedGroupUse(t *testing.T) {
 											EndPos:    21,
 										},
 									},
-									Value: []byte("Bar"),
+									Use: &ast.NameName{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  18,
+												EndPos:    21,
+											},
+										},
+										Parts: []ast.Vertex{
+											&ast.NameNamePart{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  18,
+														EndPos:    21,
+													},
+												},
+												Value: []byte("Bar"),
+											},
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  32,
-								EndPos:    35,
-							},
-						},
-						UseType: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  23,
-									EndPos:    31,
+							&ast.StmtUseType{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  23,
+										EndPos:    35,
+									},
 								},
-							},
-							Value: []byte("function"),
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  32,
-									EndPos:    35,
+								Type: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  23,
+											EndPos:    31,
+										},
+									},
+									Value: []byte("function"),
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.StmtUseDeclaration{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 1,
@@ -13987,7 +14236,29 @@ func TestStmtUse_MixedGroupUse(t *testing.T) {
 											EndPos:    35,
 										},
 									},
-									Value: []byte("Baz"),
+									Use: &ast.NameName{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  32,
+												EndPos:    35,
+											},
+										},
+										Parts: []ast.Vertex{
+											&ast.NameNamePart{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  32,
+														EndPos:    35,
+													},
+												},
+												Value: []byte("Baz"),
+											},
+										},
+									},
 								},
 							},
 						},
diff --git a/internal/php7/php7.go b/internal/php7/php7.go
index e54c1a76bfc3d00ccdaa38d36a084062b596e527..33a3f5ef54ebc6ca6100e517ad066275e74f3b6d 100644
GIT binary patch
delta 7409
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
Um-iOE?g4!HGJLr7?dFR87m`@cN&o-=

delta 7271
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
HPTYS1j1Ay_

diff --git a/internal/php7/php7.y b/internal/php7/php7.y
index c65b0f9..752de40 100644
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -528,58 +528,61 @@ top_statement:
             }
     |   T_USE mixed_group_use_declaration ';'
             {
-                $$ = $2
+                $$ = &ast.StmtUse{ast.Node{}, $2}
 
                 // save position
                 $$.GetNode().Position = position.NewTokensPosition($1, $3)
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $3.Tokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $3.Tokens)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.Tokens)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
     |   T_USE use_type group_use_declaration ';'
             {
-                $3.(*ast.StmtGroupUse).UseType = $2
-                $$ = $3
+                useType := &ast.StmtUseType{ast.Node{}, $2, $3}
+                $$ = &ast.StmtUse{ast.Node{}, useType}
 
                 // save position
+                useType.GetNode().Position = position.NewNodesPosition($2, $3)
                 $$.GetNode().Position = position.NewTokensPosition($1, $4)
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $4.Tokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $4.Tokens)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.End, $4.Tokens)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
     |   T_USE use_declarations ';'
             {
-                $$ = &ast.StmtUseList{ast.Node{}, nil, $2}
+                useList := &ast.StmtUseList{ast.Node{}, $2}
+                $$ = &ast.StmtUse{ast.Node{}, useList}
 
                 // save position
+                useList.GetNode().Position = position.NewNodeListPosition($2)
                 $$.GetNode().Position = position.NewTokensPosition($1, $3)
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $3.Tokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $3.Tokens)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.Tokens)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
     |   T_USE use_type use_declarations ';'
             {
-                $$ = &ast.StmtUseList{ast.Node{}, $2, $3}
+                useList := &ast.StmtUseList{ast.Node{}, $3}
+                useType := &ast.StmtUseType{ast.Node{}, $2, useList}
+                $$ = &ast.StmtUse{ast.Node{}, useType}
 
                 // save position
+                useList.GetNode().Position = position.NewNodeListPosition($3)
+                useType.GetNode().Position = position.NewNodesPosition($2, useList)
                 $$.GetNode().Position = position.NewTokensPosition($1, $4)
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $4.Tokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $4.Tokens)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.End, $4.Tokens)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -630,20 +633,20 @@ group_use_declaration:
         namespace_name T_NS_SEPARATOR '{' unprefixed_use_declarations possible_comma '}'
             {
                 name := &ast.NameName{ast.Node{}, $1}
-                $$ = &ast.StmtGroupUse{ast.Node{}, nil, name, $4}
+                useList := &ast.StmtUseList{ast.Node{}, $4}
+                $$ = &ast.StmtGroupUseList{ast.Node{}, name, useList}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($1)
+                useList.GetNode().Position = position.NewNodeListPosition($4)
                 $$.GetNode().Position = position.NewNodeListTokenPosition($1, $6)
 
                 // save comments
-                yylex.(*Parser).MoveFreeFloating($1[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Slash, $3.Tokens)
+                yylex.(*Parser).setFreeFloatingTokens(useList, token.Start, append($2.Tokens, $3.Tokens...))
                 if $5 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, append($5.Tokens, $6.Tokens...))
+                    yylex.(*Parser).setFreeFloatingTokens(useList, token.End, append($5.Tokens, $6.Tokens...))
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, $6.Tokens)
+                    yylex.(*Parser).setFreeFloating(useList, token.End, $6.Tokens)
                 }
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -651,22 +654,22 @@ group_use_declaration:
     |   T_NS_SEPARATOR namespace_name T_NS_SEPARATOR '{' unprefixed_use_declarations possible_comma '}'
             {
                 name := &ast.NameName{ast.Node{}, $2}
-                $$ = &ast.StmtGroupUse{ast.Node{}, nil, name, $5}
+                useList := &ast.StmtUseList{ast.Node{}, $5}
+                $$ = &ast.StmtGroupUseList{ast.Node{}, name, useList}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($2)
+                useList.GetNode().Position = position.NewNodeListPosition($5)
                 $$.GetNode().Position = position.NewTokensPosition($1, $7)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.UseType, $1.Tokens)
-                yylex.(*Parser).MoveFreeFloating($2[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Slash, $4.Tokens)
+                yylex.(*Parser).setFreeFloatingTokens(useList, token.Start, append($3.Tokens, $4.Tokens...))
                 if $6 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, append($6.Tokens, $7.Tokens...))
+                    yylex.(*Parser).setFreeFloatingTokens(useList, token.End, append($6.Tokens, $7.Tokens...))
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Tokens)
+                    yylex.(*Parser).setFreeFloating(useList, token.End, $7.Tokens)
                 }
+                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.Tokens)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -676,20 +679,20 @@ mixed_group_use_declaration:
         namespace_name T_NS_SEPARATOR '{' inline_use_declarations possible_comma '}'
             {
                 name := &ast.NameName{ast.Node{}, $1}
-                $$ = &ast.StmtGroupUse{ast.Node{}, nil, name, $4}
+                useList := &ast.StmtUseList{ast.Node{}, $4}
+                $$ = &ast.StmtGroupUseList{ast.Node{}, name, useList}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($1)
+                useList.GetNode().Position = position.NewNodeListPosition($4)
                 $$.GetNode().Position = position.NewNodeListTokenPosition($1, $6)
 
                 // save comments
-                yylex.(*Parser).MoveFreeFloating($1[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Slash, $3.Tokens)
+                yylex.(*Parser).setFreeFloatingTokens(useList, token.Start, append($2.Tokens, $3.Tokens...))
                 if $5 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, append($5.Tokens, $6.Tokens...))
+                    yylex.(*Parser).setFreeFloatingTokens(useList, token.End, append($5.Tokens, $6.Tokens...))
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, $6.Tokens)
+                    yylex.(*Parser).setFreeFloatingTokens(useList, token.End, $6.Tokens)
                 }
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -697,22 +700,22 @@ mixed_group_use_declaration:
     |   T_NS_SEPARATOR namespace_name T_NS_SEPARATOR '{' inline_use_declarations possible_comma '}'
             {
                 name := &ast.NameName{ast.Node{}, $2}
-                $$ = &ast.StmtGroupUse{ast.Node{}, nil, name, $5}
+                useList := &ast.StmtUseList{ast.Node{}, $5}
+                $$ = &ast.StmtGroupUseList{ast.Node{}, name, useList}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($2)
+                useList.GetNode().Position = position.NewNodeListPosition($5)
                 $$.GetNode().Position = position.NewTokensPosition($1, $7)
 
                 // save comments
-                yylex.(*Parser).setFreeFloatingTokens($$, token.Use, $1.Tokens)
-                yylex.(*Parser).MoveFreeFloating($2[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Slash, $4.Tokens)
+                yylex.(*Parser).setFreeFloatingTokens(useList, token.Start, append($3.Tokens, $4.Tokens...))
                 if $6 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, append($6.Tokens, $7.Tokens...))
+                    yylex.(*Parser).setFreeFloatingTokens(useList, token.End, append($6.Tokens, $7.Tokens...))
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Tokens)
+                    yylex.(*Parser).setFreeFloating(useList, token.End, $7.Tokens)
                 }
+                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.Tokens)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -792,8 +795,10 @@ inline_use_declaration:
             }
     |   use_type unprefixed_use_declaration
             {
-                $2.(*ast.StmtUse).UseType = $1
-                $$ = $2
+                $$ = &ast.StmtUseType{ast.Node{}, $1, $2}
+
+                // save position
+                $$.GetNode().Position = position.NewNodesPosition($1, $2)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -803,14 +808,11 @@ unprefixed_use_declaration:
         namespace_name
             {
                 name := &ast.NameName{ast.Node{}, $1}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, nil}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, nil}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($1)
-                $$.GetNode().Position = position.NewNodeListPosition($1)
-
-                // save comments
-                yylex.(*Parser).MoveFreeFloating($1[0], name)
+                $$.GetNode().Position = position.NewNodePosition(name)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -818,7 +820,7 @@ unprefixed_use_declaration:
             {
                 name := &ast.NameName{ast.Node{}, $1}
                 alias := &ast.Identifier{ast.Node{}, $3.Value}
-                $$ = &ast.StmtUse{ast.Node{}, nil, name, alias}
+                $$ = &ast.StmtUseDeclaration{ast.Node{}, name, alias}
 
                 // save position
                 name.GetNode().Position = position.NewNodeListPosition($1)
@@ -826,7 +828,6 @@ unprefixed_use_declaration:
                 $$.GetNode().Position = position.NewNodeListTokenPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).MoveFreeFloating($1[0], name)
                 yylex.(*Parser).setFreeFloating(name, token.End, $2.Tokens)
                 yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Tokens)
 
@@ -839,9 +840,6 @@ use_declaration:
             {
                 $$ = $1
 
-                // save coments
-                yylex.(*Parser).MoveFreeFloating($1.(*ast.StmtUse).Use, $$)
-
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
     |   T_NS_SEPARATOR unprefixed_use_declaration
@@ -849,8 +847,7 @@ use_declaration:
                 $$ = $2;
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setToken($$, token.Slash, $1.Tokens)
+                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.Tokens)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
diff --git a/internal/php7/php7_test.go b/internal/php7/php7_test.go
index 88589ee..27e217a 100644
--- a/internal/php7/php7_test.go
+++ b/internal/php7/php7_test.go
@@ -9013,7 +9013,7 @@ func TestPhp7(t *testing.T) {
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 161,
@@ -9022,17 +9022,17 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3370,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 161,
-								EndLine:   161,
-								StartPos:  3366,
-								EndPos:    3369,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 161,
+							EndLine:   161,
+							StartPos:  3366,
+							EndPos:    3369,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 161,
@@ -9041,24 +9041,34 @@ func TestPhp7(t *testing.T) {
 									EndPos:    3369,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 161,
-											EndLine:   161,
-											StartPos:  3366,
-											EndPos:    3369,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 161,
+										EndLine:   161,
+										StartPos:  3366,
+										EndPos:    3369,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 161,
+												EndLine:   161,
+												StartPos:  3366,
+												EndPos:    3369,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 162,
@@ -9067,17 +9077,17 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3380,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 162,
-								EndLine:   162,
-								StartPos:  3376,
-								EndPos:    3379,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 162,
+							EndLine:   162,
+							StartPos:  3376,
+							EndPos:    3379,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 162,
@@ -9086,24 +9096,34 @@ func TestPhp7(t *testing.T) {
 									EndPos:    3379,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 162,
-											EndLine:   162,
-											StartPos:  3376,
-											EndPos:    3379,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 162,
+										EndLine:   162,
+										StartPos:  3376,
+										EndPos:    3379,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 162,
+												EndLine:   162,
+												StartPos:  3376,
+												EndPos:    3379,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 163,
@@ -9112,54 +9132,64 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3397,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 163,
-								EndLine:   163,
-								StartPos:  3386,
-								EndPos:    3396,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 163,
+							EndLine:   163,
+							StartPos:  3386,
+							EndPos:    3396,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 163,
 									EndLine:   163,
 									StartPos:  3386,
-									EndPos:    3389,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 163,
-											EndLine:   163,
-											StartPos:  3386,
-											EndPos:    3389,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 163,
-									EndLine:   163,
-									StartPos:  3393,
 									EndPos:    3396,
 								},
 							},
-							Value: []byte("Bar"),
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 163,
+										EndLine:   163,
+										StartPos:  3386,
+										EndPos:    3389,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 163,
+												EndLine:   163,
+												StartPos:  3386,
+												EndPos:    3389,
+											},
+										},
+										Value: []byte("Foo"),
+									},
+								},
+							},
+							Alias: &ast.Identifier{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 163,
+										EndLine:   163,
+										StartPos:  3393,
+										EndPos:    3396,
+									},
+								},
+								Value: []byte("Bar"),
+							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 164,
@@ -9168,17 +9198,17 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3411,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 164,
-								EndLine:   164,
-								StartPos:  3402,
-								EndPos:    3405,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 164,
+							EndLine:   164,
+							StartPos:  3402,
+							EndPos:    3410,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 164,
@@ -9187,31 +9217,31 @@ func TestPhp7(t *testing.T) {
 									EndPos:    3405,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 164,
-											EndLine:   164,
-											StartPos:  3402,
-											EndPos:    3405,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 164,
+										EndLine:   164,
+										StartPos:  3402,
+										EndPos:    3405,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 164,
+												EndLine:   164,
+												StartPos:  3402,
+												EndPos:    3405,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 164,
-								EndLine:   164,
-								StartPos:  3407,
-								EndPos:    3410,
-							},
-						},
-						Use: &ast.NameName{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 164,
@@ -9220,24 +9250,34 @@ func TestPhp7(t *testing.T) {
 									EndPos:    3410,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 164,
-											EndLine:   164,
-											StartPos:  3407,
-											EndPos:    3410,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 164,
+										EndLine:   164,
+										StartPos:  3407,
+										EndPos:    3410,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 164,
+												EndLine:   164,
+												StartPos:  3407,
+												EndPos:    3410,
+											},
+										},
+										Value: []byte("Bar"),
 									},
-									Value: []byte("Bar"),
 								},
 							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 165,
@@ -9246,17 +9286,17 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3432,
 					},
 				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 165,
-								EndLine:   165,
-								StartPos:  3416,
-								EndPos:    3419,
-							},
+				UseList: &ast.StmtUseList{
+					Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 165,
+							EndLine:   165,
+							StartPos:  3416,
+							EndPos:    3431,
 						},
-						Use: &ast.NameName{
+					},
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 165,
@@ -9265,68 +9305,78 @@ func TestPhp7(t *testing.T) {
 									EndPos:    3419,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 165,
-											EndLine:   165,
-											StartPos:  3416,
-											EndPos:    3419,
-										},
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 165,
+										EndLine:   165,
+										StartPos:  3416,
+										EndPos:    3419,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 165,
+												EndLine:   165,
+												StartPos:  3416,
+												EndPos:    3419,
+											},
+										},
+										Value: []byte("Foo"),
 									},
-									Value: []byte("Foo"),
 								},
 							},
 						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 165,
-								EndLine:   165,
-								StartPos:  3421,
-								EndPos:    3431,
-							},
-						},
-						Use: &ast.NameName{
+						&ast.StmtUseDeclaration{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 165,
 									EndLine:   165,
 									StartPos:  3421,
-									EndPos:    3424,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 165,
-											EndLine:   165,
-											StartPos:  3421,
-											EndPos:    3424,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 165,
-									EndLine:   165,
-									StartPos:  3428,
 									EndPos:    3431,
 								},
 							},
-							Value: []byte("Baz"),
+							Use: &ast.NameName{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 165,
+										EndLine:   165,
+										StartPos:  3421,
+										EndPos:    3424,
+									},
+								},
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 165,
+												EndLine:   165,
+												StartPos:  3421,
+												EndPos:    3424,
+											},
+										},
+										Value: []byte("Bar"),
+									},
+								},
+							},
+							Alias: &ast.Identifier{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 165,
+										EndLine:   165,
+										StartPos:  3428,
+										EndPos:    3431,
+									},
+								},
+								Value: []byte("Baz"),
+							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 166,
@@ -9335,38 +9385,46 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3456,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 166,
 							EndLine:   166,
 							StartPos:  3437,
-							EndPos:    3445,
+							EndPos:    3455,
 						},
 					},
-					Value: []byte("function"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 166,
+								EndLine:   166,
+								StartPos:  3437,
+								EndPos:    3445,
+							},
+						},
+						Value: []byte("function"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 166,
 								EndLine:   166,
 								StartPos:  3446,
-								EndPos:    3449,
+								EndPos:    3455,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 166,
-									EndLine:   166,
-									StartPos:  3446,
-									EndPos:    3449,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 166,
+										EndLine:   166,
+										StartPos:  3446,
+										EndPos:    3449,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 166,
@@ -9375,31 +9433,31 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3449,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 166,
+													EndLine:   166,
+													StartPos:  3446,
+													EndPos:    3449,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 166,
-								EndLine:   166,
-								StartPos:  3452,
-								EndPos:    3455,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 166,
-									EndLine:   166,
-									StartPos:  3452,
-									EndPos:    3455,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 166,
+										EndLine:   166,
+										StartPos:  3452,
+										EndPos:    3455,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 166,
@@ -9408,14 +9466,26 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3455,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 166,
+													EndLine:   166,
+													StartPos:  3452,
+													EndPos:    3455,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
 								},
 							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 167,
@@ -9424,38 +9494,46 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3494,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 167,
 							EndLine:   167,
 							StartPos:  3461,
-							EndPos:    3469,
+							EndPos:    3493,
 						},
 					},
-					Value: []byte("function"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 167,
+								EndLine:   167,
+								StartPos:  3461,
+								EndPos:    3469,
+							},
+						},
+						Value: []byte("function"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 167,
 								EndLine:   167,
 								StartPos:  3470,
-								EndPos:    3480,
+								EndPos:    3493,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 167,
-									EndLine:   167,
-									StartPos:  3470,
-									EndPos:    3473,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 167,
+										EndLine:   167,
+										StartPos:  3470,
+										EndPos:    3480,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 167,
@@ -9464,42 +9542,42 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3473,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 167,
+													EndLine:   167,
+													StartPos:  3470,
+													EndPos:    3473,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 167,
+											EndLine:   167,
+											StartPos:  3477,
+											EndPos:    3480,
+										},
+									},
+									Value: []byte("foo"),
 								},
 							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 167,
-									EndLine:   167,
-									StartPos:  3477,
-									EndPos:    3480,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 167,
+										EndLine:   167,
+										StartPos:  3483,
+										EndPos:    3493,
+									},
 								},
-							},
-							Value: []byte("foo"),
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 167,
-								EndLine:   167,
-								StartPos:  3483,
-								EndPos:    3493,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 167,
-									EndLine:   167,
-									StartPos:  3483,
-									EndPos:    3486,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 167,
@@ -9508,25 +9586,37 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3486,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 167,
+													EndLine:   167,
+													StartPos:  3483,
+													EndPos:    3486,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 167,
+											EndLine:   167,
+											StartPos:  3490,
+											EndPos:    3493,
+										},
+									},
+									Value: []byte("bar"),
 								},
 							},
 						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 167,
-									EndLine:   167,
-									StartPos:  3490,
-									EndPos:    3493,
-								},
-							},
-							Value: []byte("bar"),
-						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 168,
@@ -9535,38 +9625,46 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3515,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 168,
 							EndLine:   168,
 							StartPos:  3499,
-							EndPos:    3504,
+							EndPos:    3514,
 						},
 					},
-					Value: []byte("const"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 168,
+								EndLine:   168,
+								StartPos:  3499,
+								EndPos:    3504,
+							},
+						},
+						Value: []byte("const"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 168,
 								EndLine:   168,
 								StartPos:  3505,
-								EndPos:    3508,
+								EndPos:    3514,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 168,
-									EndLine:   168,
-									StartPos:  3505,
-									EndPos:    3508,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 168,
+										EndLine:   168,
+										StartPos:  3505,
+										EndPos:    3508,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 168,
@@ -9575,31 +9673,31 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3508,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 168,
+													EndLine:   168,
+													StartPos:  3505,
+													EndPos:    3508,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 168,
-								EndLine:   168,
-								StartPos:  3511,
-								EndPos:    3514,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 168,
-									EndLine:   168,
-									StartPos:  3511,
-									EndPos:    3514,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 168,
+										EndLine:   168,
+										StartPos:  3511,
+										EndPos:    3514,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 168,
@@ -9608,14 +9706,26 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3514,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 168,
+													EndLine:   168,
+													StartPos:  3511,
+													EndPos:    3514,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
 								},
 							},
 						},
 					},
 				},
 			},
-			&ast.StmtUseList{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 169,
@@ -9624,38 +9734,46 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3550,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 169,
 							EndLine:   169,
 							StartPos:  3520,
-							EndPos:    3525,
+							EndPos:    3549,
 						},
 					},
-					Value: []byte("const"),
-				},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 169,
+								EndLine:   169,
+								StartPos:  3520,
+								EndPos:    3525,
+							},
+						},
+						Value: []byte("const"),
+					},
+					Use: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 169,
 								EndLine:   169,
 								StartPos:  3526,
-								EndPos:    3536,
+								EndPos:    3549,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 169,
-									EndLine:   169,
-									StartPos:  3526,
-									EndPos:    3529,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 169,
+										EndLine:   169,
+										StartPos:  3526,
+										EndPos:    3536,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 169,
@@ -9664,42 +9782,42 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3529,
 										},
 									},
-									Value: []byte("Foo"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 169,
+													EndLine:   169,
+													StartPos:  3526,
+													EndPos:    3529,
+												},
+											},
+											Value: []byte("Foo"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 169,
+											EndLine:   169,
+											StartPos:  3533,
+											EndPos:    3536,
+										},
+									},
+									Value: []byte("foo"),
 								},
 							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 169,
-									EndLine:   169,
-									StartPos:  3533,
-									EndPos:    3536,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 169,
+										EndLine:   169,
+										StartPos:  3539,
+										EndPos:    3549,
+									},
 								},
-							},
-							Value: []byte("foo"),
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 169,
-								EndLine:   169,
-								StartPos:  3539,
-								EndPos:    3549,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 169,
-									EndLine:   169,
-									StartPos:  3539,
-									EndPos:    3542,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 169,
@@ -9708,25 +9826,37 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3542,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 169,
+													EndLine:   169,
+													StartPos:  3539,
+													EndPos:    3542,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 169,
+											EndLine:   169,
+											StartPos:  3546,
+											EndPos:    3549,
+										},
+									},
+									Value: []byte("bar"),
 								},
 							},
 						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 169,
-									EndLine:   169,
-									StartPos:  3546,
-									EndPos:    3549,
-								},
-							},
-							Value: []byte("bar"),
-						},
 					},
 				},
 			},
-			&ast.StmtGroupUse{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 171,
@@ -9735,50 +9865,58 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3572,
 					},
 				},
-				Prefix: &ast.NameName{
+				UseList: &ast.StmtGroupUseList{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 171,
 							EndLine:   171,
-							StartPos:  3557,
-							EndPos:    3560,
+							StartPos:  3556,
+							EndPos:    3571,
 						},
 					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 171,
-									EndLine:   171,
-									StartPos:  3557,
-									EndPos:    3560,
-								},
+					Prefix: &ast.NameName{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 171,
+								EndLine:   171,
+								StartPos:  3557,
+								EndPos:    3560,
+							},
+						},
+						Parts: []ast.Vertex{
+							&ast.NameNamePart{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 171,
+										EndLine:   171,
+										StartPos:  3557,
+										EndPos:    3560,
+									},
+								},
+								Value: []byte("Foo"),
 							},
-							Value: []byte("Foo"),
 						},
 					},
-				},
-				UseList: []ast.Vertex{
-					&ast.StmtUse{
+					UseList: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 171,
 								EndLine:   171,
 								StartPos:  3562,
-								EndPos:    3565,
+								EndPos:    3570,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 171,
-									EndLine:   171,
-									StartPos:  3562,
-									EndPos:    3565,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 171,
+										EndLine:   171,
+										StartPos:  3562,
+										EndPos:    3565,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 171,
@@ -9787,31 +9925,31 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3565,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 171,
+													EndLine:   171,
+													StartPos:  3562,
+													EndPos:    3565,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 171,
-								EndLine:   171,
-								StartPos:  3567,
-								EndPos:    3570,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 171,
-									EndLine:   171,
-									StartPos:  3567,
-									EndPos:    3570,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 171,
+										EndLine:   171,
+										StartPos:  3567,
+										EndPos:    3570,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 171,
@@ -9820,14 +9958,26 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3570,
 										},
 									},
-									Value: []byte("Baz"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 171,
+													EndLine:   171,
+													StartPos:  3567,
+													EndPos:    3570,
+												},
+											},
+											Value: []byte("Baz"),
+										},
+									},
 								},
 							},
 						},
 					},
 				},
 			},
-			&ast.StmtGroupUse{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 172,
@@ -9836,50 +9986,58 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3600,
 					},
 				},
-				Prefix: &ast.NameName{
+				UseList: &ast.StmtGroupUseList{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 172,
 							EndLine:   172,
 							StartPos:  3577,
-							EndPos:    3580,
+							EndPos:    3599,
 						},
 					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 172,
-									EndLine:   172,
-									StartPos:  3577,
-									EndPos:    3580,
-								},
+					Prefix: &ast.NameName{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 172,
+								EndLine:   172,
+								StartPos:  3577,
+								EndPos:    3580,
+							},
+						},
+						Parts: []ast.Vertex{
+							&ast.NameNamePart{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 172,
+										EndLine:   172,
+										StartPos:  3577,
+										EndPos:    3580,
+									},
+								},
+								Value: []byte("Foo"),
 							},
-							Value: []byte("Foo"),
 						},
 					},
-				},
-				UseList: []ast.Vertex{
-					&ast.StmtUse{
+					UseList: &ast.StmtUseList{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 172,
 								EndLine:   172,
 								StartPos:  3582,
-								EndPos:    3585,
+								EndPos:    3598,
 							},
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 172,
-									EndLine:   172,
-									StartPos:  3582,
-									EndPos:    3585,
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 172,
+										EndLine:   172,
+										StartPos:  3582,
+										EndPos:    3585,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 172,
@@ -9888,31 +10046,31 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3585,
 										},
 									},
-									Value: []byte("Bar"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 172,
+													EndLine:   172,
+													StartPos:  3582,
+													EndPos:    3585,
+												},
+											},
+											Value: []byte("Bar"),
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 172,
-								EndLine:   172,
-								StartPos:  3587,
-								EndPos:    3598,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 172,
-									EndLine:   172,
-									StartPos:  3587,
-									EndPos:    3590,
+							&ast.StmtUseDeclaration{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 172,
+										EndLine:   172,
+										StartPos:  3587,
+										EndPos:    3598,
+									},
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.NameName{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 172,
@@ -9921,25 +10079,37 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3590,
 										},
 									},
-									Value: []byte("Baz"),
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 172,
+													EndLine:   172,
+													StartPos:  3587,
+													EndPos:    3590,
+												},
+											},
+											Value: []byte("Baz"),
+										},
+									},
+								},
+								Alias: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 172,
+											EndLine:   172,
+											StartPos:  3594,
+											EndPos:    3598,
+										},
+									},
+									Value: []byte("quux"),
 								},
 							},
 						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 172,
-									EndLine:   172,
-									StartPos:  3594,
-									EndPos:    3598,
-								},
-							},
-							Value: []byte("quux"),
-						},
 					},
 				},
 			},
-			&ast.StmtGroupUse{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 173,
@@ -9948,28 +10118,36 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3629,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 173,
 							EndLine:   173,
 							StartPos:  3605,
-							EndPos:    3613,
+							EndPos:    3628,
 						},
 					},
-					Value: []byte("function"),
-				},
-				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 173,
-							EndLine:   173,
-							StartPos:  3614,
-							EndPos:    3617,
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 173,
+								EndLine:   173,
+								StartPos:  3605,
+								EndPos:    3613,
+							},
 						},
+						Value: []byte("function"),
 					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
+					Use: &ast.StmtGroupUseList{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 173,
+								EndLine:   173,
+								StartPos:  3614,
+								EndPos:    3628,
+							},
+						},
+						Prefix: &ast.NameName{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 173,
@@ -9978,31 +10156,31 @@ func TestPhp7(t *testing.T) {
 									EndPos:    3617,
 								},
 							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-				UseList: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 173,
-								EndLine:   173,
-								StartPos:  3619,
-								EndPos:    3622,
+							Parts: []ast.Vertex{
+								&ast.NameNamePart{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 173,
+											EndLine:   173,
+											StartPos:  3614,
+											EndPos:    3617,
+										},
+									},
+									Value: []byte("Foo"),
+								},
 							},
 						},
-						Use: &ast.NameName{
+						UseList: &ast.StmtUseList{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 173,
 									EndLine:   173,
 									StartPos:  3619,
-									EndPos:    3622,
+									EndPos:    3627,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+							UseDeclarations: []ast.Vertex{
+								&ast.StmtUseDeclaration{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 173,
@@ -10011,31 +10189,31 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3622,
 										},
 									},
-									Value: []byte("Bar"),
+									Use: &ast.NameName{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 173,
+												EndLine:   173,
+												StartPos:  3619,
+												EndPos:    3622,
+											},
+										},
+										Parts: []ast.Vertex{
+											&ast.NameNamePart{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 173,
+														EndLine:   173,
+														StartPos:  3619,
+														EndPos:    3622,
+													},
+												},
+												Value: []byte("Bar"),
+											},
+										},
+									},
 								},
-							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 173,
-								EndLine:   173,
-								StartPos:  3624,
-								EndPos:    3627,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 173,
-									EndLine:   173,
-									StartPos:  3624,
-									EndPos:    3627,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								&ast.StmtUseDeclaration{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 173,
@@ -10044,14 +10222,36 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3627,
 										},
 									},
-									Value: []byte("Baz"),
+									Use: &ast.NameName{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 173,
+												EndLine:   173,
+												StartPos:  3624,
+												EndPos:    3627,
+											},
+										},
+										Parts: []ast.Vertex{
+											&ast.NameNamePart{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 173,
+														EndLine:   173,
+														StartPos:  3624,
+														EndPos:    3627,
+													},
+												},
+												Value: []byte("Baz"),
+											},
+										},
+									},
 								},
 							},
 						},
 					},
 				},
 			},
-			&ast.StmtGroupUse{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 174,
@@ -10060,28 +10260,36 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3656,
 					},
 				},
-				UseType: &ast.Identifier{
+				UseList: &ast.StmtUseType{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 174,
 							EndLine:   174,
 							StartPos:  3634,
-							EndPos:    3639,
+							EndPos:    3655,
 						},
 					},
-					Value: []byte("const"),
-				},
-				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 174,
-							EndLine:   174,
-							StartPos:  3641,
-							EndPos:    3644,
+					Type: &ast.Identifier{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 174,
+								EndLine:   174,
+								StartPos:  3634,
+								EndPos:    3639,
+							},
 						},
+						Value: []byte("const"),
 					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
+					Use: &ast.StmtGroupUseList{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 174,
+								EndLine:   174,
+								StartPos:  3640,
+								EndPos:    3655,
+							},
+						},
+						Prefix: &ast.NameName{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 174,
@@ -10090,31 +10298,31 @@ func TestPhp7(t *testing.T) {
 									EndPos:    3644,
 								},
 							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-				UseList: []ast.Vertex{
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 174,
-								EndLine:   174,
-								StartPos:  3646,
-								EndPos:    3649,
+							Parts: []ast.Vertex{
+								&ast.NameNamePart{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 174,
+											EndLine:   174,
+											StartPos:  3641,
+											EndPos:    3644,
+										},
+									},
+									Value: []byte("Foo"),
+								},
 							},
 						},
-						Use: &ast.NameName{
+						UseList: &ast.StmtUseList{
 							Node: ast.Node{
 								Position: &position.Position{
 									StartLine: 174,
 									EndLine:   174,
 									StartPos:  3646,
-									EndPos:    3649,
+									EndPos:    3654,
 								},
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+							UseDeclarations: []ast.Vertex{
+								&ast.StmtUseDeclaration{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 174,
@@ -10123,31 +10331,31 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3649,
 										},
 									},
-									Value: []byte("Bar"),
+									Use: &ast.NameName{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 174,
+												EndLine:   174,
+												StartPos:  3646,
+												EndPos:    3649,
+											},
+										},
+										Parts: []ast.Vertex{
+											&ast.NameNamePart{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 174,
+														EndLine:   174,
+														StartPos:  3646,
+														EndPos:    3649,
+													},
+												},
+												Value: []byte("Bar"),
+											},
+										},
+									},
 								},
-							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 174,
-								EndLine:   174,
-								StartPos:  3651,
-								EndPos:    3654,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 174,
-									EndLine:   174,
-									StartPos:  3651,
-									EndPos:    3654,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								&ast.StmtUseDeclaration{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 174,
@@ -10156,14 +10364,36 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3654,
 										},
 									},
-									Value: []byte("Baz"),
+									Use: &ast.NameName{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 174,
+												EndLine:   174,
+												StartPos:  3651,
+												EndPos:    3654,
+											},
+										},
+										Parts: []ast.Vertex{
+											&ast.NameNamePart{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 174,
+														EndLine:   174,
+														StartPos:  3651,
+														EndPos:    3654,
+													},
+												},
+												Value: []byte("Baz"),
+											},
+										},
+									},
 								},
 							},
 						},
 					},
 				},
 			},
-			&ast.StmtGroupUse{
+			&ast.StmtUse{
 				Node: ast.Node{
 					Position: &position.Position{
 						StartLine: 175,
@@ -10172,61 +10402,69 @@ func TestPhp7(t *testing.T) {
 						EndPos:    3691,
 					},
 				},
-				Prefix: &ast.NameName{
+				UseList: &ast.StmtGroupUseList{
 					Node: ast.Node{
 						Position: &position.Position{
 							StartLine: 175,
 							EndLine:   175,
 							StartPos:  3661,
-							EndPos:    3664,
+							EndPos:    3690,
 						},
 					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 175,
-									EndLine:   175,
-									StartPos:  3661,
-									EndPos:    3664,
-								},
-							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-				UseList: []ast.Vertex{
-					&ast.StmtUse{
+					Prefix: &ast.NameName{
 						Node: ast.Node{
 							Position: &position.Position{
 								StartLine: 175,
 								EndLine:   175,
-								StartPos:  3672,
-								EndPos:    3675,
+								StartPos:  3661,
+								EndPos:    3664,
 							},
 						},
-						UseType: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 175,
-									EndLine:   175,
-									StartPos:  3666,
-									EndPos:    3671,
+						Parts: []ast.Vertex{
+							&ast.NameNamePart{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 175,
+										EndLine:   175,
+										StartPos:  3661,
+										EndPos:    3664,
+									},
 								},
+								Value: []byte("Foo"),
 							},
-							Value: []byte("const"),
 						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 175,
-									EndLine:   175,
-									StartPos:  3672,
-									EndPos:    3675,
-								},
+					},
+					UseList: &ast.StmtUseList{
+						Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 175,
+								EndLine:   175,
+								StartPos:  3666,
+								EndPos:    3689,
 							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+						},
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseType{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 175,
+										EndLine:   175,
+										StartPos:  3666,
+										EndPos:    3675,
+									},
+								},
+								Type: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 175,
+											EndLine:   175,
+											StartPos:  3666,
+											EndPos:    3671,
+										},
+									},
+									Value: []byte("const"),
+								},
+								Use: &ast.StmtUseDeclaration{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 175,
@@ -10235,42 +10473,52 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3675,
 										},
 									},
-									Value: []byte("Bar"),
+									Use: &ast.NameName{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 175,
+												EndLine:   175,
+												StartPos:  3672,
+												EndPos:    3675,
+											},
+										},
+										Parts: []ast.Vertex{
+											&ast.NameNamePart{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 175,
+														EndLine:   175,
+														StartPos:  3672,
+														EndPos:    3675,
+													},
+												},
+												Value: []byte("Bar"),
+											},
+										},
+									},
 								},
 							},
-						},
-					},
-					&ast.StmtUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 175,
-								EndLine:   175,
-								StartPos:  3686,
-								EndPos:    3689,
-							},
-						},
-						UseType: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 175,
-									EndLine:   175,
-									StartPos:  3677,
-									EndPos:    3685,
+							&ast.StmtUseType{
+								Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 175,
+										EndLine:   175,
+										StartPos:  3677,
+										EndPos:    3689,
+									},
 								},
-							},
-							Value: []byte("function"),
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 175,
-									EndLine:   175,
-									StartPos:  3686,
-									EndPos:    3689,
+								Type: &ast.Identifier{
+									Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 175,
+											EndLine:   175,
+											StartPos:  3677,
+											EndPos:    3685,
+										},
+									},
+									Value: []byte("function"),
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
+								Use: &ast.StmtUseDeclaration{
 									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 175,
@@ -10279,7 +10527,29 @@ func TestPhp7(t *testing.T) {
 											EndPos:    3689,
 										},
 									},
-									Value: []byte("Baz"),
+									Use: &ast.NameName{
+										Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 175,
+												EndLine:   175,
+												StartPos:  3686,
+												EndPos:    3689,
+											},
+										},
+										Parts: []ast.Vertex{
+											&ast.NameNamePart{
+												Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 175,
+														EndLine:   175,
+														StartPos:  3686,
+														EndPos:    3689,
+													},
+												},
+												Value: []byte("Baz"),
+											},
+										},
+									},
 								},
 							},
 						},
diff --git a/pkg/ast/ast.go b/pkg/ast/ast.go
index 41b540b..4513b11 100644
--- a/pkg/ast/ast.go
+++ b/pkg/ast/ast.go
@@ -59,7 +59,6 @@ type NodeVisitor interface {
 	StmtFunction(n *StmtFunction)
 	StmtGlobal(n *StmtGlobal)
 	StmtGoto(n *StmtGoto)
-	StmtGroupUse(n *StmtGroupUse)
 	StmtHaltCompiler(n *StmtHaltCompiler)
 	StmtIf(n *StmtIf)
 	StmtInlineHtml(n *StmtInlineHtml)
@@ -85,7 +84,10 @@ type NodeVisitor interface {
 	StmtTry(n *StmtTry)
 	StmtUnset(n *StmtUnset)
 	StmtUse(n *StmtUse)
+	StmtGroupUseList(n *StmtGroupUseList)
 	StmtUseList(n *StmtUseList)
+	StmtUseDeclaration(n *StmtUseDeclaration)
+	StmtUseType(n *StmtUseType)
 	StmtWhile(n *StmtWhile)
 
 	ExprArray(n *ExprArray)
diff --git a/pkg/ast/node.go b/pkg/ast/node.go
index 0435c7c..b609578 100644
--- a/pkg/ast/node.go
+++ b/pkg/ast/node.go
@@ -532,18 +532,6 @@ func (n *StmtGoto) Accept(v NodeVisitor) {
 	v.StmtGoto(n)
 }
 
-// StmtGroupUse node
-type StmtGroupUse struct {
-	Node
-	UseType Vertex
-	Prefix  Vertex
-	UseList []Vertex
-}
-
-func (n *StmtGroupUse) Accept(v NodeVisitor) {
-	v.StmtGroupUse(n)
-}
-
 // StmtHaltCompiler node
 type StmtHaltCompiler struct {
 	Node
@@ -804,26 +792,56 @@ func (n *StmtUnset) Accept(v NodeVisitor) {
 // StmtUse node
 type StmtUse struct {
 	Node
-	UseType Vertex
-	Use     Vertex
-	Alias   Vertex
+	UseList Vertex
 }
 
 func (n *StmtUse) Accept(v NodeVisitor) {
 	v.StmtUse(n)
 }
 
+// StmtGroupUseList node
+type StmtGroupUseList struct {
+	Node
+	Prefix  Vertex
+	UseList Vertex
+}
+
+func (n *StmtGroupUseList) Accept(v NodeVisitor) {
+	v.StmtGroupUseList(n)
+}
+
 // StmtUseList node
 type StmtUseList struct {
 	Node
-	UseType Vertex
-	Uses    []Vertex
+	UseDeclarations []Vertex
 }
 
 func (n *StmtUseList) Accept(v NodeVisitor) {
 	v.StmtUseList(n)
 }
 
+// StmtUseDeclaration node
+type StmtUseDeclaration struct {
+	Node
+	Use   Vertex
+	Alias Vertex
+}
+
+func (n *StmtUseDeclaration) Accept(v NodeVisitor) {
+	v.StmtUseDeclaration(n)
+}
+
+// StmtUseType node
+type StmtUseType struct {
+	Node
+	Type Vertex
+	Use  Vertex
+}
+
+func (n *StmtUseType) Accept(v NodeVisitor) {
+	v.StmtUseType(n)
+}
+
 // StmtWhile node
 type StmtWhile struct {
 	Node
diff --git a/pkg/ast/traverser/dfs.go b/pkg/ast/traverser/dfs.go
index d25b426..a71c83b 100644
--- a/pkg/ast/traverser/dfs.go
+++ b/pkg/ast/traverser/dfs.go
@@ -745,30 +745,6 @@ func (t *DFS) Traverse(n ast.Vertex) {
 			t.Traverse(nn.Label)
 			t.visitor.Leave("Label", true)
 		}
-	case *ast.StmtGroupUse:
-		if nn == nil {
-			return
-		}
-		if !t.visitor.EnterNode(nn) {
-			return
-		}
-		if nn.UseType != nil {
-			t.visitor.Enter("UseType", true)
-			t.Traverse(nn.UseType)
-			t.visitor.Leave("UseType", true)
-		}
-		if nn.Prefix != nil {
-			t.visitor.Enter("Prefix", true)
-			t.Traverse(nn.Prefix)
-			t.visitor.Leave("Prefix", true)
-		}
-		if nn.UseList != nil {
-			t.visitor.Enter("UseList", false)
-			for _, c := range nn.UseList {
-				t.Traverse(c)
-			}
-			t.visitor.Leave("UseList", false)
-		}
 	case *ast.StmtHaltCompiler:
 		if nn == nil {
 			return
@@ -1174,10 +1150,48 @@ func (t *DFS) Traverse(n ast.Vertex) {
 		if !t.visitor.EnterNode(nn) {
 			return
 		}
-		if nn.UseType != nil {
-			t.visitor.Enter("UseType", true)
-			t.Traverse(nn.UseType)
-			t.visitor.Leave("UseType", true)
+		if nn.UseList != nil {
+			t.visitor.Enter("UseList", true)
+			t.Traverse(nn.UseList)
+			t.visitor.Leave("UseList", true)
+		}
+	case *ast.StmtGroupUseList:
+		if nn == nil {
+			return
+		}
+		if !t.visitor.EnterNode(nn) {
+			return
+		}
+		if nn.Prefix != nil {
+			t.visitor.Enter("Prefix", true)
+			t.Traverse(nn.Prefix)
+			t.visitor.Leave("Prefix", true)
+		}
+		if nn.UseList != nil {
+			t.visitor.Enter("UseList", true)
+			t.Traverse(nn.UseList)
+			t.visitor.Leave("UseList", true)
+		}
+	case *ast.StmtUseList:
+		if nn == nil {
+			return
+		}
+		if !t.visitor.EnterNode(nn) {
+			return
+		}
+		if nn.UseDeclarations != nil {
+			t.visitor.Enter("UseDeclarations", false)
+			for _, c := range nn.UseDeclarations {
+				t.Traverse(c)
+			}
+			t.visitor.Leave("UseDeclarations", false)
+		}
+	case *ast.StmtUseDeclaration:
+		if nn == nil {
+			return
+		}
+		if !t.visitor.EnterNode(nn) {
+			return
 		}
 		if nn.Use != nil {
 			t.visitor.Enter("Use", true)
@@ -1189,24 +1203,22 @@ func (t *DFS) Traverse(n ast.Vertex) {
 			t.Traverse(nn.Alias)
 			t.visitor.Leave("Alias", true)
 		}
-	case *ast.StmtUseList:
+	case *ast.StmtUseType:
 		if nn == nil {
 			return
 		}
 		if !t.visitor.EnterNode(nn) {
 			return
 		}
-		if nn.UseType != nil {
-			t.visitor.Enter("UseType", true)
-			t.Traverse(nn.UseType)
-			t.visitor.Leave("UseType", true)
+		if nn.Type != nil {
+			t.visitor.Enter("Type", true)
+			t.Traverse(nn.Type)
+			t.visitor.Leave("Type", true)
 		}
-		if nn.Uses != nil {
-			t.visitor.Enter("Uses", false)
-			for _, c := range nn.Uses {
-				t.Traverse(c)
-			}
-			t.visitor.Leave("Uses", false)
+		if nn.Use != nil {
+			t.visitor.Enter("Use", true)
+			t.Traverse(nn.Use)
+			t.visitor.Leave("Use", true)
 		}
 	case *ast.StmtWhile:
 		if nn == nil {
diff --git a/pkg/ast/visitor/dump.go b/pkg/ast/visitor/dump.go
index 9346d75..fd9e253 100644
--- a/pkg/ast/visitor/dump.go
+++ b/pkg/ast/visitor/dump.go
@@ -437,12 +437,6 @@ func (v *Dump) StmtGoto(n *ast.StmtGoto) {
 	v.printNode(n.GetNode())
 }
 
-func (v *Dump) StmtGroupUse(n *ast.StmtGroupUse) {
-	v.printIndentIfNotSingle(v.indent - 1)
-	v.print("&ast.StmtGroupUse{\n")
-	v.printNode(n.GetNode())
-}
-
 func (v *Dump) StmtHaltCompiler(n *ast.StmtHaltCompiler) {
 	v.printIndentIfNotSingle(v.indent - 1)
 	v.print("&ast.StmtHaltCompiler{\n")
@@ -596,12 +590,30 @@ func (v *Dump) StmtUse(n *ast.StmtUse) {
 	v.printNode(n.GetNode())
 }
 
+func (v *Dump) StmtGroupUseList(n *ast.StmtGroupUseList) {
+	v.printIndentIfNotSingle(v.indent - 1)
+	v.print("&ast.StmtGroupUseList{\n")
+	v.printNode(n.GetNode())
+}
+
 func (v *Dump) StmtUseList(n *ast.StmtUseList) {
 	v.printIndentIfNotSingle(v.indent - 1)
 	v.print("&ast.StmtUseList{\n")
 	v.printNode(n.GetNode())
 }
 
+func (v *Dump) StmtUseDeclaration(n *ast.StmtUseDeclaration) {
+	v.printIndentIfNotSingle(v.indent - 1)
+	v.print("&ast.StmtUseDeclaration{\n")
+	v.printNode(n.GetNode())
+}
+
+func (v *Dump) StmtUseType(n *ast.StmtUseType) {
+	v.printIndentIfNotSingle(v.indent - 1)
+	v.print("&ast.StmtUseType{\n")
+	v.printNode(n.GetNode())
+}
+
 func (v *Dump) StmtWhile(n *ast.StmtWhile) {
 	v.printIndentIfNotSingle(v.indent - 1)
 	v.print("&ast.StmtWhile{\n")
diff --git a/pkg/ast/visitor/namespace_resolver.go b/pkg/ast/visitor/namespace_resolver.go
index 9438971..65f0f54 100644
--- a/pkg/ast/visitor/namespace_resolver.go
+++ b/pkg/ast/visitor/namespace_resolver.go
@@ -13,7 +13,9 @@ type NamespaceResolver struct {
 	Namespace     *Namespace
 	ResolvedNames map[ast.Vertex]string
 
-	goDeep bool
+	goDeep    bool
+	useType   string
+	usePrefix []ast.Vertex
 }
 
 // NewNamespaceResolver NamespaceResolver type constructor
@@ -45,28 +47,28 @@ func (nsr *NamespaceResolver) StmtNamespace(n *ast.StmtNamespace) {
 	}
 }
 
-func (nsr *NamespaceResolver) StmtUseList(n *ast.StmtUseList) {
-	useType := ""
-	if n.UseType != nil {
-		useType = string(n.UseType.(*ast.Identifier).Value)
+func (nsr *NamespaceResolver) StmtUseType(n *ast.StmtUseType) {
+	if n.Type != nil {
+		nsr.useType = string(n.Type.(*ast.Identifier).Value)
 	}
-
-	for _, nn := range n.Uses {
-		nsr.AddAlias(useType, nn, nil)
-	}
-
-	nsr.goDeep = false
 }
 
-func (nsr *NamespaceResolver) StmtGroupUse(n *ast.StmtGroupUse) {
-	useType := ""
-	if n.UseType != nil {
-		useType = string(n.UseType.(*ast.Identifier).Value)
+func (nsr *NamespaceResolver) StmtGroupUseList(n *ast.StmtGroupUseList) {
+	if n.Prefix != nil {
+		nsr.usePrefix = n.Prefix.(*ast.NameName).Parts
+	}
+}
+
+func (nsr *NamespaceResolver) StmtUseDeclaration(n *ast.StmtUseDeclaration) {
+	useNameParts := n.Use.(*ast.NameName).Parts
+	var alias string
+	if n.Alias == nil {
+		alias = string(useNameParts[len(useNameParts)-1].(*ast.NameNamePart).Value)
+	} else {
+		alias = string(n.Alias.(*ast.Identifier).Value)
 	}
 
-	for _, nn := range n.UseList {
-		nsr.AddAlias(useType, nn, n.Prefix.(*ast.NameName).Parts)
-	}
+	nsr.Namespace.AddAlias(nsr.useType, concatNameParts(nsr.usePrefix, useNameParts), alias)
 
 	nsr.goDeep = false
 }
@@ -213,26 +215,10 @@ func (nsr *NamespaceResolver) LeaveNode(n ast.Vertex) {
 		if nn.Stmts != nil {
 			nsr.Namespace = NewNamespace("")
 		}
-	}
-}
-
-// AddAlias adds a new alias
-func (nsr *NamespaceResolver) AddAlias(useType string, nn ast.Vertex, prefix []ast.Vertex) {
-	switch use := nn.(type) {
-	case *ast.StmtUse:
-		if use.UseType != nil {
-			useType = string(use.UseType.(*ast.Identifier).Value)
-		}
-
-		useNameParts := use.Use.(*ast.NameName).Parts
-		var alias string
-		if use.Alias == nil {
-			alias = string(useNameParts[len(useNameParts)-1].(*ast.NameNamePart).Value)
-		} else {
-			alias = string(use.Alias.(*ast.Identifier).Value)
-		}
-
-		nsr.Namespace.AddAlias(useType, concatNameParts(prefix, useNameParts), alias)
+	case *ast.StmtUseType:
+		nsr.useType = ""
+	case *ast.StmtGroupUseList:
+		nsr.usePrefix = nil
 	}
 }
 
diff --git a/pkg/ast/visitor/namespace_resolver_test.go b/pkg/ast/visitor/namespace_resolver_test.go
index d52d635..22eb8bc 100644
--- a/pkg/ast/visitor/namespace_resolver_test.go
+++ b/pkg/ast/visitor/namespace_resolver_test.go
@@ -16,10 +16,12 @@ func TestResolveStaticCall(t *testing.T) {
 
 	stxTree := &ast.StmtStmtList{
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Use: nameAB,
+			&ast.StmtUse{
+				UseList: &ast.StmtUseList{
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
+							Use: nameAB,
+						},
 					},
 				},
 			},
@@ -48,10 +50,12 @@ func TestResolveStaticPropertyFetch(t *testing.T) {
 
 	stxTree := &ast.StmtStmtList{
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Use: nameAB,
+			&ast.StmtUse{
+				UseList: &ast.StmtUseList{
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
+							Use: nameAB,
+						},
 					},
 				},
 			},
@@ -79,10 +83,12 @@ func TestResolveClassConstFetch(t *testing.T) {
 
 	stxTree := &ast.StmtStmtList{
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Use: nameAB,
+			&ast.StmtUse{
+				UseList: &ast.StmtUseList{
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
+							Use: nameAB,
+						},
 					},
 				},
 			},
@@ -110,10 +116,12 @@ func TestResolveNew(t *testing.T) {
 
 	stxTree := &ast.StmtStmtList{
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Use: nameAB,
+			&ast.StmtUse{
+				UseList: &ast.StmtUseList{
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
+							Use: nameAB,
+						},
 					},
 				},
 			},
@@ -141,10 +149,12 @@ func TestResolveInstanceOf(t *testing.T) {
 
 	stxTree := &ast.StmtStmtList{
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Use: nameAB,
+			&ast.StmtUse{
+				UseList: &ast.StmtUseList{
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
+							Use: nameAB,
+						},
 					},
 				},
 			},
@@ -175,14 +185,15 @@ func TestResolveInstanceCatch(t *testing.T) {
 
 	stxTree := &ast.StmtStmtList{
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Use: nameAB,
-					},
-					&ast.StmtUse{
-						Use:   nameDE,
-						Alias: &ast.Identifier{Value: []byte("F")},
+			&ast.StmtUse{
+				UseList: &ast.StmtUseList{
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
+							Use: nameAB,
+						}, &ast.StmtUseDeclaration{
+							Use:   nameDE,
+							Alias: &ast.Identifier{Value: []byte("F")},
+						},
 					},
 				},
 			},
@@ -220,11 +231,15 @@ func TestResolveFunctionCall(t *testing.T) {
 
 	stxTree := &ast.StmtStmtList{
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
-				UseType: &ast.Identifier{Value: []byte("function")},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Use: nameAB,
+			&ast.StmtUse{
+				UseList: &ast.StmtUseType{
+					Type: &ast.Identifier{Value: []byte("function")},
+					Use: &ast.StmtUseList{
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Use: nameAB,
+							},
+						},
 					},
 				},
 			},
@@ -252,11 +267,15 @@ func TestResolveConstFetch(t *testing.T) {
 
 	stxTree := &ast.StmtStmtList{
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
-				UseType: &ast.Identifier{Value: []byte("const")},
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Use: nameAB,
+			&ast.StmtUse{
+				UseList: &ast.StmtUseType{
+					Type: &ast.Identifier{Value: []byte("const")},
+					Use: &ast.StmtUseList{
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseDeclaration{
+								Use: nameAB,
+							},
+						},
 					},
 				},
 			},
@@ -286,25 +305,39 @@ func TestResolveGroupUse(t *testing.T) {
 
 	stxTree := &ast.StmtStmtList{
 		Stmts: []ast.Vertex{
-			&ast.StmtGroupUse{
-				Prefix: nameAB,
-				UseList: []ast.Vertex{
-					&ast.StmtUse{
-						UseType: &ast.Identifier{Value: []byte("Function")},
-						Use:     nameF,
-					},
-					&ast.StmtUse{
-						UseType: &ast.Identifier{Value: []byte("const")},
-						Use:     nameC,
+			&ast.StmtUse{
+				UseList: &ast.StmtGroupUseList{
+					Prefix: nameAB,
+					UseList: &ast.StmtUseList{
+						UseDeclarations: []ast.Vertex{
+							&ast.StmtUseType{
+								Type: &ast.Identifier{Value: []byte("Function")},
+								Use: &ast.StmtUseDeclaration{
+									Use: nameF,
+								},
+							},
+							&ast.StmtUseType{
+								Type: &ast.Identifier{Value: []byte("const")},
+								Use: &ast.StmtUseDeclaration{
+									Use: nameC,
+								},
+							},
+						},
 					},
 				},
 			},
-			&ast.StmtGroupUse{
-				Prefix:  nameBD,
-				UseType: &ast.Identifier{Value: []byte("Function")},
-				UseList: []ast.Vertex{
-					&ast.StmtUse{
-						Use: nameE,
+			&ast.StmtUse{
+				UseList: &ast.StmtUseType{
+					Type: &ast.Identifier{Value: []byte("Function")},
+					Use: &ast.StmtGroupUseList{
+						Prefix: nameBD,
+						UseList: &ast.StmtUseList{
+							UseDeclarations: []ast.Vertex{
+								&ast.StmtUseDeclaration{
+									Use: nameE,
+								},
+							},
+						},
 					},
 				},
 			},
@@ -347,10 +380,12 @@ func TestResolveTraitUse(t *testing.T) {
 
 	stxTree := &ast.StmtStmtList{
 		Stmts: []ast.Vertex{
-			&ast.StmtUseList{
-				Uses: []ast.Vertex{
-					&ast.StmtUse{
-						Use: nameAB,
+			&ast.StmtUse{
+				UseList: &ast.StmtUseList{
+					UseDeclarations: []ast.Vertex{
+						&ast.StmtUseDeclaration{
+							Use: nameAB,
+						},
 					},
 				},
 			},
@@ -668,10 +703,12 @@ func TestResolveNamespaces(t *testing.T) {
 			&ast.StmtNamespace{
 				NamespaceName: namespaceCD,
 				Stmts: []ast.Vertex{
-					&ast.StmtUseList{
-						Uses: []ast.Vertex{
-							&ast.StmtUse{
-								Use: nameAC,
+					&ast.StmtUse{
+						UseList: &ast.StmtUseList{
+							UseDeclarations: []ast.Vertex{
+								&ast.StmtUseDeclaration{
+									Use: nameAC,
+								},
 							},
 						},
 					},
diff --git a/pkg/ast/visitor/null.go b/pkg/ast/visitor/null.go
index 6fd6261..e291500 100644
--- a/pkg/ast/visitor/null.go
+++ b/pkg/ast/visitor/null.go
@@ -182,10 +182,6 @@ func (v *Null) StmtGoto(_ *ast.StmtGoto) {
 	// do nothing
 }
 
-func (v *Null) StmtGroupUse(_ *ast.StmtGroupUse) {
-	// do nothing
-}
-
 func (v *Null) StmtHaltCompiler(_ *ast.StmtHaltCompiler) {
 	// do nothing
 }
@@ -286,10 +282,22 @@ func (v *Null) StmtUse(_ *ast.StmtUse) {
 	// do nothing
 }
 
+func (v *Null) StmtGroupUseList(_ *ast.StmtGroupUseList) {
+	// do nothing
+}
+
 func (v *Null) StmtUseList(_ *ast.StmtUseList) {
 	// do nothing
 }
 
+func (v *Null) StmtUseDeclaration(_ *ast.StmtUseDeclaration) {
+	// do nothing
+}
+
+func (v *Null) StmtUseType(_ *ast.StmtUseType) {
+	// do nothing
+}
+
 func (v *Null) StmtWhile(_ *ast.StmtWhile) {
 	// do nothing
 }
diff --git a/pkg/printer/pretty_printer.go b/pkg/printer/pretty_printer.go
index 0948cdd..71a89a8 100644
--- a/pkg/printer/pretty_printer.go
+++ b/pkg/printer/pretty_printer.go
@@ -353,8 +353,6 @@ func (p *PrettyPrinter) printNode(n ast.Vertex) {
 		p.printStmtGlobal(n)
 	case *ast.StmtGoto:
 		p.printStmtGoto(n)
-	case *ast.StmtGroupUse:
-		p.printStmtGroupUse(n)
 	case *ast.StmtHaltCompiler:
 		p.printStmtHaltCompiler(n)
 	case *ast.StmtIf:
@@ -399,10 +397,16 @@ func (p *PrettyPrinter) printNode(n ast.Vertex) {
 		p.printStmtTry(n)
 	case *ast.StmtUnset:
 		p.printStmtUnset(n)
-	case *ast.StmtUseList:
-		p.printStmtUseList(n)
 	case *ast.StmtUse:
 		p.printStmtUse(n)
+	case *ast.StmtGroupUseList:
+		p.printStmtGroupUseList(n)
+	case *ast.StmtUseList:
+		p.printStmtUseList(n)
+	case *ast.StmtUseDeclaration:
+		p.printStmtUseDeclaration(n)
+	case *ast.StmtUseType:
+		p.printStmtUseType(n)
 	case *ast.StmtWhile:
 		p.printStmtWhile(n)
 	}
@@ -1847,22 +1851,6 @@ func (p *PrettyPrinter) printStmtGoto(n ast.Vertex) {
 	io.WriteString(p.w, ";")
 }
 
-func (p *PrettyPrinter) printStmtGroupUse(n ast.Vertex) {
-	nn := n.(*ast.StmtGroupUse)
-
-	io.WriteString(p.w, "use ")
-
-	if nn.UseType != nil {
-		p.Print(nn.UseType)
-		io.WriteString(p.w, " ")
-	}
-
-	p.Print(nn.Prefix)
-	io.WriteString(p.w, "\\{")
-	p.joinPrint(", ", nn.UseList)
-	io.WriteString(p.w, "};")
-}
-
 func (p *PrettyPrinter) printStmtHaltCompiler(n ast.Vertex) {
 	io.WriteString(p.w, "__halt_compiler();")
 }
@@ -2146,27 +2134,34 @@ func (p *PrettyPrinter) printStmtUnset(n ast.Vertex) {
 	io.WriteString(p.w, ");")
 }
 
-func (p *PrettyPrinter) printStmtUseList(n ast.Vertex) {
-	nn := n.(*ast.StmtUseList)
-
-	io.WriteString(p.w, "use ")
-
-	if nn.UseType != nil {
-		p.Print(nn.UseType)
-		io.WriteString(p.w, " ")
-	}
-
-	p.joinPrint(", ", nn.Uses)
-	io.WriteString(p.w, ";")
-}
-
 func (p *PrettyPrinter) printStmtUse(n ast.Vertex) {
 	nn := n.(*ast.StmtUse)
 
-	if nn.UseType != nil {
-		p.Print(nn.UseType)
-		io.WriteString(p.w, " ")
-	}
+	io.WriteString(p.w, "use ")
+
+	p.Print(nn.UseList)
+
+	io.WriteString(p.w, ";")
+}
+
+func (p *PrettyPrinter) printStmtGroupUseList(n ast.Vertex) {
+	nn := n.(*ast.StmtGroupUseList)
+
+	p.Print(nn.Prefix)
+
+	io.WriteString(p.w, "\\{")
+	p.Print(nn.UseList)
+	io.WriteString(p.w, "}")
+}
+
+func (p *PrettyPrinter) printStmtUseList(n ast.Vertex) {
+	nn := n.(*ast.StmtUseList)
+
+	p.joinPrint(", ", nn.UseDeclarations)
+}
+
+func (p *PrettyPrinter) printStmtUseDeclaration(n ast.Vertex) {
+	nn := n.(*ast.StmtUseDeclaration)
 
 	p.Print(nn.Use)
 
@@ -2176,6 +2171,15 @@ func (p *PrettyPrinter) printStmtUse(n ast.Vertex) {
 	}
 }
 
+func (p *PrettyPrinter) printStmtUseType(n ast.Vertex) {
+	nn := n.(*ast.StmtUseType)
+
+	p.Print(nn.Type)
+	io.WriteString(p.w, " ")
+
+	p.Print(nn.Use)
+}
+
 func (p *PrettyPrinter) printStmtWhile(n ast.Vertex) {
 	nn := n.(*ast.StmtWhile)
 
diff --git a/pkg/printer/pretty_printer_test.go b/pkg/printer/pretty_printer_test.go
index dd20c5d..72f4988 100644
--- a/pkg/printer/pretty_printer_test.go
+++ b/pkg/printer/pretty_printer_test.go
@@ -3256,32 +3256,6 @@ func TestPrintStmtGoto(t *testing.T) {
 	}
 }
 
-func TestPrintStmtGroupUse(t *testing.T) {
-	o := bytes.NewBufferString("")
-
-	p := printer.NewPrettyPrinter(o, "    ")
-	p.Print(&ast.StmtGroupUse{
-		UseType: &ast.Identifier{Value: []byte("function")},
-		Prefix:  &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
-		UseList: []ast.Vertex{
-			&ast.StmtUse{
-				Use:   &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Bar")}}},
-				Alias: &ast.Identifier{Value: []byte("Baz")},
-			},
-			&ast.StmtUse{
-				Use: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Quuz")}}},
-			},
-		},
-	})
-
-	expected := `use function Foo\{Bar as Baz, Quuz};`
-	actual := o.String()
-
-	if expected != actual {
-		t.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
-	}
-}
-
 func TestPrintHaltCompiler(t *testing.T) {
 	o := bytes.NewBufferString("")
 
@@ -3975,24 +3949,15 @@ func TestPrintStmtUset(t *testing.T) {
 	}
 }
 
-func TestPrintStmtUseList(t *testing.T) {
+func TestPrintUse(t *testing.T) {
 	o := bytes.NewBufferString("")
 
 	p := printer.NewPrettyPrinter(o, "    ")
-	p.Print(&ast.StmtUseList{
-		UseType: &ast.Identifier{Value: []byte("function")},
-		Uses: []ast.Vertex{
-			&ast.StmtUse{
-				Use:   &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
-				Alias: &ast.Identifier{Value: []byte("Bar")},
-			},
-			&ast.StmtUse{
-				Use: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Baz")}}},
-			},
-		},
+	p.Print(&ast.StmtUse{
+		UseList: &ast.StmtUseList{},
 	})
 
-	expected := `use function Foo as Bar, Baz;`
+	expected := `use ;`
 	actual := o.String()
 
 	if expected != actual {
@@ -4000,14 +3965,74 @@ func TestPrintStmtUseList(t *testing.T) {
 	}
 }
 
-func TestPrintUse(t *testing.T) {
+func TestPrintStmtGroupUseList(t *testing.T) {
 	o := bytes.NewBufferString("")
 
 	p := printer.NewPrettyPrinter(o, "    ")
-	p.Print(&ast.StmtUse{
-		UseType: &ast.Identifier{Value: []byte("function")},
-		Use:     &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
-		Alias:   &ast.Identifier{Value: []byte("Bar")},
+	p.Print(&ast.StmtGroupUseList{
+		Prefix:  &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
+		UseList: &ast.StmtUseList{},
+	})
+
+	expected := `Foo\{}`
+	actual := o.String()
+
+	if expected != actual {
+		t.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
+	}
+}
+
+func TestPrintStmtUseList(t *testing.T) {
+	o := bytes.NewBufferString("")
+
+	p := printer.NewPrettyPrinter(o, "    ")
+	p.Print(&ast.StmtUseList{
+		UseDeclarations: []ast.Vertex{
+			&ast.StmtUseDeclaration{
+				Use:   &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
+				Alias: &ast.Identifier{Value: []byte("Bar")},
+			},
+			&ast.StmtUseDeclaration{
+				Use: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Baz")}}},
+			},
+		},
+	})
+
+	expected := `Foo as Bar, Baz`
+	actual := o.String()
+
+	if expected != actual {
+		t.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
+	}
+}
+
+func TestPrintUseDeclaration(t *testing.T) {
+	o := bytes.NewBufferString("")
+
+	p := printer.NewPrettyPrinter(o, "    ")
+	p.Print(&ast.StmtUseDeclaration{
+		Use:   &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
+		Alias: &ast.Identifier{Value: []byte("Bar")},
+	})
+
+	expected := `Foo as Bar`
+	actual := o.String()
+
+	if expected != actual {
+		t.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
+	}
+}
+
+func TestPrintUseType(t *testing.T) {
+	o := bytes.NewBufferString("")
+
+	p := printer.NewPrettyPrinter(o, "    ")
+	p.Print(&ast.StmtUseType{
+		Type: &ast.Identifier{Value: []byte("function")},
+		Use: &ast.StmtUseDeclaration{
+			Use:   &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
+			Alias: &ast.Identifier{Value: []byte("Bar")},
+		},
 	})
 
 	expected := `function Foo as Bar`
diff --git a/pkg/printer/printer.go b/pkg/printer/printer.go
index 47a82fb..4eff938 100644
--- a/pkg/printer/printer.go
+++ b/pkg/printer/printer.go
@@ -16,8 +16,10 @@ const (
 )
 
 type Printer struct {
-	w io.Writer
-	s printerState
+	w        io.Writer
+	s        printerState
+	bufStart string
+	bufEnd   string
 }
 
 // NewPrinter -  Constructor for Printer
@@ -60,6 +62,21 @@ func (p *Printer) printNodes(nn []ast.Vertex) {
 	}
 }
 
+func (p *Printer) printFreeFloatingOrDefault(n ast.Vertex, pos token.Position, def string) {
+	if n == nil {
+		return
+	}
+
+	if len(n.GetNode().Tokens[pos]) == 0 {
+		io.WriteString(p.w, def)
+		return
+	}
+
+	for _, m := range n.GetNode().Tokens[pos] {
+		io.WriteString(p.w, string(m.Value))
+	}
+}
+
 func (p *Printer) printFreeFloating(n ast.Vertex, pos token.Position) {
 	if n == nil {
 		return
@@ -374,8 +391,6 @@ func (p *Printer) printNode(n ast.Vertex) {
 		p.printStmtGlobal(n)
 	case *ast.StmtGoto:
 		p.printStmtGoto(n)
-	case *ast.StmtGroupUse:
-		p.printStmtGroupUse(n)
 	case *ast.StmtHaltCompiler:
 		p.printStmtHaltCompiler(n)
 	case *ast.StmtIf:
@@ -422,10 +437,16 @@ func (p *Printer) printNode(n ast.Vertex) {
 		p.printStmtTry(n)
 	case *ast.StmtUnset:
 		p.printStmtUnset(n)
-	case *ast.StmtUseList:
-		p.printStmtUseList(n)
 	case *ast.StmtUse:
 		p.printStmtUse(n)
+	case *ast.StmtGroupUseList:
+		p.printStmtGroupUseList(n)
+	case *ast.StmtUseList:
+		p.printStmtUseList(n)
+	case *ast.StmtUseDeclaration:
+		p.printStmtUseDeclaration(n)
+	case *ast.StmtUseType:
+		p.printStmtUseType(n)
 	case *ast.StmtWhile:
 		p.printStmtWhile(n)
 	}
@@ -443,8 +464,11 @@ func (p *Printer) printNodeRoot(n ast.Vertex) {
 
 func (p *Printer) printNodeIdentifier(n ast.Vertex) {
 	nn := n.(*ast.Identifier)
-	p.printFreeFloating(nn, token.Start)
+	p.printFreeFloatingOrDefault(nn, token.Start, p.bufStart)
+	p.bufStart = ""
+
 	io.WriteString(p.w, string(nn.Value))
+
 	p.printFreeFloating(nn, token.End)
 }
 
@@ -519,7 +543,8 @@ func (p *Printer) printNodeArgument(n ast.Vertex) {
 
 func (p *Printer) printNameNamePart(n ast.Vertex) {
 	nn := n.(*ast.NameNamePart)
-	p.printFreeFloating(nn, token.Start)
+	p.printFreeFloatingOrDefault(nn, token.Start, p.bufStart)
+	p.bufStart = ""
 
 	io.WriteString(p.w, string(nn.Value))
 
@@ -532,22 +557,26 @@ func (p *Printer) printNameName(n ast.Vertex) {
 
 	p.joinPrint("\\", nn.Parts)
 
-	p.printFreeFloating(nn, token.End)
+	p.printFreeFloatingOrDefault(nn, token.End, p.bufEnd)
+	p.bufEnd = ""
 }
 
 func (p *Printer) printNameFullyQualified(n ast.Vertex) {
 	nn := n.(*ast.NameFullyQualified)
-	p.printFreeFloating(nn, token.Start)
+	p.printFreeFloatingOrDefault(nn, token.Start, p.bufStart)
+	p.bufStart = ""
 
 	io.WriteString(p.w, "\\")
 	p.joinPrint("\\", nn.Parts)
 
-	p.printFreeFloating(nn, token.End)
+	p.printFreeFloatingOrDefault(nn, token.End, p.bufEnd)
+	p.bufEnd = ""
 }
 
 func (p *Printer) printNameRelative(n ast.Vertex) {
 	nn := n.(*ast.NameRelative)
-	p.printFreeFloating(nn, token.Start)
+	p.printFreeFloatingOrDefault(nn, token.Start, p.bufStart)
+	p.bufStart = ""
 
 	io.WriteString(p.w, "namespace")
 	p.printFreeFloating(nn, token.Namespace)
@@ -557,7 +586,8 @@ func (p *Printer) printNameRelative(n ast.Vertex) {
 		p.Print(part)
 	}
 
-	p.printFreeFloating(nn, token.End)
+	p.printFreeFloatingOrDefault(nn, token.End, p.bufEnd)
+	p.bufEnd = ""
 }
 
 // scalar
@@ -2710,41 +2740,6 @@ func (p *Printer) printStmtGoto(n ast.Vertex) {
 	p.printFreeFloating(nn, token.End)
 }
 
-func (p *Printer) printStmtGroupUse(n ast.Vertex) {
-	nn := n.(*ast.StmtGroupUse)
-	p.printFreeFloating(nn, token.Start)
-
-	io.WriteString(p.w, "use")
-	p.printFreeFloating(nn, token.Use)
-
-	if nn.UseType != nil {
-		if nn.UseType.GetNode().Tokens.IsEmpty() {
-			io.WriteString(p.w, " ")
-		}
-		p.Print(nn.UseType)
-	}
-
-	if nn.Prefix.GetNode().Tokens.IsEmpty() {
-		io.WriteString(p.w, " ")
-	}
-	p.Print(nn.Prefix)
-	io.WriteString(p.w, "\\")
-	p.printFreeFloating(nn, token.Slash)
-
-	io.WriteString(p.w, "{")
-	p.joinPrint(",", nn.UseList)
-	p.printFreeFloating(nn, token.Stmts)
-	io.WriteString(p.w, "}")
-	p.printFreeFloating(nn, token.UseDeclarationList)
-
-	p.printFreeFloating(nn, token.SemiColon)
-	if nn.GetNode().Tokens.IsEmpty() {
-		io.WriteString(p.w, ";")
-	}
-
-	p.printFreeFloating(nn, token.End)
-}
-
 func (p *Printer) printStmtHaltCompiler(n ast.Vertex) {
 	nn := n.(*ast.StmtHaltCompiler)
 	p.printFreeFloating(nn, token.Start)
@@ -3197,59 +3192,78 @@ func (p *Printer) printStmtUnset(n ast.Vertex) {
 	p.printFreeFloating(nn, token.End)
 }
 
-func (p *Printer) printStmtUseList(n ast.Vertex) {
-	nn := n.(*ast.StmtUseList)
+func (p *Printer) printStmtUse(n ast.Vertex) {
+	nn := n.(*ast.StmtUse)
 	p.printFreeFloating(nn, token.Start)
 
 	io.WriteString(p.w, "use")
 
-	if nn.UseType != nil {
-		if nn.UseType.GetNode().Tokens.IsEmpty() {
-			io.WriteString(p.w, " ")
-		}
-		p.Print(nn.UseType)
+	p.bufStart = " "
+	p.Print(nn.UseList)
+
+	p.printFreeFloatingOrDefault(nn, token.End, ";")
+}
+
+func (p *Printer) printStmtGroupUseList(n ast.Vertex) {
+	nn := n.(*ast.StmtGroupUseList)
+	p.printFreeFloating(nn, token.Start)
+
+	p.Print(nn.Prefix)
+
+	p.bufStart = "\\{"
+	p.bufEnd = "}"
+	p.Print(nn.UseList)
+
+	p.printFreeFloating(nn, token.End)
+}
+
+func (p *Printer) printStmtUseList(n ast.Vertex) {
+	nn := n.(*ast.StmtUseList)
+
+	bufEnd := p.bufEnd
+	p.bufEnd = ""
+
+	if p.bufStart == "\\{" {
+		p.printFreeFloatingOrDefault(nn, token.Start, p.bufStart)
+		p.bufStart = ""
+	} else {
+		p.printFreeFloating(nn, token.Start)
 	}
 
-	if nn.Uses[0].GetNode().Tokens.IsEmpty() {
-		io.WriteString(p.w, " ")
-	}
-	p.joinPrint(",", nn.Uses)
-	p.printFreeFloating(nn, token.UseDeclarationList)
+	p.joinPrint(",", nn.UseDeclarations)
 
-	p.printFreeFloating(nn, token.SemiColon)
-	if nn.GetNode().Tokens.IsEmpty() {
-		io.WriteString(p.w, ";")
+	p.printFreeFloatingOrDefault(nn, token.End, bufEnd)
+}
+
+func (p *Printer) printStmtUseDeclaration(n ast.Vertex) {
+	nn := n.(*ast.StmtUseDeclaration)
+	p.printFreeFloating(nn, token.Start)
+
+	if nn.Alias != nil {
+		p.bufEnd = " "
+	}
+
+	p.Print(nn.Use)
+
+	if nn.Alias != nil {
+		io.WriteString(p.w, "as")
+
+		p.bufStart = " "
+		p.Print(nn.Alias)
 	}
 
 	p.printFreeFloating(nn, token.End)
 }
 
-func (p *Printer) printStmtUse(n ast.Vertex) {
-	nn := n.(*ast.StmtUse)
+func (p *Printer) printStmtUseType(n ast.Vertex) {
+	nn := n.(*ast.StmtUseType)
 	p.printFreeFloating(nn, token.Start)
 
-	if nn.UseType != nil {
-		p.Print(nn.UseType)
-		if nn.UseType.GetNode().Tokens.IsEmpty() {
-			io.WriteString(p.w, " ")
-		}
-	}
-
-	p.printFreeFloating(nn, token.Slash)
+	p.Print(nn.Type)
 
+	p.bufStart = " "
 	p.Print(nn.Use)
 
-	if nn.Alias != nil {
-		if nn.Alias.GetNode().Tokens.IsEmpty() {
-			io.WriteString(p.w, " ")
-		}
-		io.WriteString(p.w, "as")
-		if nn.Alias.GetNode().Tokens.IsEmpty() {
-			io.WriteString(p.w, " ")
-		}
-		p.Print(nn.Alias)
-	}
-
 	p.printFreeFloating(nn, token.End)
 }
 
diff --git a/pkg/printer/printer_test.go b/pkg/printer/printer_test.go
index c7a8303..8e85ac0 100644
--- a/pkg/printer/printer_test.go
+++ b/pkg/printer/printer_test.go
@@ -3673,32 +3673,6 @@ func TestPrinterPrintStmtGoto(t *testing.T) {
 	}
 }
 
-func TestPrinterPrintStmtGroupUse(t *testing.T) {
-	o := bytes.NewBufferString("")
-
-	p := printer.NewPrinter(o)
-	p.Print(&ast.StmtGroupUse{
-		UseType: &ast.Identifier{Value: []byte("function")},
-		Prefix:  &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
-		UseList: []ast.Vertex{
-			&ast.StmtUse{
-				Use:   &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Bar")}}},
-				Alias: &ast.Identifier{Value: []byte("Baz")},
-			},
-			&ast.StmtUse{
-				Use: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Quuz")}}},
-			},
-		},
-	})
-
-	expected := `use function Foo\{Bar as Baz,Quuz};`
-	actual := o.String()
-
-	if expected != actual {
-		t.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
-	}
-}
-
 func TestPrinterPrintHaltCompiler(t *testing.T) {
 	o := bytes.NewBufferString("")
 
@@ -4412,24 +4386,21 @@ func TestPrinterPrintStmtUnset(t *testing.T) {
 	}
 }
 
-func TestPrinterPrintStmtUseList(t *testing.T) {
+func TestPrinterPrintUse(t *testing.T) {
 	o := bytes.NewBufferString("")
 
 	p := printer.NewPrinter(o)
-	p.Print(&ast.StmtUseList{
-		UseType: &ast.Identifier{Value: []byte("function")},
-		Uses: []ast.Vertex{
-			&ast.StmtUse{
-				Use:   &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
-				Alias: &ast.Identifier{Value: []byte("Bar")},
-			},
-			&ast.StmtUse{
-				Use: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Baz")}}},
+	p.Print(&ast.StmtUse{
+		UseList: &ast.StmtUseList{
+			UseDeclarations: []ast.Vertex{
+				&ast.StmtUseDeclaration{
+					Use: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
+				},
 			},
 		},
 	})
 
-	expected := `use function Foo as Bar,Baz;`
+	expected := `use Foo;`
 	actual := o.String()
 
 	if expected != actual {
@@ -4437,14 +4408,74 @@ func TestPrinterPrintStmtUseList(t *testing.T) {
 	}
 }
 
-func TestPrinterPrintUse(t *testing.T) {
+func TestPrinterPrintStmtGroupUseList(t *testing.T) {
 	o := bytes.NewBufferString("")
 
 	p := printer.NewPrinter(o)
-	p.Print(&ast.StmtUse{
-		UseType: &ast.Identifier{Value: []byte("function")},
-		Use:     &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
-		Alias:   &ast.Identifier{Value: []byte("Bar")},
+	p.Print(&ast.StmtGroupUseList{
+		Prefix:  &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
+		UseList: &ast.StmtUseList{},
+	})
+
+	expected := `Foo\{}`
+	actual := o.String()
+
+	if expected != actual {
+		t.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
+	}
+}
+
+func TestPrinterPrintStmtUseList(t *testing.T) {
+	o := bytes.NewBufferString("")
+
+	p := printer.NewPrinter(o)
+	p.Print(&ast.StmtUseList{
+		UseDeclarations: []ast.Vertex{
+			&ast.StmtUseDeclaration{
+				Use:   &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
+				Alias: &ast.Identifier{Value: []byte("Bar")},
+			},
+			&ast.StmtUseDeclaration{
+				Use: &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Baz")}}},
+			},
+		},
+	})
+
+	expected := `Foo as Bar,Baz`
+	actual := o.String()
+
+	if expected != actual {
+		t.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
+	}
+}
+
+func TestPrinterPrintUseDeclaration(t *testing.T) {
+	o := bytes.NewBufferString("")
+
+	p := printer.NewPrinter(o)
+	p.Print(&ast.StmtUseDeclaration{
+		Use:   &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
+		Alias: &ast.Identifier{Value: []byte("Bar")},
+	})
+
+	expected := `Foo as Bar`
+	actual := o.String()
+
+	if expected != actual {
+		t.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
+	}
+}
+
+func TestPrinterPrintUseType(t *testing.T) {
+	o := bytes.NewBufferString("")
+
+	p := printer.NewPrinter(o)
+	p.Print(&ast.StmtUseType{
+		Type: &ast.Identifier{Value: []byte("function")},
+		Use: &ast.StmtUseDeclaration{
+			Use:   &ast.NameName{Parts: []ast.Vertex{&ast.NameNamePart{Value: []byte("Foo")}}},
+			Alias: &ast.Identifier{Value: []byte("Bar")},
+		},
 	})
 
 	expected := `function Foo as Bar`
diff --git a/pkg/token/position.go b/pkg/token/position.go
index 7032e5a..1a3b02d 100644
--- a/pkg/token/position.go
+++ b/pkg/token/position.go
@@ -6,7 +6,6 @@ type Position int
 const (
 	Start Position = iota
 	End
-	Slash
 	Colon
 	SemiColon
 	AltEnd
diff --git a/pkg/token/position_string.go b/pkg/token/position_string.go
index cc51fe2..a2f713a 100644
--- a/pkg/token/position_string.go
+++ b/pkg/token/position_string.go
@@ -10,85 +10,84 @@ func _() {
 	var x [1]struct{}
 	_ = x[Start-0]
 	_ = x[End-1]
-	_ = x[Slash-2]
-	_ = x[Colon-3]
-	_ = x[SemiColon-4]
-	_ = x[AltEnd-5]
-	_ = x[Dollar-6]
-	_ = x[Ampersand-7]
-	_ = x[Name-8]
-	_ = x[Prefix-9]
-	_ = x[Key-10]
-	_ = x[Var-11]
-	_ = x[UseType-12]
-	_ = x[ReturnType-13]
-	_ = x[OptionalType-14]
-	_ = x[CaseSeparator-15]
-	_ = x[LexicalVars-16]
-	_ = x[Params-17]
-	_ = x[Ref-18]
-	_ = x[Cast-19]
-	_ = x[Expr-20]
-	_ = x[InitExpr-21]
-	_ = x[CondExpr-22]
-	_ = x[IncExpr-23]
-	_ = x[True-24]
-	_ = x[Cond-25]
-	_ = x[HaltCompiller-26]
-	_ = x[Namespace-27]
-	_ = x[Static-28]
-	_ = x[Class-29]
-	_ = x[Use-30]
-	_ = x[While-31]
-	_ = x[For-32]
-	_ = x[Switch-33]
-	_ = x[Break-34]
-	_ = x[Foreach-35]
-	_ = x[Declare-36]
-	_ = x[Label-37]
-	_ = x[Finally-38]
-	_ = x[List-39]
-	_ = x[Default-40]
-	_ = x[If-41]
-	_ = x[ElseIf-42]
-	_ = x[Else-43]
-	_ = x[Variadic-44]
-	_ = x[Function-45]
-	_ = x[DoubleArrow-46]
-	_ = x[Alias-47]
-	_ = x[As-48]
-	_ = x[Equal-49]
-	_ = x[Exit-50]
-	_ = x[Array-51]
-	_ = x[Isset-52]
-	_ = x[Empty-53]
-	_ = x[Eval-54]
-	_ = x[Echo-55]
-	_ = x[Try-56]
-	_ = x[Catch-57]
-	_ = x[Unset-58]
-	_ = x[Stmts-59]
-	_ = x[VarList-60]
-	_ = x[ConstList-61]
-	_ = x[NameList-62]
-	_ = x[ParamList-63]
-	_ = x[ModifierList-64]
-	_ = x[ArrayPairList-65]
-	_ = x[CaseListStart-66]
-	_ = x[CaseListEnd-67]
-	_ = x[ArgumentList-68]
-	_ = x[PropertyList-69]
-	_ = x[ParameterList-70]
-	_ = x[AdaptationList-71]
-	_ = x[LexicalVarList-72]
-	_ = x[UseDeclarationList-73]
-	_ = x[OpenParenthesisToken-74]
-	_ = x[CloseParenthesisToken-75]
+	_ = x[Colon-2]
+	_ = x[SemiColon-3]
+	_ = x[AltEnd-4]
+	_ = x[Dollar-5]
+	_ = x[Ampersand-6]
+	_ = x[Name-7]
+	_ = x[Prefix-8]
+	_ = x[Key-9]
+	_ = x[Var-10]
+	_ = x[UseType-11]
+	_ = x[ReturnType-12]
+	_ = x[OptionalType-13]
+	_ = x[CaseSeparator-14]
+	_ = x[LexicalVars-15]
+	_ = x[Params-16]
+	_ = x[Ref-17]
+	_ = x[Cast-18]
+	_ = x[Expr-19]
+	_ = x[InitExpr-20]
+	_ = x[CondExpr-21]
+	_ = x[IncExpr-22]
+	_ = x[True-23]
+	_ = x[Cond-24]
+	_ = x[HaltCompiller-25]
+	_ = x[Namespace-26]
+	_ = x[Static-27]
+	_ = x[Class-28]
+	_ = x[Use-29]
+	_ = x[While-30]
+	_ = x[For-31]
+	_ = x[Switch-32]
+	_ = x[Break-33]
+	_ = x[Foreach-34]
+	_ = x[Declare-35]
+	_ = x[Label-36]
+	_ = x[Finally-37]
+	_ = x[List-38]
+	_ = x[Default-39]
+	_ = x[If-40]
+	_ = x[ElseIf-41]
+	_ = x[Else-42]
+	_ = x[Variadic-43]
+	_ = x[Function-44]
+	_ = x[DoubleArrow-45]
+	_ = x[Alias-46]
+	_ = x[As-47]
+	_ = x[Equal-48]
+	_ = x[Exit-49]
+	_ = x[Array-50]
+	_ = x[Isset-51]
+	_ = x[Empty-52]
+	_ = x[Eval-53]
+	_ = x[Echo-54]
+	_ = x[Try-55]
+	_ = x[Catch-56]
+	_ = x[Unset-57]
+	_ = x[Stmts-58]
+	_ = x[VarList-59]
+	_ = x[ConstList-60]
+	_ = x[NameList-61]
+	_ = x[ParamList-62]
+	_ = x[ModifierList-63]
+	_ = x[ArrayPairList-64]
+	_ = x[CaseListStart-65]
+	_ = x[CaseListEnd-66]
+	_ = x[ArgumentList-67]
+	_ = x[PropertyList-68]
+	_ = x[ParameterList-69]
+	_ = x[AdaptationList-70]
+	_ = x[LexicalVarList-71]
+	_ = x[UseDeclarationList-72]
+	_ = x[OpenParenthesisToken-73]
+	_ = x[CloseParenthesisToken-74]
 }
 
-const _Position_name = "StartEndSlashColonSemiColonAltEndDollarAmpersandNamePrefixKeyVarUseTypeReturnTypeOptionalTypeCaseSeparatorLexicalVarsParamsRefCastExprInitExprCondExprIncExprTrueCondHaltCompillerNamespaceStaticClassUseWhileForSwitchBreakForeachDeclareLabelFinallyListDefaultIfElseIfElseVariadicFunctionDoubleArrowAliasAsEqualExitArrayIssetEmptyEvalEchoTryCatchUnsetStmtsVarListConstListNameListParamListModifierListArrayPairListCaseListStartCaseListEndArgumentListPropertyListParameterListAdaptationListLexicalVarListUseDeclarationListOpenParenthesisTokenCloseParenthesisToken"
+const _Position_name = "StartEndColonSemiColonAltEndDollarAmpersandNamePrefixKeyVarUseTypeReturnTypeOptionalTypeCaseSeparatorLexicalVarsParamsRefCastExprInitExprCondExprIncExprTrueCondHaltCompillerNamespaceStaticClassUseWhileForSwitchBreakForeachDeclareLabelFinallyListDefaultIfElseIfElseVariadicFunctionDoubleArrowAliasAsEqualExitArrayIssetEmptyEvalEchoTryCatchUnsetStmtsVarListConstListNameListParamListModifierListArrayPairListCaseListStartCaseListEndArgumentListPropertyListParameterListAdaptationListLexicalVarListUseDeclarationListOpenParenthesisTokenCloseParenthesisToken"
 
-var _Position_index = [...]uint16{0, 5, 8, 13, 18, 27, 33, 39, 48, 52, 58, 61, 64, 71, 81, 93, 106, 117, 123, 126, 130, 134, 142, 150, 157, 161, 165, 178, 187, 193, 198, 201, 206, 209, 215, 220, 227, 234, 239, 246, 250, 257, 259, 265, 269, 277, 285, 296, 301, 303, 308, 312, 317, 322, 327, 331, 335, 338, 343, 348, 353, 360, 369, 377, 386, 398, 411, 424, 435, 447, 459, 472, 486, 500, 518, 538, 559}
+var _Position_index = [...]uint16{0, 5, 8, 13, 22, 28, 34, 43, 47, 53, 56, 59, 66, 76, 88, 101, 112, 118, 121, 125, 129, 137, 145, 152, 156, 160, 173, 182, 188, 193, 196, 201, 204, 210, 215, 222, 229, 234, 241, 245, 252, 254, 260, 264, 272, 280, 291, 296, 298, 303, 307, 312, 317, 322, 326, 330, 333, 338, 343, 348, 355, 364, 372, 381, 393, 406, 419, 430, 442, 454, 467, 481, 495, 513, 533, 554}
 
 func (i Position) String() string {
 	if i < 0 || i >= Position(len(_Position_index)-1) {