Skip to content

Commit c0465f9

Browse files
z7zmeyz7zmey
committed
refactoring: remove "StmtTraitMethodRef" node
1 parent c29e8ec commit c0465f9

File tree

17 files changed

+1081
-1164
lines changed

17 files changed

+1081
-1164
lines changed

‎internal/php5/parser_test.go

Lines changed: 116 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -24032,44 +24032,36 @@ func TestStmtTraitUse_Modifier(t *testing.T) {
2403224032
StartPos: 30,
2403324033
EndPos: 43,
2403424034
},
24035-
Ref: &ast.StmtTraitMethodRef{
24035+
Method: &ast.Identifier{
2403624036
Position: &position.Position{
2403724037
StartLine: 1,
2403824038
EndLine: 1,
2403924039
StartPos: 30,
2404024040
EndPos: 33,
2404124041
},
24042-
Method: &ast.Identifier{
24042+
IdentifierTkn: &token.Token{
24043+
ID: token.T_STRING,
24044+
Value: []byte("one"),
2404324045
Position: &position.Position{
2404424046
StartLine: 1,
2404524047
EndLine: 1,
2404624048
StartPos: 30,
2404724049
EndPos: 33,
2404824050
},
24049-
IdentifierTkn: &token.Token{
24050-
ID: token.T_STRING,
24051-
Value: []byte("one"),
24052-
Position: &position.Position{
24053-
StartLine: 1,
24054-
EndLine: 1,
24055-
StartPos: 30,
24056-
EndPos: 33,
24057-
},
24058-
FreeFloating: []*token.Token{
24059-
{
24060-
ID: token.T_WHITESPACE,
24061-
Value: []byte(" "),
24062-
Position: &position.Position{
24063-
StartLine: 1,
24064-
EndLine: 1,
24065-
StartPos: 29,
24066-
EndPos: 30,
24067-
},
24051+
FreeFloating: []*token.Token{
24052+
{
24053+
ID: token.T_WHITESPACE,
24054+
Value: []byte(" "),
24055+
Position: &position.Position{
24056+
StartLine: 1,
24057+
EndLine: 1,
24058+
StartPos: 29,
24059+
EndPos: 30,
2406824060
},
2406924061
},
2407024062
},
24071-
Value: []byte("one"),
2407224063
},
24064+
Value: []byte("one"),
2407324065
},
2407424066
AsTkn: &token.Token{
2407524067
ID: token.T_AS,
@@ -24453,44 +24445,36 @@ func TestStmtTraitUse_AliasModifier(t *testing.T) {
2445324445
StartPos: 30,
2445424446
EndPos: 47,
2445524447
},
24456-
Ref: &ast.StmtTraitMethodRef{
24448+
Method: &ast.Identifier{
2445724449
Position: &position.Position{
2445824450
StartLine: 1,
2445924451
EndLine: 1,
2446024452
StartPos: 30,
2446124453
EndPos: 33,
2446224454
},
24463-
Method: &ast.Identifier{
24455+
IdentifierTkn: &token.Token{
24456+
ID: token.T_STRING,
24457+
Value: []byte("one"),
2446424458
Position: &position.Position{
2446524459
StartLine: 1,
2446624460
EndLine: 1,
2446724461
StartPos: 30,
2446824462
EndPos: 33,
2446924463
},
24470-
IdentifierTkn: &token.Token{
24471-
ID: token.T_STRING,
24472-
Value: []byte("one"),
24473-
Position: &position.Position{
24474-
StartLine: 1,
24475-
EndLine: 1,
24476-
StartPos: 30,
24477-
EndPos: 33,
24478-
},
24479-
FreeFloating: []*token.Token{
24480-
{
24481-
ID: token.T_WHITESPACE,
24482-
Value: []byte(" "),
24483-
Position: &position.Position{
24484-
StartLine: 1,
24485-
EndLine: 1,
24486-
StartPos: 29,
24487-
EndPos: 30,
24488-
},
24464+
FreeFloating: []*token.Token{
24465+
{
24466+
ID: token.T_WHITESPACE,
24467+
Value: []byte(" "),
24468+
Position: &position.Position{
24469+
StartLine: 1,
24470+
EndLine: 1,
24471+
StartPos: 29,
24472+
EndPos: 30,
2448924473
},
2449024474
},
2449124475
},
24492-
Value: []byte("one"),
2449324476
},
24477+
Value: []byte("one"),
2449424478
},
2449524479
AsTkn: &token.Token{
2449624480
ID: token.T_AS,
@@ -24905,83 +24889,75 @@ func TestStmtTraitUse_Adaptions(t *testing.T) {
2490524889
StartPos: 30,
2490624890
EndPos: 58,
2490724891
},
24908-
Ref: &ast.StmtTraitMethodRef{
24892+
Trait: &ast.NameName{
2490924893
Position: &position.Position{
2491024894
StartLine: 1,
2491124895
EndLine: 1,
2491224896
StartPos: 30,
24913-
EndPos: 38,
24897+
EndPos: 33,
2491424898
},
24915-
Trait: &ast.NameName{
24916-
Position: &position.Position{
24917-
StartLine: 1,
24918-
EndLine: 1,
24919-
StartPos: 30,
24920-
EndPos: 33,
24921-
},
24922-
Parts: []ast.Vertex{
24923-
&ast.NameNamePart{
24899+
Parts: []ast.Vertex{
24900+
&ast.NameNamePart{
24901+
Position: &position.Position{
24902+
StartLine: 1,
24903+
EndLine: 1,
24904+
StartPos: 30,
24905+
EndPos: 33,
24906+
},
24907+
StringTkn: &token.Token{
24908+
ID: token.T_STRING,
24909+
Value: []byte("Bar"),
2492424910
Position: &position.Position{
2492524911
StartLine: 1,
2492624912
EndLine: 1,
2492724913
StartPos: 30,
2492824914
EndPos: 33,
2492924915
},
24930-
StringTkn: &token.Token{
24931-
ID: token.T_STRING,
24932-
Value: []byte("Bar"),
24933-
Position: &position.Position{
24934-
StartLine: 1,
24935-
EndLine: 1,
24936-
StartPos: 30,
24937-
EndPos: 33,
24938-
},
24939-
FreeFloating: []*token.Token{
24940-
{
24941-
ID: token.T_WHITESPACE,
24942-
Value: []byte(" "),
24943-
Position: &position.Position{
24944-
StartLine: 1,
24945-
EndLine: 1,
24946-
StartPos: 29,
24947-
EndPos: 30,
24948-
},
24916+
FreeFloating: []*token.Token{
24917+
{
24918+
ID: token.T_WHITESPACE,
24919+
Value: []byte(" "),
24920+
Position: &position.Position{
24921+
StartLine: 1,
24922+
EndLine: 1,
24923+
StartPos: 29,
24924+
EndPos: 30,
2494924925
},
2495024926
},
2495124927
},
24952-
Value: []byte("Bar"),
2495324928
},
24929+
Value: []byte("Bar"),
2495424930
},
2495524931
},
24956-
DoubleColonTkn: &token.Token{
24957-
ID: token.T_PAAMAYIM_NEKUDOTAYIM,
24958-
Value: []byte("::"),
24959-
Position: &position.Position{
24960-
StartLine: 1,
24961-
EndLine: 1,
24962-
StartPos: 33,
24963-
EndPos: 35,
24964-
},
24932+
},
24933+
DoubleColonTkn: &token.Token{
24934+
ID: token.T_PAAMAYIM_NEKUDOTAYIM,
24935+
Value: []byte("::"),
24936+
Position: &position.Position{
24937+
StartLine: 1,
24938+
EndLine: 1,
24939+
StartPos: 33,
24940+
EndPos: 35,
24941+
},
24942+
},
24943+
Method: &ast.Identifier{
24944+
Position: &position.Position{
24945+
StartLine: 1,
24946+
EndLine: 1,
24947+
StartPos: 35,
24948+
EndPos: 38,
2496524949
},
24966-
Method: &ast.Identifier{
24950+
IdentifierTkn: &token.Token{
24951+
ID: token.T_STRING,
24952+
Value: []byte("one"),
2496724953
Position: &position.Position{
2496824954
StartLine: 1,
2496924955
EndLine: 1,
2497024956
StartPos: 35,
2497124957
EndPos: 38,
2497224958
},
24973-
IdentifierTkn: &token.Token{
24974-
ID: token.T_STRING,
24975-
Value: []byte("one"),
24976-
Position: &position.Position{
24977-
StartLine: 1,
24978-
EndLine: 1,
24979-
StartPos: 35,
24980-
EndPos: 38,
24981-
},
24982-
},
24983-
Value: []byte("one"),
2498424959
},
24960+
Value: []byte("one"),
2498524961
},
2498624962
InsteadofTkn: &token.Token{
2498724963
ID: token.T_INSTEADOF,
@@ -25119,83 +25095,75 @@ func TestStmtTraitUse_Adaptions(t *testing.T) {
2511925095
StartPos: 60,
2512025096
EndPos: 75,
2512125097
},
25122-
Ref: &ast.StmtTraitMethodRef{
25098+
Trait: &ast.NameName{
2512325099
Position: &position.Position{
2512425100
StartLine: 1,
2512525101
EndLine: 1,
2512625102
StartPos: 60,
25127-
EndPos: 68,
25103+
EndPos: 63,
2512825104
},
25129-
Trait: &ast.NameName{
25130-
Position: &position.Position{
25131-
StartLine: 1,
25132-
EndLine: 1,
25133-
StartPos: 60,
25134-
EndPos: 63,
25135-
},
25136-
Parts: []ast.Vertex{
25137-
&ast.NameNamePart{
25105+
Parts: []ast.Vertex{
25106+
&ast.NameNamePart{
25107+
Position: &position.Position{
25108+
StartLine: 1,
25109+
EndLine: 1,
25110+
StartPos: 60,
25111+
EndPos: 63,
25112+
},
25113+
StringTkn: &token.Token{
25114+
ID: token.T_STRING,
25115+
Value: []byte("Baz"),
2513825116
Position: &position.Position{
2513925117
StartLine: 1,
2514025118
EndLine: 1,
2514125119
StartPos: 60,
2514225120
EndPos: 63,
2514325121
},
25144-
StringTkn: &token.Token{
25145-
ID: token.T_STRING,
25146-
Value: []byte("Baz"),
25147-
Position: &position.Position{
25148-
StartLine: 1,
25149-
EndLine: 1,
25150-
StartPos: 60,
25151-
EndPos: 63,
25152-
},
25153-
FreeFloating: []*token.Token{
25154-
{
25155-
ID: token.T_WHITESPACE,
25156-
Value: []byte(" "),
25157-
Position: &position.Position{
25158-
StartLine: 1,
25159-
EndLine: 1,
25160-
StartPos: 59,
25161-
EndPos: 60,
25162-
},
25122+
FreeFloating: []*token.Token{
25123+
{
25124+
ID: token.T_WHITESPACE,
25125+
Value: []byte(" "),
25126+
Position: &position.Position{
25127+
StartLine: 1,
25128+
EndLine: 1,
25129+
StartPos: 59,
25130+
EndPos: 60,
2516325131
},
2516425132
},
2516525133
},
25166-
Value: []byte("Baz"),
2516725134
},
25135+
Value: []byte("Baz"),
2516825136
},
2516925137
},
25170-
DoubleColonTkn: &token.Token{
25171-
ID: token.T_PAAMAYIM_NEKUDOTAYIM,
25172-
Value: []byte("::"),
25173-
Position: &position.Position{
25174-
StartLine: 1,
25175-
EndLine: 1,
25176-
StartPos: 63,
25177-
EndPos: 65,
25178-
},
25138+
},
25139+
DoubleColonTkn: &token.Token{
25140+
ID: token.T_PAAMAYIM_NEKUDOTAYIM,
25141+
Value: []byte("::"),
25142+
Position: &position.Position{
25143+
StartLine: 1,
25144+
EndLine: 1,
25145+
StartPos: 63,
25146+
EndPos: 65,
2517925147
},
25180-
Method: &ast.Identifier{
25148+
},
25149+
Method: &ast.Identifier{
25150+
Position: &position.Position{
25151+
StartLine: 1,
25152+
EndLine: 1,
25153+
StartPos: 65,
25154+
EndPos: 68,
25155+
},
25156+
IdentifierTkn: &token.Token{
25157+
ID: token.T_STRING,
25158+
Value: []byte("one"),
2518125159
Position: &position.Position{
2518225160
StartLine: 1,
2518325161
EndLine: 1,
2518425162
StartPos: 65,
2518525163
EndPos: 68,
2518625164
},
25187-
IdentifierTkn: &token.Token{
25188-
ID: token.T_STRING,
25189-
Value: []byte("one"),
25190-
Position: &position.Position{
25191-
StartLine: 1,
25192-
EndLine: 1,
25193-
StartPos: 65,
25194-
EndPos: 68,
25195-
},
25196-
},
25197-
Value: []byte("one"),
2519825165
},
25166+
Value: []byte("one"),
2519925167
},
2520025168
AsTkn: &token.Token{
2520125169
ID: token.T_AS,

0 commit comments

Comments
 (0)