refactoring: remove "StmtTraitMethodRef" node

internal/php5/parser_test.go

@@ -24032,44 +24032,36 @@ func TestStmtTraitUse_Modifier(t *testing.T) {
 									StartPos:  30,
 									EndPos:    43,
 								},
-								Ref: &ast.StmtTraitMethodRef{
+								Method: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  30,
 										EndPos:    33,
 									},
-									Method: &ast.Identifier{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("one"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
 											EndPos:    33,
 										},
-										IdentifierTkn: &token.Token{
-											ID:    token.T_STRING,
-											Value: []byte("one"),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  30,
-												EndPos:    33,
-											},
-											FreeFloating: []*token.Token{
-												{
-													ID:    token.T_WHITESPACE,
-													Value: []byte(" "),
-													Position: &position.Position{
-														StartLine: 1,
-														EndLine:   1,
-														StartPos:  29,
-														EndPos:    30,
-													},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  29,
+													EndPos:    30,
 												},
 											},
 										},
-										Value: []byte("one"),
 									},
+									Value: []byte("one"),
 								},
 								AsTkn: &token.Token{
 									ID:    token.T_AS,
@@ -24453,44 +24445,36 @@ func TestStmtTraitUse_AliasModifier(t *testing.T) {
 									StartPos:  30,
 									EndPos:    47,
 								},
-								Ref: &ast.StmtTraitMethodRef{
+								Method: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  30,
 										EndPos:    33,
 									},
-									Method: &ast.Identifier{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("one"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
 											EndPos:    33,
 										},
-										IdentifierTkn: &token.Token{
-											ID:    token.T_STRING,
-											Value: []byte("one"),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  30,
-												EndPos:    33,
-											},
-											FreeFloating: []*token.Token{
-												{
-													ID:    token.T_WHITESPACE,
-													Value: []byte(" "),
-													Position: &position.Position{
-														StartLine: 1,
-														EndLine:   1,
-														StartPos:  29,
-														EndPos:    30,
-													},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  29,
+													EndPos:    30,
 												},
 											},
 										},
-										Value: []byte("one"),
 									},
+									Value: []byte("one"),
 								},
 								AsTkn: &token.Token{
 									ID:    token.T_AS,
@@ -24905,83 +24889,75 @@ func TestStmtTraitUse_Adaptions(t *testing.T) {
 									StartPos:  30,
 									EndPos:    58,
 								},
-								Ref: &ast.StmtTraitMethodRef{
+								Trait: &ast.NameName{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  30,
-										EndPos:    38,
+										EndPos:    33,
 									},
-									Trait: &ast.NameName{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  30,
-											EndPos:    33,
-										},
-										Parts: []ast.Vertex{
-											&ast.NameNamePart{
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  30,
+												EndPos:    33,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("Bar"),
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
 													StartPos:  30,
 													EndPos:    33,
 												},
-												StringTkn: &token.Token{
-													ID:    token.T_STRING,
-													Value: []byte("Bar"),
-													Position: &position.Position{
-														StartLine: 1,
-														EndLine:   1,
-														StartPos:  30,
-														EndPos:    33,
-													},
-													FreeFloating: []*token.Token{
-														{
-															ID:    token.T_WHITESPACE,
-															Value: []byte(" "),
-															Position: &position.Position{
-																StartLine: 1,
-																EndLine:   1,
-																StartPos:  29,
-																EndPos:    30,
-															},
+												FreeFloating: []*token.Token{
+													{
+														ID:    token.T_WHITESPACE,
+														Value: []byte(" "),
+														Position: &position.Position{
+															StartLine: 1,
+															EndLine:   1,
+															StartPos:  29,
+															EndPos:    30,
 														},
 													},
 												},
-												Value: []byte("Bar"),
 											},
+											Value: []byte("Bar"),
 										},
 									},
-									DoubleColonTkn: &token.Token{
-										ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
-										Value: []byte("::"),
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  33,
-											EndPos:    35,
-										},
+								},
+								DoubleColonTkn: &token.Token{
+									ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+									Value: []byte("::"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  33,
+										EndPos:    35,
 									},
-									Method: &ast.Identifier{
+								},
+								Method: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  35,
+										EndPos:    38,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("one"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  35,
 											EndPos:    38,
 										},
-										IdentifierTkn: &token.Token{
-											ID:    token.T_STRING,
-											Value: []byte("one"),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  35,
-												EndPos:    38,
-											},
-										},
-										Value: []byte("one"),
 									},
+									Value: []byte("one"),
 								},
 								InsteadofTkn: &token.Token{
 									ID:    token.T_INSTEADOF,
@@ -25119,83 +25095,75 @@ func TestStmtTraitUse_Adaptions(t *testing.T) {
 									StartPos:  60,
 									EndPos:    75,
 								},
-								Ref: &ast.StmtTraitMethodRef{
+								Trait: &ast.NameName{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  60,
-										EndPos:    68,
+										EndPos:    63,
 									},
-									Trait: &ast.NameName{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  60,
-											EndPos:    63,
-										},
-										Parts: []ast.Vertex{
-											&ast.NameNamePart{
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  60,
+												EndPos:    63,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("Baz"),
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
 													StartPos:  60,
 													EndPos:    63,
 												},
-												StringTkn: &token.Token{
-													ID:    token.T_STRING,
-													Value: []byte("Baz"),
-													Position: &position.Position{
-														StartLine: 1,
-														EndLine:   1,
-														StartPos:  60,
-														EndPos:    63,
-													},
-													FreeFloating: []*token.Token{
-														{
-															ID:    token.T_WHITESPACE,
-															Value: []byte(" "),
-															Position: &position.Position{
-																StartLine: 1,
-																EndLine:   1,
-																StartPos:  59,
-																EndPos:    60,
-															},
+												FreeFloating: []*token.Token{
+													{
+														ID:    token.T_WHITESPACE,
+														Value: []byte(" "),
+														Position: &position.Position{
+															StartLine: 1,
+															EndLine:   1,
+															StartPos:  59,
+															EndPos:    60,
 														},
 													},
 												},
-												Value: []byte("Baz"),
 											},
+											Value: []byte("Baz"),
 										},
 									},
-									DoubleColonTkn: &token.Token{
-										ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
-										Value: []byte("::"),
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  63,
-											EndPos:    65,
-										},
+								},
+								DoubleColonTkn: &token.Token{
+									ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+									Value: []byte("::"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  63,
+										EndPos:    65,
 									},
-									Method: &ast.Identifier{
+								},
+								Method: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  65,
+										EndPos:    68,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("one"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  65,
 											EndPos:    68,
 										},
-										IdentifierTkn: &token.Token{
-											ID:    token.T_STRING,
-											Value: []byte("one"),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  65,
-												EndPos:    68,
-											},
-										},
-										Value: []byte("one"),
 									},
+									Value: []byte("one"),
 								},
 								AsTkn: &token.Token{
 									ID:    token.T_AS,

internal/php5/php5.y

@@ -2295,10 +2295,12 @@ trait_precedence:
             {
                 $$ = &ast.StmtTraitUsePrecedence{
                     Position: yylex.(*Parser).builder.NewNodeNodeListPosition($1, $3.(*ast.ParserSeparatedList).Items),
-                    Ref:           $1,
-                    InsteadofTkn:  $2,
-                    Insteadof:     $3.(*ast.ParserSeparatedList).Items,
-                    SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns,
+                    Trait:          $1.(*ast.TraitMethodRef).Trait,
+                    DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn,
+                    Method:         $1.(*ast.TraitMethodRef).Method,
+                    InsteadofTkn:   $2,
+                    Insteadof:      $3.(*ast.ParserSeparatedList).Items,
+                    SeparatorTkns:  $3.(*ast.ParserSeparatedList).SeparatorTkns,
                 }
             }
 ;
@@ -2322,7 +2324,7 @@ trait_reference_list:
 trait_method_reference:
         T_STRING
             {
-                $$ = &ast.StmtTraitMethodRef{
+                $$ = &ast.TraitMethodRef{
                     Position: yylex.(*Parser).builder.NewTokenPosition($1),
                     Method: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
@@ -2340,7 +2342,7 @@ trait_method_reference:
 trait_method_reference_fully_qualified:
         fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING
             {
-                $$ = &ast.StmtTraitMethodRef{
+                $$ = &ast.TraitMethodRef{
                     Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3),
                     Trait:          $1,
                     DoubleColonTkn: $2,
@@ -2357,10 +2359,12 @@ trait_alias:
         trait_method_reference T_AS trait_modifiers T_STRING
             {
                 $$ = &ast.StmtTraitUseAlias{
-                    Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $4),
-                    Ref:      $1,
-                    AsTkn:    $2,
-                    Modifier: $3,
+                    Position:       yylex.(*Parser).builder.NewNodeTokenPosition($1, $4),
+                    Trait:          $1.(*ast.TraitMethodRef).Trait,
+                    DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn,
+                    Method:         $1.(*ast.TraitMethodRef).Method,
+                    AsTkn:          $2,
+                    Modifier:       $3,
                     Alias: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($4),
                         IdentifierTkn: $4,
@@ -2371,10 +2375,12 @@ trait_alias:
     |   trait_method_reference T_AS member_modifier
             {
                 $$ = &ast.StmtTraitUseAlias{
-                    Position: yylex.(*Parser).builder.NewNodesPosition($1, $3),
-                    Ref:      $1,
-                    AsTkn:    $2,
-                    Modifier: $3,
+                    Position:       yylex.(*Parser).builder.NewNodesPosition($1, $3),
+                    Trait:          $1.(*ast.TraitMethodRef).Trait,
+                    DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn,
+                    Method:         $1.(*ast.TraitMethodRef).Method,
+                    AsTkn:          $2,
+                    Modifier:       $3,
                 }
             }
 ;

internal/php7/parser_test.go

@@ -26000,44 +26000,36 @@ func TestStmtTraitUse_Modifier(t *testing.T) {
 									StartPos:  30,
 									EndPos:    43,
 								},
-								Ref: &ast.StmtTraitMethodRef{
+								Method: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  30,
 										EndPos:    33,
 									},
-									Method: &ast.Identifier{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("one"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
 											EndPos:    33,
 										},
-										IdentifierTkn: &token.Token{
-											ID:    token.T_STRING,
-											Value: []byte("one"),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  30,
-												EndPos:    33,
-											},
-											FreeFloating: []*token.Token{
-												{
-													ID:    token.T_WHITESPACE,
-													Value: []byte(" "),
-													Position: &position.Position{
-														StartLine: 1,
-														EndLine:   1,
-														StartPos:  29,
-														EndPos:    30,
-													},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  29,
+													EndPos:    30,
 												},
 											},
 										},
-										Value: []byte("one"),
 									},
+									Value: []byte("one"),
 								},
 								AsTkn: &token.Token{
 									ID:    token.T_AS,
@@ -26421,44 +26413,36 @@ func TestStmtTraitUse_AliasModifier(t *testing.T) {
 									StartPos:  30,
 									EndPos:    47,
 								},
-								Ref: &ast.StmtTraitMethodRef{
+								Method: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  30,
 										EndPos:    33,
 									},
-									Method: &ast.Identifier{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("one"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
 											EndPos:    33,
 										},
-										IdentifierTkn: &token.Token{
-											ID:    token.T_STRING,
-											Value: []byte("one"),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  30,
-												EndPos:    33,
-											},
-											FreeFloating: []*token.Token{
-												{
-													ID:    token.T_WHITESPACE,
-													Value: []byte(" "),
-													Position: &position.Position{
-														StartLine: 1,
-														EndLine:   1,
-														StartPos:  29,
-														EndPos:    30,
-													},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  29,
+													EndPos:    30,
 												},
 											},
 										},
-										Value: []byte("one"),
 									},
+									Value: []byte("one"),
 								},
 								AsTkn: &token.Token{
 									ID:    token.T_AS,
@@ -26873,83 +26857,75 @@ func TestStmtTraitUse_Adaptions(t *testing.T) {
 									StartPos:  30,
 									EndPos:    58,
 								},
-								Ref: &ast.StmtTraitMethodRef{
+								Trait: &ast.NameName{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  30,
-										EndPos:    38,
+										EndPos:    33,
 									},
-									Trait: &ast.NameName{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  30,
-											EndPos:    33,
-										},
-										Parts: []ast.Vertex{
-											&ast.NameNamePart{
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  30,
+												EndPos:    33,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("Bar"),
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
 													StartPos:  30,
 													EndPos:    33,
 												},
-												StringTkn: &token.Token{
-													ID:    token.T_STRING,
-													Value: []byte("Bar"),
-													Position: &position.Position{
-														StartLine: 1,
-														EndLine:   1,
-														StartPos:  30,
-														EndPos:    33,
-													},
-													FreeFloating: []*token.Token{
-														{
-															ID:    token.T_WHITESPACE,
-															Value: []byte(" "),
-															Position: &position.Position{
-																StartLine: 1,
-																EndLine:   1,
-																StartPos:  29,
-																EndPos:    30,
-															},
+												FreeFloating: []*token.Token{
+													{
+														ID:    token.T_WHITESPACE,
+														Value: []byte(" "),
+														Position: &position.Position{
+															StartLine: 1,
+															EndLine:   1,
+															StartPos:  29,
+															EndPos:    30,
 														},
 													},
 												},
-												Value: []byte("Bar"),
 											},
+											Value: []byte("Bar"),
 										},
 									},
-									DoubleColonTkn: &token.Token{
-										ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
-										Value: []byte("::"),
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  33,
-											EndPos:    35,
-										},
+								},
+								DoubleColonTkn: &token.Token{
+									ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+									Value: []byte("::"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  33,
+										EndPos:    35,
 									},
-									Method: &ast.Identifier{
+								},
+								Method: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  35,
+										EndPos:    38,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("one"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  35,
 											EndPos:    38,
 										},
-										IdentifierTkn: &token.Token{
-											ID:    token.T_STRING,
-											Value: []byte("one"),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  35,
-												EndPos:    38,
-											},
-										},
-										Value: []byte("one"),
 									},
+									Value: []byte("one"),
 								},
 								InsteadofTkn: &token.Token{
 									ID:    token.T_INSTEADOF,
@@ -27087,83 +27063,75 @@ func TestStmtTraitUse_Adaptions(t *testing.T) {
 									StartPos:  60,
 									EndPos:    75,
 								},
-								Ref: &ast.StmtTraitMethodRef{
+								Trait: &ast.NameName{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  60,
-										EndPos:    68,
+										EndPos:    63,
 									},
-									Trait: &ast.NameName{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  60,
-											EndPos:    63,
-										},
-										Parts: []ast.Vertex{
-											&ast.NameNamePart{
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  60,
+												EndPos:    63,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("Baz"),
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
 													StartPos:  60,
 													EndPos:    63,
 												},
-												StringTkn: &token.Token{
-													ID:    token.T_STRING,
-													Value: []byte("Baz"),
-													Position: &position.Position{
-														StartLine: 1,
-														EndLine:   1,
-														StartPos:  60,
-														EndPos:    63,
-													},
-													FreeFloating: []*token.Token{
-														{
-															ID:    token.T_WHITESPACE,
-															Value: []byte(" "),
-															Position: &position.Position{
-																StartLine: 1,
-																EndLine:   1,
-																StartPos:  59,
-																EndPos:    60,
-															},
+												FreeFloating: []*token.Token{
+													{
+														ID:    token.T_WHITESPACE,
+														Value: []byte(" "),
+														Position: &position.Position{
+															StartLine: 1,
+															EndLine:   1,
+															StartPos:  59,
+															EndPos:    60,
 														},
 													},
 												},
-												Value: []byte("Baz"),
 											},
+											Value: []byte("Baz"),
 										},
 									},
-									DoubleColonTkn: &token.Token{
-										ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
-										Value: []byte("::"),
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  63,
-											EndPos:    65,
-										},
+								},
+								DoubleColonTkn: &token.Token{
+									ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+									Value: []byte("::"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  63,
+										EndPos:    65,
 									},
-									Method: &ast.Identifier{
+								},
+								Method: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  65,
+										EndPos:    68,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("one"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  65,
 											EndPos:    68,
 										},
-										IdentifierTkn: &token.Token{
-											ID:    token.T_STRING,
-											Value: []byte("one"),
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  65,
-												EndPos:    68,
-											},
-										},
-										Value: []byte("one"),
 									},
+									Value: []byte("one"),
 								},
 								AsTkn: &token.Token{
 									ID:    token.T_AS,

internal/php7/php7.y

@@ -2132,11 +2132,13 @@ trait_precedence:
         absolute_trait_method_reference T_INSTEADOF name_list
             {
                 $$ = &ast.StmtTraitUsePrecedence{
-                    Position: yylex.(*Parser).builder.NewNodeNodeListPosition($1, $3.(*ast.ParserSeparatedList).Items),
-                    Ref:           $1,
-                    InsteadofTkn:  $2,
-                    Insteadof:     $3.(*ast.ParserSeparatedList).Items,
-                    SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns,
+                    Position:       yylex.(*Parser).builder.NewNodeNodeListPosition($1, $3.(*ast.ParserSeparatedList).Items),
+                    Trait:          $1.(*ast.TraitMethodRef).Trait,
+                    DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn,
+                    Method:         $1.(*ast.TraitMethodRef).Method,
+                    InsteadofTkn:   $2,
+                    Insteadof:      $3.(*ast.ParserSeparatedList).Items,
+                    SeparatorTkns:  $3.(*ast.ParserSeparatedList).SeparatorTkns,
                 }
             }
 ;
@@ -2145,9 +2147,11 @@ trait_alias:
         trait_method_reference T_AS T_STRING
             {
                 $$ = &ast.StmtTraitUseAlias{
-                    Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3),
-                    Ref:   $1,
-                    AsTkn: $2,
+                    Position:       yylex.(*Parser).builder.NewNodeTokenPosition($1, $3),
+                    Trait:          $1.(*ast.TraitMethodRef).Trait,
+                    DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn,
+                    Method:         $1.(*ast.TraitMethodRef).Method,
+                    AsTkn:          $2,
                     Alias: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($3),
                         IdentifierTkn: $3,
@@ -2158,9 +2162,11 @@ trait_alias:
     |   trait_method_reference T_AS reserved_non_modifiers
             {
                 $$ = &ast.StmtTraitUseAlias{
-                    Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3),
-                    Ref:   $1,
-                    AsTkn: $2,
+                    Position:       yylex.(*Parser).builder.NewNodeTokenPosition($1, $3),
+                    Trait:          $1.(*ast.TraitMethodRef).Trait,
+                    DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn,
+                    Method:         $1.(*ast.TraitMethodRef).Method,
+                    AsTkn:          $2,
                     Alias: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($3),
                         IdentifierTkn: $3,
@@ -2171,10 +2177,12 @@ trait_alias:
     |   trait_method_reference T_AS member_modifier identifier
             {
                 $$ = &ast.StmtTraitUseAlias{
-                    Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $4),
-                    Ref:      $1,
-                    AsTkn:    $2,
-                    Modifier: $3,
+                    Position:       yylex.(*Parser).builder.NewNodeTokenPosition($1, $4),
+                    Trait:          $1.(*ast.TraitMethodRef).Trait,
+                    DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn,
+                    Method:         $1.(*ast.TraitMethodRef).Method,
+                    AsTkn:          $2,
+                    Modifier:       $3,
                     Alias: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($4),
                         IdentifierTkn: $4,
@@ -2185,10 +2193,12 @@ trait_alias:
     |   trait_method_reference T_AS member_modifier
             {
                 $$ = &ast.StmtTraitUseAlias{
-                    Position: yylex.(*Parser).builder.NewNodesPosition($1, $3),
-                    Ref:      $1,
-                    AsTkn:    $2,
-                    Modifier: $3,
+                    Position:       yylex.(*Parser).builder.NewNodesPosition($1, $3),
+                    Trait:          $1.(*ast.TraitMethodRef).Trait,
+                    DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn,
+                    Method:         $1.(*ast.TraitMethodRef).Method,
+                    AsTkn:          $2,
+                    Modifier:       $3,
                 }
             }
 ;
@@ -2196,7 +2206,7 @@ trait_alias:
 trait_method_reference:
         identifier
             {
-                $$ = &ast.StmtTraitMethodRef{
+                $$ = &ast.TraitMethodRef{
                     Position: yylex.(*Parser).builder.NewTokenPosition($1),
                     Method: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
@@ -2214,7 +2224,7 @@ trait_method_reference:
 absolute_trait_method_reference:
         name T_PAAMAYIM_NEKUDOTAYIM identifier
             {
-                $$ = &ast.StmtTraitMethodRef{
+                $$ = &ast.TraitMethodRef{
                     Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3),
                     Trait:          $1,
                     DoubleColonTkn: $2,