diff --git a/internal/php5/node.go b/internal/php5/node.go new file mode 100644 index 0000000..6a612ac --- /dev/null +++ b/internal/php5/node.go @@ -0,0 +1,85 @@ +package php5 + +import ( + "github.com/z7zmey/php-parser/pkg/ast" + "github.com/z7zmey/php-parser/pkg/position" + "github.com/z7zmey/php-parser/pkg/token" +) + +type ParserBrackets struct { + Position *position.Position + OpenBracketTkn *token.Token + Child ast.Vertex + CloseBracketTkn *token.Token +} + +func (n *ParserBrackets) Accept(v ast.Visitor) { + // do nothing +} + +func (n *ParserBrackets) GetPosition() *position.Position { + return n.Position +} + +type ParserSeparatedList struct { + Position *position.Position + Items []ast.Vertex + SeparatorTkns []*token.Token +} + +func (n *ParserSeparatedList) Accept(v ast.Visitor) { + // do nothing +} + +func (n *ParserSeparatedList) GetPosition() *position.Position { + return n.Position +} + +// TraitAdaptationList node +type TraitAdaptationList struct { + Position *position.Position + OpenCurlyBracketTkn *token.Token + Adaptations []ast.Vertex + CloseCurlyBracketTkn *token.Token +} + +func (n *TraitAdaptationList) Accept(v ast.Visitor) { + // do nothing +} + +func (n *TraitAdaptationList) GetPosition() *position.Position { + return n.Position +} + +// ArgumentList node +type ArgumentList struct { + Position *position.Position + OpenParenthesisTkn *token.Token + Arguments []ast.Vertex + SeparatorTkns []*token.Token + CloseParenthesisTkn *token.Token +} + +func (n *ArgumentList) Accept(v ast.Visitor) { + // do nothing +} + +func (n *ArgumentList) GetPosition() *position.Position { + return n.Position +} + +// TraitMethodRef node +type TraitMethodRef struct { + Position *position.Position + Trait ast.Vertex + DoubleColonTkn *token.Token + Method ast.Vertex +} + +func (n *TraitMethodRef) Accept(v ast.Visitor) { + // do nothing +} + +func (n *TraitMethodRef) GetPosition() *position.Position { + return n.Position +} diff --git a/internal/php5/php5.go b/internal/php5/php5.go index a65a4c8..f93f178 100644 --- a/internal/php5/php5.go +++ b/internal/php5/php5.go @@ -2342,7 +2342,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:293 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.NameNamePart{ Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token), @@ -2362,8 +2362,8 @@ yydefault: Value: yyDollar[3].token.Value, } - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, part) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, part) yyVAL.node = yyDollar[1].node } @@ -2412,9 +2412,9 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), NsTkn: yyDollar[1].token, Name: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items), + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, SemiColonTkn: yyDollar[3].token, } @@ -2427,9 +2427,9 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token), NsTkn: yyDollar[1].token, Name: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items), + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, OpenCurlyBracketTkn: yyDollar[3].token, Stmts: yyDollar[4].list, @@ -2455,8 +2455,8 @@ yydefault: yyVAL.node = &ast.StmtUse{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), UseTkn: yyDollar[1].token, - UseDeclarations: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: yyDollar[3].token, } } @@ -2472,8 +2472,8 @@ yydefault: IdentifierTkn: yyDollar[2].token, Value: yyDollar[2].token.Value, }, - UseDeclarations: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: yyDollar[4].token, } } @@ -2489,8 +2489,8 @@ yydefault: IdentifierTkn: yyDollar[2].token, Value: yyDollar[2].token.Value, }, - UseDeclarations: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: yyDollar[4].token, } } @@ -2506,8 +2506,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:435 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -2515,7 +2515,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:442 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -2524,11 +2524,11 @@ yydefault: // line internal/php5/php5.y:451 { yyVAL.node = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -2537,11 +2537,11 @@ yydefault: // line internal/php5/php5.y:462 { yyVAL.node = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].token), + Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].token), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: yyDollar[2].token, Alias: &ast.Identifier{ @@ -2556,12 +2556,12 @@ yydefault: // line internal/php5/php5.y:479 { yyVAL.node = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), NsSeparatorTkn: yyDollar[1].token, Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items), + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -2573,9 +2573,9 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), NsSeparatorTkn: yyDollar[1].token, Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items), + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: yyDollar[3].token, Alias: &ast.Identifier{ @@ -2589,8 +2589,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:512 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -2598,7 +2598,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:519 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -2607,11 +2607,11 @@ yydefault: // line internal/php5/php5.y:528 { yyVAL.node = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -2620,11 +2620,11 @@ yydefault: // line internal/php5/php5.y:539 { yyVAL.node = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].token), + Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].token), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: yyDollar[2].token, Alias: &ast.Identifier{ @@ -2639,12 +2639,12 @@ yydefault: // line internal/php5/php5.y:556 { yyVAL.node = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), NsSeparatorTkn: yyDollar[1].token, Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items), + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -2656,9 +2656,9 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), NsSeparatorTkn: yyDollar[1].token, Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items), + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: yyDollar[3].token, Alias: &ast.Identifier{ @@ -2672,8 +2672,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:589 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -2681,7 +2681,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:596 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -2690,11 +2690,11 @@ yydefault: // line internal/php5/php5.y:605 { yyVAL.node = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -2703,11 +2703,11 @@ yydefault: // line internal/php5/php5.y:616 { yyVAL.node = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].token), + Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].token), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: yyDollar[2].token, Alias: &ast.Identifier{ @@ -2722,12 +2722,12 @@ yydefault: // line internal/php5/php5.y:633 { yyVAL.node = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), NsSeparatorTkn: yyDollar[1].token, Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items), + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -2739,9 +2739,9 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), NsSeparatorTkn: yyDollar[1].token, Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items), + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: yyDollar[3].token, Alias: &ast.Identifier{ @@ -2950,14 +2950,14 @@ yydefault: { yyDollar[9].node.(*ast.StmtFor).ForTkn = yyDollar[1].token yyDollar[9].node.(*ast.StmtFor).OpenParenthesisTkn = yyDollar[2].token - yyDollar[9].node.(*ast.StmtFor).Init = yyDollar[3].node.(*ast.ParserSeparatedList).Items - yyDollar[9].node.(*ast.StmtFor).InitSeparatorTkns = yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns + yyDollar[9].node.(*ast.StmtFor).Init = yyDollar[3].node.(*ParserSeparatedList).Items + yyDollar[9].node.(*ast.StmtFor).InitSeparatorTkns = yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns yyDollar[9].node.(*ast.StmtFor).InitSemiColonTkn = yyDollar[4].token - yyDollar[9].node.(*ast.StmtFor).Cond = yyDollar[5].node.(*ast.ParserSeparatedList).Items - yyDollar[9].node.(*ast.StmtFor).CondSeparatorTkns = yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns + yyDollar[9].node.(*ast.StmtFor).Cond = yyDollar[5].node.(*ParserSeparatedList).Items + yyDollar[9].node.(*ast.StmtFor).CondSeparatorTkns = yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns yyDollar[9].node.(*ast.StmtFor).CondSemiColonTkn = yyDollar[6].token - yyDollar[9].node.(*ast.StmtFor).Loop = yyDollar[7].node.(*ast.ParserSeparatedList).Items - yyDollar[9].node.(*ast.StmtFor).LoopSeparatorTkns = yyDollar[7].node.(*ast.ParserSeparatedList).SeparatorTkns + yyDollar[9].node.(*ast.StmtFor).Loop = yyDollar[7].node.(*ParserSeparatedList).Items + yyDollar[9].node.(*ast.StmtFor).LoopSeparatorTkns = yyDollar[7].node.(*ParserSeparatedList).SeparatorTkns yyDollar[9].node.(*ast.StmtFor).CloseParenthesisTkn = yyDollar[8].token yyDollar[9].node.(*ast.StmtFor).Position = yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node) @@ -3191,8 +3191,8 @@ yydefault: { yyDollar[5].node.(*ast.StmtDeclare).DeclareTkn = yyDollar[1].token yyDollar[5].node.(*ast.StmtDeclare).OpenParenthesisTkn = yyDollar[2].token - yyDollar[5].node.(*ast.StmtDeclare).Consts = yyDollar[3].node.(*ast.ParserSeparatedList).Items - yyDollar[5].node.(*ast.StmtDeclare).SeparatorTkns = yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns + yyDollar[5].node.(*ast.StmtDeclare).Consts = yyDollar[3].node.(*ParserSeparatedList).Items + yyDollar[5].node.(*ast.StmtDeclare).SeparatorTkns = yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns yyDollar[5].node.(*ast.StmtDeclare).CloseParenthesisTkn = yyDollar[4].token yyDollar[5].node.(*ast.StmtDeclare).Position = yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) @@ -3420,8 +3420,8 @@ yydefault: Value: yyDollar[3].token.Value, }, OpenParenthesisTkn: yyDollar[4].token, - Params: yyDollar[5].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns, + Params: yyDollar[5].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: yyDollar[6].token, OpenCurlyBracketTkn: yyDollar[7].token, Stmts: yyDollar[8].list, @@ -3588,10 +3588,10 @@ yydefault: // line internal/php5/php5.y:1428 { yyVAL.node = &ast.StmtInterface{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), ExtendsTkn: yyDollar[1].token, - Extends: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - ExtendsSeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Extends: yyDollar[2].node.(*ParserSeparatedList).Items, + ExtendsSeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, } } case 105: @@ -3605,17 +3605,17 @@ yydefault: // line internal/php5/php5.y:1444 { yyVAL.node = &ast.StmtClass{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), ImplementsTkn: yyDollar[1].token, - Implements: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - ImplementsSeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Implements: yyDollar[2].node.(*ParserSeparatedList).Items, + ImplementsSeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, } } case 107: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:1456 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -3623,8 +3623,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:1462 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -3663,7 +3663,7 @@ yydefault: yyDollar = yyS[yypt-4 : yypt+1] // line internal/php5/php5.y:1498 { - pairList := yyDollar[3].node.(*ast.ParserSeparatedList) + pairList := yyDollar[3].node.(*ParserSeparatedList) fistPair := pairList.Items[0].(*ast.ExprArrayItem) if fistPair.Key == nil && fistPair.Val == nil && len(pairList.Items) == 1 { @@ -3674,8 +3674,8 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), ListTkn: yyDollar[1].token, OpenBracketTkn: yyDollar[2].token, - Items: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[4].token, } } @@ -3755,7 +3755,7 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:1590 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.StmtConstant{ Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node), @@ -3774,9 +3774,9 @@ yydefault: yyDollar = yyS[yypt-5 : yypt+1] // line internal/php5/php5.y:1607 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append( - yyDollar[1].node.(*ast.ParserSeparatedList).Items, + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append( + yyDollar[1].node.(*ParserSeparatedList).Items, &ast.StmtConstant{ Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[3].token, yyDollar[5].node), Name: &ast.Identifier{ @@ -3992,13 +3992,13 @@ yydefault: yyDollar = yyS[yypt-0 : yypt+1] // line internal/php5/php5.y:1820 { - yyVAL.node = &ast.ParserSeparatedList{} + yyVAL.node = &ParserSeparatedList{} } case 143: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:1827 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -4006,8 +4006,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:1833 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -4105,7 +4105,7 @@ yydefault: yyDollar = yyS[yypt-2 : yypt+1] // line internal/php5/php5.y:1929 { - yyVAL.node = &ast.ArgumentList{ + yyVAL.node = &ArgumentList{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token), OpenParenthesisTkn: yyDollar[1].token, CloseParenthesisTkn: yyDollar[2].token, @@ -4115,7 +4115,7 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:1937 { - argumentList := yyDollar[2].node.(*ast.ArgumentList) + argumentList := yyDollar[2].node.(*ArgumentList) argumentList.Position = yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) argumentList.OpenParenthesisTkn = yyDollar[1].token argumentList.CloseParenthesisTkn = yyDollar[3].token @@ -4126,7 +4126,7 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:1946 { - yyVAL.node = &ast.ArgumentList{ + yyVAL.node = &ArgumentList{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), OpenParenthesisTkn: yyDollar[1].token, Arguments: []ast.Vertex{ @@ -4142,7 +4142,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:1964 { - yyVAL.node = &ast.ArgumentList{ + yyVAL.node = &ArgumentList{ Arguments: []ast.Vertex{yyDollar[1].node}, } } @@ -4150,8 +4150,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:1970 { - yyDollar[1].node.(*ast.ArgumentList).SeparatorTkns = append(yyDollar[1].node.(*ast.ArgumentList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ArgumentList).Arguments = append(yyDollar[1].node.(*ast.ArgumentList).Arguments, yyDollar[3].node) + yyDollar[1].node.(*ArgumentList).SeparatorTkns = append(yyDollar[1].node.(*ArgumentList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ArgumentList).Arguments = append(yyDollar[1].node.(*ArgumentList).Arguments, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -4346,8 +4346,8 @@ yydefault: yyVAL.node = &ast.StmtPropertyList{ Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token), Modifiers: yyDollar[1].list, - Properties: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Properties: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: yyDollar[3].token, } } @@ -4385,8 +4385,8 @@ yydefault: Value: yyDollar[4].token.Value, }, OpenParenthesisTkn: yyDollar[5].token, - Params: yyDollar[6].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[6].node.(*ast.ParserSeparatedList).SeparatorTkns, + Params: yyDollar[6].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[6].node.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: yyDollar[7].token, Stmt: yyDollar[8].node, } @@ -4398,12 +4398,12 @@ yydefault: traitUse := &ast.StmtTraitUse{ Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node), UseTkn: yyDollar[1].token, - Traits: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Traits: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, } switch n := yyDollar[3].node.(type) { - case *ast.TraitAdaptationList: + case *TraitAdaptationList: traitUse.OpenCurlyBracketTkn = n.OpenCurlyBracketTkn traitUse.Adaptations = n.Adaptations traitUse.CloseCurlyBracketTkn = n.CloseCurlyBracketTkn @@ -4417,7 +4417,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:2223 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -4425,8 +4425,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:2229 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -4443,7 +4443,7 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:2246 { - yyVAL.node = &ast.TraitAdaptationList{ + yyVAL.node = &TraitAdaptationList{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), OpenCurlyBracketTkn: yyDollar[1].token, Adaptations: yyDollar[2].list, @@ -4495,20 +4495,20 @@ yydefault: // line internal/php5/php5.y:2295 { yyVAL.node = &ast.StmtTraitUsePrecedence{ - Position: yylex.(*Parser).builder.NewNodeNodeListPosition(yyDollar[1].node, yyDollar[3].node.(*ast.ParserSeparatedList).Items), - Trait: yyDollar[1].node.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: yyDollar[1].node.(*ast.TraitMethodRef).DoubleColonTkn, - Method: yyDollar[1].node.(*ast.TraitMethodRef).Method, + Position: yylex.(*Parser).builder.NewNodeNodeListPosition(yyDollar[1].node, yyDollar[3].node.(*ParserSeparatedList).Items), + Trait: yyDollar[1].node.(*TraitMethodRef).Trait, + DoubleColonTkn: yyDollar[1].node.(*TraitMethodRef).DoubleColonTkn, + Method: yyDollar[1].node.(*TraitMethodRef).Method, InsteadofTkn: yyDollar[2].token, - Insteadof: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Insteadof: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, } } case 187: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:2310 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -4516,8 +4516,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:2316 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -4525,7 +4525,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:2326 { - yyVAL.node = &ast.TraitMethodRef{ + yyVAL.node = &TraitMethodRef{ Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token), Method: &ast.Identifier{ Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token), @@ -4544,7 +4544,7 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:2344 { - yyVAL.node = &ast.TraitMethodRef{ + yyVAL.node = &TraitMethodRef{ Position: yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token), Trait: yyDollar[1].node, DoubleColonTkn: yyDollar[2].token, @@ -4561,9 +4561,9 @@ yydefault: { yyVAL.node = &ast.StmtTraitUseAlias{ Position: yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token), - Trait: yyDollar[1].node.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: yyDollar[1].node.(*ast.TraitMethodRef).DoubleColonTkn, - Method: yyDollar[1].node.(*ast.TraitMethodRef).Method, + Trait: yyDollar[1].node.(*TraitMethodRef).Trait, + DoubleColonTkn: yyDollar[1].node.(*TraitMethodRef).DoubleColonTkn, + Method: yyDollar[1].node.(*TraitMethodRef).Method, AsTkn: yyDollar[2].token, Modifier: yyDollar[3].node, Alias: &ast.Identifier{ @@ -4579,9 +4579,9 @@ yydefault: { yyVAL.node = &ast.StmtTraitUseAlias{ Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node), - Trait: yyDollar[1].node.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: yyDollar[1].node.(*ast.TraitMethodRef).DoubleColonTkn, - Method: yyDollar[1].node.(*ast.TraitMethodRef).Method, + Trait: yyDollar[1].node.(*TraitMethodRef).Trait, + DoubleColonTkn: yyDollar[1].node.(*TraitMethodRef).DoubleColonTkn, + Method: yyDollar[1].node.(*TraitMethodRef).Method, AsTkn: yyDollar[2].token, Modifier: yyDollar[3].node, } @@ -4736,8 +4736,8 @@ yydefault: }, } - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, item) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, item) yyVAL.node = yyDollar[1].node } @@ -4759,8 +4759,8 @@ yydefault: Expr: yyDollar[5].node, } - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, item) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, item) yyVAL.node = yyDollar[1].node } @@ -4768,7 +4768,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:2550 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.StmtProperty{ Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token), @@ -4789,7 +4789,7 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:2569 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.StmtProperty{ Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node), @@ -4869,7 +4869,7 @@ yydefault: yyDollar = yyS[yypt-0 : yypt+1] // line internal/php5/php5.y:2649 { - yyVAL.node = &ast.ParserSeparatedList{} + yyVAL.node = &ParserSeparatedList{} } case 219: yyDollar = yyS[yypt-1 : yypt+1] @@ -4881,8 +4881,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:2660 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -4890,7 +4890,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:2667 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -4973,10 +4973,10 @@ yydefault: Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node), NewTkn: yyDollar[1].token, Class: yyDollar[2].node, - OpenParenthesisTkn: yyDollar[3].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[3].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[3].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[3].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[3].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[3].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[3].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[3].node.(*ArgumentList).CloseParenthesisTkn, } } else { yyVAL.node = &ast.ExprNew{ @@ -4995,8 +4995,8 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), ListTkn: yyDollar[1].token, OpenBracketTkn: yyDollar[2].token, - Items: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[4].token, }, EqualTkn: yyDollar[5].token, @@ -5036,10 +5036,10 @@ yydefault: Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[4].token, yyDollar[6].node), NewTkn: yyDollar[4].token, Class: yyDollar[5].node, - OpenParenthesisTkn: yyDollar[6].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[6].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[6].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[6].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[6].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[6].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[6].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[6].node.(*ArgumentList).CloseParenthesisTkn, } } else { _new = &ast.ExprNew{ @@ -5800,8 +5800,8 @@ yydefault: closure.FunctionTkn = yyDollar[1].token closure.AmpersandTkn = yyDollar[2].token closure.OpenParenthesisTkn = yyDollar[3].token - closure.Params = yyDollar[4].node.(*ast.ParserSeparatedList).Items - closure.SeparatorTkns = yyDollar[4].node.(*ast.ParserSeparatedList).SeparatorTkns + closure.Params = yyDollar[4].node.(*ParserSeparatedList).Items + closure.SeparatorTkns = yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns closure.CloseParenthesisTkn = yyDollar[5].token closure.OpenCurlyBracketTkn = yyDollar[7].token closure.Stmts = yyDollar[8].list @@ -5820,8 +5820,8 @@ yydefault: closure.FunctionTkn = yyDollar[2].token closure.AmpersandTkn = yyDollar[3].token closure.OpenParenthesisTkn = yyDollar[4].token - closure.Params = yyDollar[5].node.(*ast.ParserSeparatedList).Items - closure.SeparatorTkns = yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns + closure.Params = yyDollar[5].node.(*ParserSeparatedList).Items + closure.SeparatorTkns = yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns closure.CloseParenthesisTkn = yyDollar[6].token closure.OpenCurlyBracketTkn = yyDollar[8].token closure.Stmts = yyDollar[9].list @@ -5933,8 +5933,8 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), ArrayTkn: yyDollar[1].token, OpenBracketTkn: yyDollar[2].token, - Items: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[4].token, } } @@ -5945,8 +5945,8 @@ yydefault: yyVAL.node = &ast.ExprArray{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), OpenBracketTkn: yyDollar[1].token, - Items: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[3].token, } } @@ -5969,8 +5969,8 @@ yydefault: yyVAL.node = &ast.ExprClosure{ UseTkn: yyDollar[1].token, UseOpenParenthesisTkn: yyDollar[2].token, - Use: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - UseSeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Use: yyDollar[3].node.(*ParserSeparatedList).Items, + UseSeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, UseCloseParenthesisTkn: yyDollar[4].token, } } @@ -5990,8 +5990,8 @@ yydefault: }, } - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, variable) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, variable) yyVAL.node = yyDollar[1].node } @@ -6012,8 +6012,8 @@ yydefault: }, } - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, variable) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, variable) yyVAL.node = yyDollar[1].node } @@ -6033,7 +6033,7 @@ yydefault: }, } - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{variable}, } } @@ -6054,7 +6054,7 @@ yydefault: }, } - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{variable}, } } @@ -6063,16 +6063,16 @@ yydefault: // line internal/php5/php5.y:3674 { yyVAL.node = &ast.ExprFunctionCall{ - Position: yylex.(*Parser).builder.NewNodeListNodePosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[2].node), + Position: yylex.(*Parser).builder.NewNodeListNodePosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[2].node), Function: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, }, - OpenParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[2].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[2].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[2].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[2].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[2].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[2].node.(*ArgumentList).CloseParenthesisTkn, } } case 324: @@ -6082,16 +6082,16 @@ yydefault: yyVAL.node = &ast.ExprFunctionCall{ Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[4].node), Function: &ast.NameRelative{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ParserSeparatedList).Items), NsTkn: yyDollar[1].token, NsSeparatorTkn: yyDollar[2].token, - Parts: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, }, - OpenParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[4].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[4].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[4].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[4].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn, } } case 325: @@ -6101,15 +6101,15 @@ yydefault: yyVAL.node = &ast.ExprFunctionCall{ Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node), Function: &ast.NameFullyQualified{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), NsSeparatorTkn: yyDollar[1].token, - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, - OpenParenthesisTkn: yyDollar[3].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[3].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[3].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[3].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[3].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[3].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[3].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[3].node.(*ArgumentList).CloseParenthesisTkn, } } case 326: @@ -6121,13 +6121,13 @@ yydefault: Class: yyDollar[1].node, DoubleColonTkn: yyDollar[2].token, Call: yyDollar[3].node, - OpenParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[4].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[4].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[4].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[4].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn, } - if brackets, ok := yyDollar[3].node.(*ast.ParserBrackets); ok { + if brackets, ok := yyDollar[3].node.(*ParserBrackets); ok { staticCall.OpenCurlyBracketTkn = brackets.OpenBracketTkn staticCall.Call = brackets.Child staticCall.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -6144,10 +6144,10 @@ yydefault: Class: yyDollar[1].node, DoubleColonTkn: yyDollar[2].token, Call: yyDollar[3].node, - OpenParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[4].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[4].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[4].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[4].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn, } } case 328: @@ -6159,13 +6159,13 @@ yydefault: Class: yyDollar[1].node, DoubleColonTkn: yyDollar[2].token, Call: yyDollar[3].node, - OpenParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[4].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[4].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[4].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[4].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn, } - if brackets, ok := yyDollar[3].node.(*ast.ParserBrackets); ok { + if brackets, ok := yyDollar[3].node.(*ParserBrackets); ok { staticCall.OpenCurlyBracketTkn = brackets.OpenBracketTkn staticCall.Call = brackets.Child staticCall.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -6182,10 +6182,10 @@ yydefault: Class: yyDollar[1].node, DoubleColonTkn: yyDollar[2].token, Call: yyDollar[3].node, - OpenParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[4].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[4].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[4].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[4].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn, } } case 330: @@ -6195,10 +6195,10 @@ yydefault: yyVAL.node = &ast.ExprFunctionCall{ Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[2].node), Function: yyDollar[1].node, - OpenParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[2].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[2].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[2].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[2].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[2].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[2].node.(*ArgumentList).CloseParenthesisTkn, } } case 331: @@ -6216,9 +6216,9 @@ yydefault: // line internal/php5/php5.y:3812 { yyVAL.node = &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, } } case 333: @@ -6226,11 +6226,11 @@ yydefault: // line internal/php5/php5.y:3820 { yyVAL.node = &ast.NameRelative{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ParserSeparatedList).Items), NsTkn: yyDollar[1].token, NsSeparatorTkn: yyDollar[2].token, - Parts: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, } } case 334: @@ -6238,10 +6238,10 @@ yydefault: // line internal/php5/php5.y:3830 { yyVAL.node = &ast.NameFullyQualified{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), NsSeparatorTkn: yyDollar[1].token, - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, } } case 335: @@ -6249,9 +6249,9 @@ yydefault: // line internal/php5/php5.y:3842 { yyVAL.node = &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, } } case 336: @@ -6259,11 +6259,11 @@ yydefault: // line internal/php5/php5.y:3850 { yyVAL.node = &ast.NameRelative{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ParserSeparatedList).Items), NsTkn: yyDollar[1].token, NsSeparatorTkn: yyDollar[2].token, - Parts: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, } } case 337: @@ -6271,10 +6271,10 @@ yydefault: // line internal/php5/php5.y:3860 { yyVAL.node = &ast.NameFullyQualified{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), NsSeparatorTkn: yyDollar[1].token, - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, } } case 338: @@ -6401,7 +6401,7 @@ yydefault: yyDollar = yyS[yypt-0 : yypt+1] // line internal/php5/php5.y:3986 { - yyVAL.node = &ast.ArgumentList{} + yyVAL.node = &ArgumentList{} } case 352: yyDollar = yyS[yypt-1 : yypt+1] @@ -6574,11 +6574,11 @@ yydefault: // line internal/php5/php5.y:4134 { yyVAL.node = &ast.ExprConstFetch{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), Const: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -6587,13 +6587,13 @@ yydefault: // line internal/php5/php5.y:4145 { yyVAL.node = &ast.ExprConstFetch{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ParserSeparatedList).Items), Const: &ast.NameRelative{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ParserSeparatedList).Items), NsTkn: yyDollar[1].token, NsSeparatorTkn: yyDollar[2].token, - Parts: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -6602,12 +6602,12 @@ yydefault: // line internal/php5/php5.y:4158 { yyVAL.node = &ast.ExprConstFetch{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), Const: &ast.NameFullyQualified{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), NsSeparatorTkn: yyDollar[1].token, - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -6619,8 +6619,8 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), ArrayTkn: yyDollar[1].token, OpenBracketTkn: yyDollar[2].token, - Items: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[4].token, } } @@ -6631,8 +6631,8 @@ yydefault: yyVAL.node = &ast.ExprArray{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), OpenBracketTkn: yyDollar[1].token, - Items: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[3].token, } } @@ -7032,11 +7032,11 @@ yydefault: // line internal/php5/php5.y:4514 { yyVAL.node = &ast.ExprConstFetch{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), Const: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -7045,13 +7045,13 @@ yydefault: // line internal/php5/php5.y:4525 { yyVAL.node = &ast.ExprConstFetch{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ParserSeparatedList).Items), Const: &ast.NameRelative{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ParserSeparatedList).Items), NsTkn: yyDollar[1].token, NsSeparatorTkn: yyDollar[2].token, - Parts: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -7060,12 +7060,12 @@ yydefault: // line internal/php5/php5.y:4538 { yyVAL.node = &ast.ExprConstFetch{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), Const: &ast.NameFullyQualified{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), NsSeparatorTkn: yyDollar[1].token, - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -7136,15 +7136,15 @@ yydefault: yyDollar = yyS[yypt-0 : yypt+1] // line internal/php5/php5.y:4605 { - yyVAL.node = &ast.ParserSeparatedList{} + yyVAL.node = &ParserSeparatedList{} } case 422: yyDollar = yyS[yypt-2 : yypt+1] // line internal/php5/php5.y:4609 { if yyDollar[2].token != nil { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, &ast.ExprArrayItem{}) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, &ast.ExprArrayItem{}) } yyVAL.node = yyDollar[1].node @@ -7172,8 +7172,8 @@ yydefault: Val: yyDollar[5].node, } - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, arrayItem) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, arrayItem) yyVAL.node = yyDollar[1].node } @@ -7186,8 +7186,8 @@ yydefault: Val: yyDollar[3].node, } - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, arrayItem) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, arrayItem) yyVAL.node = yyDollar[1].node } @@ -7195,7 +7195,7 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:4658 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.ExprArrayItem{ Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node), @@ -7210,7 +7210,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:4671 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.ExprArrayItem{ Position: yylex.(*Parser).builder.NewNodePosition(yyDollar[1].node), @@ -7433,10 +7433,10 @@ yydefault: { yyVAL.node = &ast.ExprMethodCall{ Position: yylex.(*Parser).builder.NewNodePosition(yyDollar[1].node), - OpenParenthesisTkn: yyDollar[1].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[1].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[1].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[1].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[1].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[1].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[1].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[1].node.(*ArgumentList).CloseParenthesisTkn, } } case 444: @@ -7690,7 +7690,7 @@ yydefault: Property: yyDollar[1].node, } - if brackets, ok := yyDollar[1].node.(*ast.ParserBrackets); ok { + if brackets, ok := yyDollar[1].node.(*ParserBrackets); ok { property.OpenCurlyBracketTkn = brackets.OpenBracketTkn property.Property = brackets.Child property.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -7712,7 +7712,7 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:5158 { - yyVAL.node = &ast.ParserBrackets{ + yyVAL.node = &ParserBrackets{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), OpenBracketTkn: yyDollar[1].token, Child: yyDollar[2].node, @@ -7743,8 +7743,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:5189 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -7752,7 +7752,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:5196 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -7769,7 +7769,7 @@ yydefault: yyDollar = yyS[yypt-4 : yypt+1] // line internal/php5/php5.y:5213 { - pairList := yyDollar[3].node.(*ast.ParserSeparatedList) + pairList := yyDollar[3].node.(*ParserSeparatedList) fistPair := pairList.Items[0].(*ast.ExprArrayItem) if fistPair.Key == nil && fistPair.Val == nil && len(pairList.Items) == 1 { @@ -7782,8 +7782,8 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), ListTkn: yyDollar[1].token, OpenBracketTkn: yyDollar[2].token, - Items: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[4].token, }, } @@ -7798,15 +7798,15 @@ yydefault: yyDollar = yyS[yypt-0 : yypt+1] // line internal/php5/php5.y:5242 { - yyVAL.node = &ast.ParserSeparatedList{} + yyVAL.node = &ParserSeparatedList{} } case 482: yyDollar = yyS[yypt-2 : yypt+1] // line internal/php5/php5.y:5246 { if yyDollar[2].token != nil { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, &ast.ExprArrayItem{}) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, &ast.ExprArrayItem{}) } yyVAL.node = yyDollar[1].node @@ -7822,8 +7822,8 @@ yydefault: Val: yyDollar[5].node, } - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, arrayItem) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, arrayItem) yyVAL.node = yyDollar[1].node } @@ -7836,8 +7836,8 @@ yydefault: Val: yyDollar[3].node, } - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, arrayItem) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, arrayItem) yyVAL.node = yyDollar[1].node } @@ -7845,7 +7845,7 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:5284 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.ExprArrayItem{ Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node), @@ -7860,7 +7860,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:5297 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.ExprArrayItem{ Position: yylex.(*Parser).builder.NewNodePosition(yyDollar[1].node), @@ -7881,8 +7881,8 @@ yydefault: Val: yyDollar[6].node, } - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, arrayItem) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, arrayItem) yyVAL.node = yyDollar[1].node } @@ -7896,8 +7896,8 @@ yydefault: Val: yyDollar[4].node, } - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, arrayItem) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, arrayItem) yyVAL.node = yyDollar[1].node } @@ -7905,7 +7905,7 @@ yydefault: yyDollar = yyS[yypt-4 : yypt+1] // line internal/php5/php5.y:5336 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.ExprArrayItem{ Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node), @@ -7921,7 +7921,7 @@ yydefault: yyDollar = yyS[yypt-2 : yypt+1] // line internal/php5/php5.y:5350 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.ExprArrayItem{ Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node), @@ -8128,8 +8128,8 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), IssetTkn: yyDollar[1].token, OpenParenthesisTkn: yyDollar[2].token, - Vars: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Vars: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: yyDollar[4].token, } } @@ -8213,7 +8213,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php5/php5.y:5611 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -8221,8 +8221,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php5/php5.y:5617 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } diff --git a/internal/php5/php5.y b/internal/php5/php5.y index 581d612..54e00b5 100644 --- a/internal/php5/php5.y +++ b/internal/php5/php5.y @@ -291,7 +291,7 @@ top_statement_list: namespace_name: T_STRING { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.NameNamePart{ Position: yylex.(*Parser).builder.NewTokenPosition($1), @@ -309,8 +309,8 @@ namespace_name: Value: $3.Value, } - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, part) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, part) $$ = $1 } @@ -350,9 +350,9 @@ top_statement: Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), NsTkn: $1, Name: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ast.ParserSeparatedList).Items), - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items), + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, SemiColonTkn: $3, } @@ -363,9 +363,9 @@ top_statement: Position: yylex.(*Parser).builder.NewTokensPosition($1, $5), NsTkn: $1, Name: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ast.ParserSeparatedList).Items), - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items), + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, OpenCurlyBracketTkn: $3, Stmts: $4, @@ -387,8 +387,8 @@ top_statement: $$ = &ast.StmtUse{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), UseTkn: $1, - UseDeclarations: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: $3, } } @@ -402,8 +402,8 @@ top_statement: IdentifierTkn: $2, Value: $2.Value, }, - UseDeclarations: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: $4, } } @@ -417,8 +417,8 @@ top_statement: IdentifierTkn: $2, Value: $2.Value, }, - UseDeclarations: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: $4, } } @@ -433,14 +433,14 @@ top_statement: use_declarations: use_declarations ',' use_declaration { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | use_declaration { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -450,22 +450,22 @@ use_declaration: namespace_name { $$ = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, }, } } | namespace_name T_AS T_STRING { $$ = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ast.ParserSeparatedList).Items, $3), + Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ParserSeparatedList).Items, $3), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: $2, Alias: &ast.Identifier{ @@ -478,12 +478,12 @@ use_declaration: | T_NS_SEPARATOR namespace_name { $$ = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), NsSeparatorTkn: $1, Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ast.ParserSeparatedList).Items), - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items), + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -493,9 +493,9 @@ use_declaration: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), NsSeparatorTkn: $1, Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ast.ParserSeparatedList).Items), - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items), + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: $3, Alias: &ast.Identifier{ @@ -510,14 +510,14 @@ use_declaration: use_function_declarations: use_function_declarations ',' use_function_declaration { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | use_function_declaration { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -527,22 +527,22 @@ use_function_declaration: namespace_name { $$ = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, }, } } | namespace_name T_AS T_STRING { $$ = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ast.ParserSeparatedList).Items, $3), + Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ParserSeparatedList).Items, $3), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: $2, Alias: &ast.Identifier{ @@ -555,12 +555,12 @@ use_function_declaration: | T_NS_SEPARATOR namespace_name { $$ = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), NsSeparatorTkn: $1, Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ast.ParserSeparatedList).Items), - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items), + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -570,9 +570,9 @@ use_function_declaration: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), NsSeparatorTkn: $1, Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ast.ParserSeparatedList).Items), - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items), + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: $3, Alias: &ast.Identifier{ @@ -587,14 +587,14 @@ use_function_declaration: use_const_declarations: use_const_declarations ',' use_const_declaration { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | use_const_declaration { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -604,22 +604,22 @@ use_const_declaration: namespace_name { $$ = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, }, } } | namespace_name T_AS T_STRING { $$ = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ast.ParserSeparatedList).Items, $3), + Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ParserSeparatedList).Items, $3), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: $2, Alias: &ast.Identifier{ @@ -632,12 +632,12 @@ use_const_declaration: | T_NS_SEPARATOR namespace_name { $$ = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), NsSeparatorTkn: $1, Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ast.ParserSeparatedList).Items), - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items), + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -647,9 +647,9 @@ use_const_declaration: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), NsSeparatorTkn: $1, Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ast.ParserSeparatedList).Items), - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items), + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: $3, Alias: &ast.Identifier{ @@ -841,14 +841,14 @@ unticked_statement: { $9.(*ast.StmtFor).ForTkn = $1 $9.(*ast.StmtFor).OpenParenthesisTkn = $2 - $9.(*ast.StmtFor).Init = $3.(*ast.ParserSeparatedList).Items - $9.(*ast.StmtFor).InitSeparatorTkns = $3.(*ast.ParserSeparatedList).SeparatorTkns + $9.(*ast.StmtFor).Init = $3.(*ParserSeparatedList).Items + $9.(*ast.StmtFor).InitSeparatorTkns = $3.(*ParserSeparatedList).SeparatorTkns $9.(*ast.StmtFor).InitSemiColonTkn = $4 - $9.(*ast.StmtFor).Cond = $5.(*ast.ParserSeparatedList).Items - $9.(*ast.StmtFor).CondSeparatorTkns = $5.(*ast.ParserSeparatedList).SeparatorTkns + $9.(*ast.StmtFor).Cond = $5.(*ParserSeparatedList).Items + $9.(*ast.StmtFor).CondSeparatorTkns = $5.(*ParserSeparatedList).SeparatorTkns $9.(*ast.StmtFor).CondSemiColonTkn = $6 - $9.(*ast.StmtFor).Loop = $7.(*ast.ParserSeparatedList).Items - $9.(*ast.StmtFor).LoopSeparatorTkns = $7.(*ast.ParserSeparatedList).SeparatorTkns + $9.(*ast.StmtFor).Loop = $7.(*ParserSeparatedList).Items + $9.(*ast.StmtFor).LoopSeparatorTkns = $7.(*ParserSeparatedList).SeparatorTkns $9.(*ast.StmtFor).CloseParenthesisTkn = $8 $9.(*ast.StmtFor).Position = yylex.(*Parser).builder.NewTokenNodePosition($1, $9) @@ -1046,8 +1046,8 @@ unticked_statement: { $5.(*ast.StmtDeclare).DeclareTkn = $1 $5.(*ast.StmtDeclare).OpenParenthesisTkn = $2 - $5.(*ast.StmtDeclare).Consts = $3.(*ast.ParserSeparatedList).Items - $5.(*ast.StmtDeclare).SeparatorTkns = $3.(*ast.ParserSeparatedList).SeparatorTkns + $5.(*ast.StmtDeclare).Consts = $3.(*ParserSeparatedList).Items + $5.(*ast.StmtDeclare).SeparatorTkns = $3.(*ParserSeparatedList).SeparatorTkns $5.(*ast.StmtDeclare).CloseParenthesisTkn = $4 $5.(*ast.StmtDeclare).Position = yylex.(*Parser).builder.NewTokenNodePosition($1, $5) @@ -1265,8 +1265,8 @@ unticked_function_declaration_statement: Value: $3.Value, }, OpenParenthesisTkn: $4, - Params: $5.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $5.(*ast.ParserSeparatedList).SeparatorTkns, + Params: $5.(*ParserSeparatedList).Items, + SeparatorTkns: $5.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: $6, OpenCurlyBracketTkn: $7, Stmts: $8, @@ -1427,10 +1427,10 @@ interface_extends_list: | T_EXTENDS interface_list { $$ = &ast.StmtInterface{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), ExtendsTkn: $1, - Extends: $2.(*ast.ParserSeparatedList).Items, - ExtendsSeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Extends: $2.(*ParserSeparatedList).Items, + ExtendsSeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }; } ; @@ -1443,10 +1443,10 @@ implements_list: | T_IMPLEMENTS interface_list { $$ = &ast.StmtClass{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), ImplementsTkn: $1, - Implements: $2.(*ast.ParserSeparatedList).Items, - ImplementsSeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Implements: $2.(*ParserSeparatedList).Items, + ImplementsSeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }; } ; @@ -1454,14 +1454,14 @@ implements_list: interface_list: fully_qualified_class_name { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } | interface_list ',' fully_qualified_class_name { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } @@ -1496,7 +1496,7 @@ foreach_variable: } | T_LIST '(' assignment_list ')' { - pairList := $3.(*ast.ParserSeparatedList) + pairList := $3.(*ParserSeparatedList) fistPair := pairList.Items[0].(*ast.ExprArrayItem) if fistPair.Key == nil && fistPair.Val == nil && len(pairList.Items) == 1 { @@ -1507,8 +1507,8 @@ foreach_variable: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), ListTkn: $1, OpenBracketTkn: $2, - Items: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $4, } } @@ -1588,7 +1588,7 @@ declare_statement: declare_list: T_STRING '=' static_scalar { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.StmtConstant{ Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $3), @@ -1605,9 +1605,9 @@ declare_list: } | declare_list ',' T_STRING '=' static_scalar { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append( - $1.(*ast.ParserSeparatedList).Items, + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append( + $1.(*ParserSeparatedList).Items, &ast.StmtConstant{ Position: yylex.(*Parser).builder.NewTokenNodePosition($3, $5), Name: &ast.Identifier{ @@ -1818,21 +1818,21 @@ parameter_list: } | /* empty */ { - $$ = &ast.ParserSeparatedList{} + $$ = &ParserSeparatedList{} } ; non_empty_parameter_list: parameter { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } | non_empty_parameter_list ',' parameter { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } @@ -1927,7 +1927,7 @@ optional_class_type: function_call_parameter_list: '(' ')' { - $$ = &ast.ArgumentList{ + $$ = &ArgumentList{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $2), OpenParenthesisTkn: $1, CloseParenthesisTkn: $2, @@ -1935,7 +1935,7 @@ function_call_parameter_list: } | '(' non_empty_function_call_parameter_list ')' { - argumentList := $2.(*ast.ArgumentList) + argumentList := $2.(*ArgumentList) argumentList.Position = yylex.(*Parser).builder.NewTokensPosition($1, $3) argumentList.OpenParenthesisTkn = $1 argumentList.CloseParenthesisTkn = $3 @@ -1944,7 +1944,7 @@ function_call_parameter_list: } | '(' yield_expr ')' { - $$ = &ast.ArgumentList{ + $$ = &ArgumentList{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), OpenParenthesisTkn: $1, Arguments: []ast.Vertex{ @@ -1962,14 +1962,14 @@ function_call_parameter_list: non_empty_function_call_parameter_list: function_call_parameter { - $$ = &ast.ArgumentList{ + $$ = &ArgumentList{ Arguments: []ast.Vertex{$1}, } } | non_empty_function_call_parameter_list ',' function_call_parameter { - $1.(*ast.ArgumentList).SeparatorTkns = append($1.(*ast.ArgumentList).SeparatorTkns, $2) - $1.(*ast.ArgumentList).Arguments = append($1.(*ast.ArgumentList).Arguments, $3) + $1.(*ArgumentList).SeparatorTkns = append($1.(*ArgumentList).SeparatorTkns, $2) + $1.(*ArgumentList).Arguments = append($1.(*ArgumentList).Arguments, $3) $$ = $1 } @@ -2154,8 +2154,8 @@ class_statement: $$ = &ast.StmtPropertyList{ Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1, $3), Modifiers: $1, - Properties: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Properties: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: $3, } } @@ -2187,8 +2187,8 @@ class_statement: Value: $4.Value, }, OpenParenthesisTkn: $5, - Params: $6.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $6.(*ast.ParserSeparatedList).SeparatorTkns, + Params: $6.(*ParserSeparatedList).Items, + SeparatorTkns: $6.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: $7, Stmt: $8, } @@ -2201,12 +2201,12 @@ trait_use_statement: traitUse := &ast.StmtTraitUse{ Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $3), UseTkn: $1, - Traits: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Traits: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, } switch n := $3.(type) { - case *ast.TraitAdaptationList : + case *TraitAdaptationList : traitUse.OpenCurlyBracketTkn = n.OpenCurlyBracketTkn traitUse.Adaptations = n.Adaptations traitUse.CloseCurlyBracketTkn = n.CloseCurlyBracketTkn @@ -2221,14 +2221,14 @@ trait_use_statement: trait_list: fully_qualified_class_name { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } | trait_list ',' fully_qualified_class_name { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } @@ -2244,7 +2244,7 @@ trait_adaptations: } | '{' trait_adaptation_list '}' { - $$ = &ast.TraitAdaptationList{ + $$ = &TraitAdaptationList{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), OpenCurlyBracketTkn: $1, Adaptations: $2, @@ -2294,13 +2294,13 @@ trait_precedence: trait_method_reference_fully_qualified T_INSTEADOF trait_reference_list { $$ = &ast.StmtTraitUsePrecedence{ - 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, + Position: yylex.(*Parser).builder.NewNodeNodeListPosition($1, $3.(*ParserSeparatedList).Items), + Trait: $1.(*TraitMethodRef).Trait, + DoubleColonTkn: $1.(*TraitMethodRef).DoubleColonTkn, + Method: $1.(*TraitMethodRef).Method, InsteadofTkn: $2, - Insteadof: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Insteadof: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, } } ; @@ -2308,14 +2308,14 @@ trait_precedence: trait_reference_list: fully_qualified_class_name { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } | trait_reference_list ',' fully_qualified_class_name { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } @@ -2324,7 +2324,7 @@ trait_reference_list: trait_method_reference: T_STRING { - $$ = &ast.TraitMethodRef{ + $$ = &TraitMethodRef{ Position: yylex.(*Parser).builder.NewTokenPosition($1), Method: &ast.Identifier{ Position: yylex.(*Parser).builder.NewTokenPosition($1), @@ -2342,7 +2342,7 @@ trait_method_reference: trait_method_reference_fully_qualified: fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { - $$ = &ast.TraitMethodRef{ + $$ = &TraitMethodRef{ Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3), Trait: $1, DoubleColonTkn: $2, @@ -2360,9 +2360,9 @@ trait_alias: { $$ = &ast.StmtTraitUseAlias{ Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $4), - Trait: $1.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn, - Method: $1.(*ast.TraitMethodRef).Method, + Trait: $1.(*TraitMethodRef).Trait, + DoubleColonTkn: $1.(*TraitMethodRef).DoubleColonTkn, + Method: $1.(*TraitMethodRef).Method, AsTkn: $2, Modifier: $3, Alias: &ast.Identifier{ @@ -2376,9 +2376,9 @@ trait_alias: { $$ = &ast.StmtTraitUseAlias{ Position: yylex.(*Parser).builder.NewNodesPosition($1, $3), - Trait: $1.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn, - Method: $1.(*ast.TraitMethodRef).Method, + Trait: $1.(*TraitMethodRef).Trait, + DoubleColonTkn: $1.(*TraitMethodRef).DoubleColonTkn, + Method: $1.(*TraitMethodRef).Method, AsTkn: $2, Modifier: $3, } @@ -2520,8 +2520,8 @@ class_variable_declaration: }, } - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, item) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, item) $$ = $1 } @@ -2541,14 +2541,14 @@ class_variable_declaration: Expr: $5, } - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, item) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, item) $$ = $1 } | T_VARIABLE { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.StmtProperty{ Position: yylex.(*Parser).builder.NewTokenPosition($1), @@ -2567,7 +2567,7 @@ class_variable_declaration: } | T_VARIABLE '=' static_scalar { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.StmtProperty{ Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $3), @@ -2647,7 +2647,7 @@ echo_expr_list: for_expr: /* empty */ { - $$ = &ast.ParserSeparatedList{} + $$ = &ParserSeparatedList{} } | non_empty_for_expr { @@ -2658,14 +2658,14 @@ for_expr: non_empty_for_expr: non_empty_for_expr ',' expr { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | expr { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -2743,10 +2743,10 @@ new_expr: Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $3), NewTkn: $1, Class: $2, - OpenParenthesisTkn: $3.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $3.(*ast.ArgumentList).Arguments, - SeparatorTkns: $3.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $3.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $3.(*ArgumentList).OpenParenthesisTkn, + Arguments: $3.(*ArgumentList).Arguments, + SeparatorTkns: $3.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $3.(*ArgumentList).CloseParenthesisTkn, } } else { $$ = &ast.ExprNew{ @@ -2766,8 +2766,8 @@ expr_without_variable: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), ListTkn: $1, OpenBracketTkn: $2, - Items: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $4, }, EqualTkn: $5, @@ -2801,10 +2801,10 @@ expr_without_variable: Position: yylex.(*Parser).builder.NewTokenNodePosition($4, $6), NewTkn: $4, Class: $5, - OpenParenthesisTkn: $6.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $6.(*ast.ArgumentList).Arguments, - SeparatorTkns: $6.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $6.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $6.(*ArgumentList).OpenParenthesisTkn, + Arguments: $6.(*ArgumentList).Arguments, + SeparatorTkns: $6.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $6.(*ArgumentList).CloseParenthesisTkn, } } else { _new = &ast.ExprNew{ @@ -3427,8 +3427,8 @@ expr_without_variable: closure.FunctionTkn = $1 closure.AmpersandTkn = $2 closure.OpenParenthesisTkn = $3 - closure.Params = $4.(*ast.ParserSeparatedList).Items - closure.SeparatorTkns = $4.(*ast.ParserSeparatedList).SeparatorTkns + closure.Params = $4.(*ParserSeparatedList).Items + closure.SeparatorTkns = $4.(*ParserSeparatedList).SeparatorTkns closure.CloseParenthesisTkn = $5 closure.OpenCurlyBracketTkn = $7 closure.Stmts = $8 @@ -3445,8 +3445,8 @@ expr_without_variable: closure.FunctionTkn = $2 closure.AmpersandTkn = $3 closure.OpenParenthesisTkn = $4 - closure.Params = $5.(*ast.ParserSeparatedList).Items - closure.SeparatorTkns = $5.(*ast.ParserSeparatedList).SeparatorTkns + closure.Params = $5.(*ParserSeparatedList).Items + closure.SeparatorTkns = $5.(*ParserSeparatedList).SeparatorTkns closure.CloseParenthesisTkn = $6 closure.OpenCurlyBracketTkn = $8 closure.Stmts = $9 @@ -3549,8 +3549,8 @@ combined_scalar: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), ArrayTkn: $1, OpenBracketTkn: $2, - Items: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $4, } } @@ -3559,8 +3559,8 @@ combined_scalar: $$ = &ast.ExprArray{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), OpenBracketTkn: $1, - Items: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $3, } } @@ -3583,8 +3583,8 @@ lexical_vars: $$ = &ast.ExprClosure{ UseTkn: $1, UseOpenParenthesisTkn: $2, - Use: $3.(*ast.ParserSeparatedList).Items, - UseSeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Use: $3.(*ParserSeparatedList).Items, + UseSeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, UseCloseParenthesisTkn: $4, } } @@ -3605,8 +3605,8 @@ lexical_var_list: }, } - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, variable) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, variable) $$ = $1 } @@ -3625,8 +3625,8 @@ lexical_var_list: }, } - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, variable) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, variable) $$ = $1 } @@ -3644,7 +3644,7 @@ lexical_var_list: }, } - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{ variable }, } } @@ -3663,7 +3663,7 @@ lexical_var_list: }, } - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{ variable }, } } @@ -3673,16 +3673,16 @@ function_call: namespace_name function_call_parameter_list { $$ = &ast.ExprFunctionCall{ - Position: yylex.(*Parser).builder.NewNodeListNodePosition($1.(*ast.ParserSeparatedList).Items, $2), + Position: yylex.(*Parser).builder.NewNodeListNodePosition($1.(*ParserSeparatedList).Items, $2), Function: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, }, - OpenParenthesisTkn: $2.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $2.(*ast.ArgumentList).Arguments, - SeparatorTkns: $2.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $2.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $2.(*ArgumentList).OpenParenthesisTkn, + Arguments: $2.(*ArgumentList).Arguments, + SeparatorTkns: $2.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $2.(*ArgumentList).CloseParenthesisTkn, } } | T_NAMESPACE T_NS_SEPARATOR namespace_name function_call_parameter_list @@ -3690,16 +3690,16 @@ function_call: $$ = &ast.ExprFunctionCall{ Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $4), Function: &ast.NameRelative{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ParserSeparatedList).Items), NsTkn: $1, NsSeparatorTkn: $2, - Parts: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, }, - OpenParenthesisTkn: $4.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $4.(*ast.ArgumentList).Arguments, - SeparatorTkns: $4.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $4.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $4.(*ArgumentList).OpenParenthesisTkn, + Arguments: $4.(*ArgumentList).Arguments, + SeparatorTkns: $4.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn, } } | T_NS_SEPARATOR namespace_name function_call_parameter_list @@ -3707,15 +3707,15 @@ function_call: $$ = &ast.ExprFunctionCall{ Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $3), Function: &ast.NameFullyQualified{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), NsSeparatorTkn: $1, - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, - OpenParenthesisTkn: $3.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $3.(*ast.ArgumentList).Arguments, - SeparatorTkns: $3.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $3.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $3.(*ArgumentList).OpenParenthesisTkn, + Arguments: $3.(*ArgumentList).Arguments, + SeparatorTkns: $3.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $3.(*ArgumentList).CloseParenthesisTkn, } } | class_name T_PAAMAYIM_NEKUDOTAYIM variable_name function_call_parameter_list @@ -3725,13 +3725,13 @@ function_call: Class: $1, DoubleColonTkn: $2, Call: $3, - OpenParenthesisTkn: $4.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $4.(*ast.ArgumentList).Arguments, - SeparatorTkns: $4.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $4.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $4.(*ArgumentList).OpenParenthesisTkn, + Arguments: $4.(*ArgumentList).Arguments, + SeparatorTkns: $4.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn, } - if brackets, ok := $3.(*ast.ParserBrackets); ok { + if brackets, ok := $3.(*ParserBrackets); ok { staticCall.OpenCurlyBracketTkn = brackets.OpenBracketTkn staticCall.Call = brackets.Child staticCall.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -3746,10 +3746,10 @@ function_call: Class: $1, DoubleColonTkn: $2, Call: $3, - OpenParenthesisTkn: $4.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $4.(*ast.ArgumentList).Arguments, - SeparatorTkns: $4.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $4.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $4.(*ArgumentList).OpenParenthesisTkn, + Arguments: $4.(*ArgumentList).Arguments, + SeparatorTkns: $4.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn, } } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM variable_name function_call_parameter_list @@ -3759,13 +3759,13 @@ function_call: Class: $1, DoubleColonTkn: $2, Call: $3, - OpenParenthesisTkn: $4.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $4.(*ast.ArgumentList).Arguments, - SeparatorTkns: $4.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $4.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $4.(*ArgumentList).OpenParenthesisTkn, + Arguments: $4.(*ArgumentList).Arguments, + SeparatorTkns: $4.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn, } - if brackets, ok := $3.(*ast.ParserBrackets); ok { + if brackets, ok := $3.(*ParserBrackets); ok { staticCall.OpenCurlyBracketTkn = brackets.OpenBracketTkn staticCall.Call = brackets.Child staticCall.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -3780,10 +3780,10 @@ function_call: Class: $1, DoubleColonTkn: $2, Call: $3, - OpenParenthesisTkn: $4.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $4.(*ast.ArgumentList).Arguments, - SeparatorTkns: $4.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $4.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $4.(*ArgumentList).OpenParenthesisTkn, + Arguments: $4.(*ArgumentList).Arguments, + SeparatorTkns: $4.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn, } } | variable_without_objects function_call_parameter_list @@ -3791,10 +3791,10 @@ function_call: $$ = &ast.ExprFunctionCall{ Position: yylex.(*Parser).builder.NewNodesPosition($1, $2), Function: $1, - OpenParenthesisTkn: $2.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $2.(*ast.ArgumentList).Arguments, - SeparatorTkns: $2.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $2.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $2.(*ArgumentList).OpenParenthesisTkn, + Arguments: $2.(*ArgumentList).Arguments, + SeparatorTkns: $2.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $2.(*ArgumentList).CloseParenthesisTkn, } } ; @@ -3811,28 +3811,28 @@ class_name: | namespace_name { $$ = &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, } } | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$ = &ast.NameRelative{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ParserSeparatedList).Items), NsTkn: $1, NsSeparatorTkn: $2, - Parts: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, } } | T_NS_SEPARATOR namespace_name { $$ = &ast.NameFullyQualified{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), NsSeparatorTkn: $1, - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, } } ; @@ -3841,28 +3841,28 @@ fully_qualified_class_name: namespace_name { $$ = &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, } } | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$ = &ast.NameRelative{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ParserSeparatedList).Items), NsTkn: $1, NsSeparatorTkn: $2, - Parts: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, } } | T_NS_SEPARATOR namespace_name { $$ = &ast.NameFullyQualified{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), NsSeparatorTkn: $1, - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, } } ; @@ -3984,7 +3984,7 @@ backticks_expr: ctor_arguments: /* empty */ { - $$ = &ast.ArgumentList{} + $$ = &ArgumentList{} } | function_call_parameter_list { @@ -4133,36 +4133,36 @@ static_scalar_value: | namespace_name { $$ = &ast.ExprConstFetch{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), Const: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, }, } } | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$ = &ast.ExprConstFetch{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ParserSeparatedList).Items), Const: &ast.NameRelative{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ParserSeparatedList).Items), NsTkn: $1, NsSeparatorTkn: $2, - Parts: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, }, } } | T_NS_SEPARATOR namespace_name { $$ = &ast.ExprConstFetch{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), Const: &ast.NameFullyQualified{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), NsSeparatorTkn: $1, - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -4172,8 +4172,8 @@ static_scalar_value: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), ArrayTkn: $1, OpenBracketTkn: $2, - Items: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $4, } } @@ -4182,8 +4182,8 @@ static_scalar_value: $$ = &ast.ExprArray{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), OpenBracketTkn: $1, - Items: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $3, } } @@ -4513,36 +4513,36 @@ general_constant: | namespace_name { $$ = &ast.ExprConstFetch{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), Const: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, }, } } | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$ = &ast.ExprConstFetch{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ParserSeparatedList).Items), Const: &ast.NameRelative{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ParserSeparatedList).Items), NsTkn: $1, NsSeparatorTkn: $2, - Parts: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, }, } } | T_NS_SEPARATOR namespace_name { $$ = &ast.ExprConstFetch{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), Const: &ast.NameFullyQualified{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), NsSeparatorTkn: $1, - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -4603,13 +4603,13 @@ scalar: static_array_pair_list: /* empty */ { - $$ = &ast.ParserSeparatedList{} + $$ = &ParserSeparatedList{} } | non_empty_static_array_pair_list possible_comma { if $2 != nil { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, &ast.ExprArrayItem{}) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, &ast.ExprArrayItem{}) } $$ = $1 @@ -4637,8 +4637,8 @@ non_empty_static_array_pair_list: Val: $5, } - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, arrayItem) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, arrayItem) $$ = $1 } @@ -4649,14 +4649,14 @@ non_empty_static_array_pair_list: Val: $3, } - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, arrayItem) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, arrayItem) $$ = $1 } | static_scalar_value T_DOUBLE_ARROW static_scalar_value { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.ExprArrayItem{ Position: yylex.(*Parser).builder.NewNodesPosition($1, $3), @@ -4669,7 +4669,7 @@ non_empty_static_array_pair_list: } | static_scalar_value { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.ExprArrayItem{ Position: yylex.(*Parser).builder.NewNodePosition($1), @@ -4895,10 +4895,10 @@ method: { $$ = &ast.ExprMethodCall{ Position: yylex.(*Parser).builder.NewNodePosition($1), - OpenParenthesisTkn: $1.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $1.(*ast.ArgumentList).Arguments, - SeparatorTkns: $1.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $1.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $1.(*ArgumentList).OpenParenthesisTkn, + Arguments: $1.(*ArgumentList).Arguments, + SeparatorTkns: $1.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $1.(*ArgumentList).CloseParenthesisTkn, } } ; @@ -5135,7 +5135,7 @@ object_dim_list: Property: $1, } - if brackets, ok := $1.(*ast.ParserBrackets); ok { + if brackets, ok := $1.(*ParserBrackets); ok { property.OpenCurlyBracketTkn = brackets.OpenBracketTkn property.Property = brackets.Child property.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -5156,7 +5156,7 @@ variable_name: } | '{' expr '}' { - $$ = &ast.ParserBrackets{ + $$ = &ParserBrackets{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), OpenBracketTkn: $1, Child: $2, @@ -5187,14 +5187,14 @@ simple_indirect_reference: assignment_list: assignment_list ',' assignment_list_element { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | assignment_list_element { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -5211,7 +5211,7 @@ assignment_list_element: } | T_LIST '(' assignment_list ')' { - pairList := $3.(*ast.ParserSeparatedList) + pairList := $3.(*ParserSeparatedList) fistPair := pairList.Items[0].(*ast.ExprArrayItem) if fistPair.Key == nil && fistPair.Val == nil && len(pairList.Items) == 1 { @@ -5224,8 +5224,8 @@ assignment_list_element: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), ListTkn: $1, OpenBracketTkn: $2, - Items: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $4, }, } @@ -5240,13 +5240,13 @@ assignment_list_element: array_pair_list: /* empty */ { - $$ = &ast.ParserSeparatedList{} + $$ = &ParserSeparatedList{} } | non_empty_array_pair_list possible_comma { if $2 != nil { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, &ast.ExprArrayItem{}) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, &ast.ExprArrayItem{}) } $$ = $1 @@ -5263,8 +5263,8 @@ non_empty_array_pair_list: Val: $5, } - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, arrayItem) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, arrayItem) $$ = $1 } @@ -5275,14 +5275,14 @@ non_empty_array_pair_list: Val: $3, } - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, arrayItem) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, arrayItem) $$ = $1 } | expr T_DOUBLE_ARROW expr { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.ExprArrayItem{ Position: yylex.(*Parser).builder.NewNodesPosition($1, $3), @@ -5295,7 +5295,7 @@ non_empty_array_pair_list: } | expr { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.ExprArrayItem{ Position: yylex.(*Parser).builder.NewNodePosition($1), @@ -5314,8 +5314,8 @@ non_empty_array_pair_list: Val: $6, } - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, arrayItem) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, arrayItem) $$ = $1 } @@ -5327,14 +5327,14 @@ non_empty_array_pair_list: Val: $4, } - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, arrayItem) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, arrayItem) $$ = $1 } | expr T_DOUBLE_ARROW '&' w_variable { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.ExprArrayItem{ Position: yylex.(*Parser).builder.NewNodesPosition($1, $4), @@ -5348,7 +5348,7 @@ non_empty_array_pair_list: } | '&' w_variable { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.ExprArrayItem{ Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $2), @@ -5537,8 +5537,8 @@ internal_functions_in_yacc: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), IssetTkn: $1, OpenParenthesisTkn: $2, - Vars: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Vars: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: $4, } } @@ -5609,14 +5609,14 @@ internal_functions_in_yacc: isset_variables: isset_variable { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } | isset_variables ',' isset_variable { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } diff --git a/internal/php7/node.go b/internal/php7/node.go new file mode 100644 index 0000000..dfb0236 --- /dev/null +++ b/internal/php7/node.go @@ -0,0 +1,99 @@ +package php7 + +import ( + "github.com/z7zmey/php-parser/pkg/ast" + "github.com/z7zmey/php-parser/pkg/position" + "github.com/z7zmey/php-parser/pkg/token" +) + +type ParserBrackets struct { + Position *position.Position + OpenBracketTkn *token.Token + Child ast.Vertex + CloseBracketTkn *token.Token +} + +func (n *ParserBrackets) Accept(v ast.Visitor) { + // do nothing +} + +func (n *ParserBrackets) GetPosition() *position.Position { + return n.Position +} + +type ParserSeparatedList struct { + Position *position.Position + Items []ast.Vertex + SeparatorTkns []*token.Token +} + +func (n *ParserSeparatedList) Accept(v ast.Visitor) { + // do nothing +} + +func (n *ParserSeparatedList) GetPosition() *position.Position { + return n.Position +} + +// TraitAdaptationList node +type TraitAdaptationList struct { + Position *position.Position + OpenCurlyBracketTkn *token.Token + Adaptations []ast.Vertex + CloseCurlyBracketTkn *token.Token +} + +func (n *TraitAdaptationList) Accept(v ast.Visitor) { + // do nothing +} + +func (n *TraitAdaptationList) GetPosition() *position.Position { + return n.Position +} + +// ArgumentList node +type ArgumentList struct { + Position *position.Position + OpenParenthesisTkn *token.Token + Arguments []ast.Vertex + SeparatorTkns []*token.Token + CloseParenthesisTkn *token.Token +} + +func (n *ArgumentList) Accept(v ast.Visitor) { + // do nothing +} + +func (n *ArgumentList) GetPosition() *position.Position { + return n.Position +} + +type ReturnType struct { + Position *position.Position + ColonTkn *token.Token + Type ast.Vertex +} + +func (n *ReturnType) Accept(v ast.Visitor) { + // do nothing +} + +func (n *ReturnType) GetPosition() *position.Position { + return n.Position +} + +// TraitMethodRef node +type TraitMethodRef struct { + Position *position.Position + Trait ast.Vertex + DoubleColonTkn *token.Token + Method ast.Vertex +} + +func (n *TraitMethodRef) Accept(v ast.Visitor) { + // do nothing +} + +func (n *TraitMethodRef) GetPosition() *position.Position { + return n.Position +} diff --git a/internal/php7/php7.go b/internal/php7/php7.go index 8c4c775..9810e30 100644 --- a/internal/php7/php7.go +++ b/internal/php7/php7.go @@ -2596,7 +2596,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:338 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.NameNamePart{ Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token), @@ -2616,8 +2616,8 @@ yydefault: Value: yyDollar[3].token.Value, } - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, part) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, part) yyVAL.node = yyDollar[1].node } @@ -2626,9 +2626,9 @@ yydefault: // line internal/php7/php7.y:366 { yyVAL.node = &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, } } case 84: @@ -2636,11 +2636,11 @@ yydefault: // line internal/php7/php7.y:374 { yyVAL.node = &ast.NameRelative{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].node.(*ParserSeparatedList).Items), NsTkn: yyDollar[1].token, NsSeparatorTkn: yyDollar[2].token, - Parts: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, } } case 85: @@ -2648,10 +2648,10 @@ yydefault: // line internal/php7/php7.y:384 { yyVAL.node = &ast.NameFullyQualified{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), NsSeparatorTkn: yyDollar[1].token, - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, } } case 86: @@ -2711,9 +2711,9 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), NsTkn: yyDollar[1].token, Name: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items), + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, SemiColonTkn: yyDollar[3].token, } @@ -2726,9 +2726,9 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token), NsTkn: yyDollar[1].token, Name: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items), + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, OpenCurlyBracketTkn: yyDollar[3].token, Stmts: yyDollar[4].list, @@ -2779,8 +2779,8 @@ yydefault: yyVAL.node = &ast.StmtUse{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), UseTkn: yyDollar[1].token, - UseDeclarations: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: yyDollar[3].token, } } @@ -2792,8 +2792,8 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), UseTkn: yyDollar[1].token, Type: yyDollar[2].node, - UseDeclarations: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: yyDollar[4].token, } } @@ -2804,8 +2804,8 @@ yydefault: yyVAL.node = &ast.StmtConstList{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), ConstTkn: yyDollar[1].token, - Consts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Consts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: yyDollar[3].token, } } @@ -2834,20 +2834,20 @@ yydefault: // line internal/php7/php7.y:543 { if yyDollar[5].token != nil { - yyDollar[4].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[4].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[5].token) + yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[5].token) } yyVAL.node = &ast.StmtGroupUse{ - Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[6].token), + Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[6].token), Prefix: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, }, NsSeparatorTkn: yyDollar[2].token, OpenCurlyBracketTkn: yyDollar[3].token, - UseDeclarations: yyDollar[4].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[4].node.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: yyDollar[4].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns, CloseCurlyBracketTkn: yyDollar[6].token, } } @@ -2856,21 +2856,21 @@ yydefault: // line internal/php7/php7.y:563 { if yyDollar[6].token != nil { - yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[6].token) + yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[6].token) } yyVAL.node = &ast.StmtGroupUse{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[7].token), LeadingNsSeparatorTkn: yyDollar[1].token, Prefix: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items), + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, NsSeparatorTkn: yyDollar[3].token, OpenCurlyBracketTkn: yyDollar[4].token, - UseDeclarations: yyDollar[5].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: yyDollar[5].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns, CloseCurlyBracketTkn: yyDollar[7].token, } } @@ -2879,20 +2879,20 @@ yydefault: // line internal/php7/php7.y:587 { if yyDollar[5].token != nil { - yyDollar[4].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[4].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[5].token) + yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[5].token) } yyVAL.node = &ast.StmtGroupUse{ - Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[6].token), + Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[6].token), Prefix: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, }, NsSeparatorTkn: yyDollar[2].token, OpenCurlyBracketTkn: yyDollar[3].token, - UseDeclarations: yyDollar[4].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[4].node.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: yyDollar[4].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns, CloseCurlyBracketTkn: yyDollar[6].token, } } @@ -2901,21 +2901,21 @@ yydefault: // line internal/php7/php7.y:607 { if yyDollar[6].token != nil { - yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[6].token) + yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[6].token) } yyVAL.node = &ast.StmtGroupUse{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[7].token), LeadingNsSeparatorTkn: yyDollar[1].token, Prefix: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items), + Parts: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, }, NsSeparatorTkn: yyDollar[3].token, OpenCurlyBracketTkn: yyDollar[4].token, - UseDeclarations: yyDollar[5].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: yyDollar[5].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns, CloseCurlyBracketTkn: yyDollar[7].token, } } @@ -2935,8 +2935,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:642 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -2944,7 +2944,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:649 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -2952,8 +2952,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:658 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -2961,7 +2961,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:665 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -2969,8 +2969,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:674 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -2978,7 +2978,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:681 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -3003,11 +3003,11 @@ yydefault: // line internal/php7/php7.y:705 { yyVAL.node = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, }, } } @@ -3016,11 +3016,11 @@ yydefault: // line internal/php7/php7.y:716 { yyVAL.node = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].token), + Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].token), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ast.ParserSeparatedList).Items), - Parts: yyDollar[1].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items), + Parts: yyDollar[1].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: yyDollar[2].token, Alias: &ast.Identifier{ @@ -3050,8 +3050,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:751 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -3059,7 +3059,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:758 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -3182,14 +3182,14 @@ yydefault: { yyDollar[9].node.(*ast.StmtFor).ForTkn = yyDollar[1].token yyDollar[9].node.(*ast.StmtFor).OpenParenthesisTkn = yyDollar[2].token - yyDollar[9].node.(*ast.StmtFor).Init = yyDollar[3].node.(*ast.ParserSeparatedList).Items - yyDollar[9].node.(*ast.StmtFor).InitSeparatorTkns = yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns + yyDollar[9].node.(*ast.StmtFor).Init = yyDollar[3].node.(*ParserSeparatedList).Items + yyDollar[9].node.(*ast.StmtFor).InitSeparatorTkns = yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns yyDollar[9].node.(*ast.StmtFor).InitSemiColonTkn = yyDollar[4].token - yyDollar[9].node.(*ast.StmtFor).Cond = yyDollar[5].node.(*ast.ParserSeparatedList).Items - yyDollar[9].node.(*ast.StmtFor).CondSeparatorTkns = yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns + yyDollar[9].node.(*ast.StmtFor).Cond = yyDollar[5].node.(*ParserSeparatedList).Items + yyDollar[9].node.(*ast.StmtFor).CondSeparatorTkns = yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns yyDollar[9].node.(*ast.StmtFor).CondSemiColonTkn = yyDollar[6].token - yyDollar[9].node.(*ast.StmtFor).Loop = yyDollar[7].node.(*ast.ParserSeparatedList).Items - yyDollar[9].node.(*ast.StmtFor).LoopSeparatorTkns = yyDollar[7].node.(*ast.ParserSeparatedList).SeparatorTkns + yyDollar[9].node.(*ast.StmtFor).Loop = yyDollar[7].node.(*ParserSeparatedList).Items + yyDollar[9].node.(*ast.StmtFor).LoopSeparatorTkns = yyDollar[7].node.(*ParserSeparatedList).SeparatorTkns yyDollar[9].node.(*ast.StmtFor).CloseParenthesisTkn = yyDollar[8].token yyDollar[9].node.(*ast.StmtFor).Position = yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node) @@ -3355,8 +3355,8 @@ yydefault: { yyDollar[5].node.(*ast.StmtDeclare).DeclareTkn = yyDollar[1].token yyDollar[5].node.(*ast.StmtDeclare).OpenParenthesisTkn = yyDollar[2].token - yyDollar[5].node.(*ast.StmtDeclare).Consts = yyDollar[3].node.(*ast.ParserSeparatedList).Items - yyDollar[5].node.(*ast.StmtDeclare).SeparatorTkns = yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns + yyDollar[5].node.(*ast.StmtDeclare).Consts = yyDollar[3].node.(*ParserSeparatedList).Items + yyDollar[5].node.(*ast.StmtDeclare).SeparatorTkns = yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns yyDollar[5].node.(*ast.StmtDeclare).CloseParenthesisTkn = yyDollar[4].token yyDollar[5].node.(*ast.StmtDeclare).Position = yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) @@ -3531,11 +3531,11 @@ yydefault: Value: yyDollar[3].token.Value, }, OpenParenthesisTkn: yyDollar[5].token, - Params: yyDollar[6].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[6].node.(*ast.ParserSeparatedList).SeparatorTkns, + Params: yyDollar[6].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[6].node.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: yyDollar[7].token, - ColonTkn: yyDollar[8].node.(*ast.ReturnType).ColonTkn, - ReturnType: yyDollar[8].node.(*ast.ReturnType).Type, + ColonTkn: yyDollar[8].node.(*ReturnType).ColonTkn, + ReturnType: yyDollar[8].node.(*ReturnType).Type, OpenCurlyBracketTkn: yyDollar[9].token, Stmts: yyDollar[10].list, CloseCurlyBracketTkn: yyDollar[11].token, @@ -3727,10 +3727,10 @@ yydefault: // line internal/php7/php7.y:1358 { yyVAL.node = &ast.StmtInterface{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), ExtendsTkn: yyDollar[1].token, - Extends: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - ExtendsSeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Extends: yyDollar[2].node.(*ParserSeparatedList).Items, + ExtendsSeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, } } case 182: @@ -3744,10 +3744,10 @@ yydefault: // line internal/php7/php7.y:1374 { yyVAL.node = &ast.StmtClass{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items), ImplementsTkn: yyDollar[1].token, - Implements: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - ImplementsSeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Implements: yyDollar[2].node.(*ParserSeparatedList).Items, + ImplementsSeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, } } case 184: @@ -3774,8 +3774,8 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), ListTkn: yyDollar[1].token, OpenBracketTkn: yyDollar[2].token, - Items: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[4].token, } } @@ -3786,8 +3786,8 @@ yydefault: yyVAL.node = &ast.ExprList{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), OpenBracketTkn: yyDollar[1].token, - Items: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[3].token, } } @@ -4101,13 +4101,13 @@ yydefault: yyDollar = yyS[yypt-0 : yypt+1] // line internal/php7/php7.y:1709 { - yyVAL.node = &ast.ParserSeparatedList{} + yyVAL.node = &ParserSeparatedList{} } case 215: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:1716 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -4115,8 +4115,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:1722 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -4236,13 +4236,13 @@ yydefault: yyDollar = yyS[yypt-0 : yypt+1] // line internal/php7/php7.y:1838 { - yyVAL.node = &ast.ReturnType{} + yyVAL.node = &ReturnType{} } case 227: yyDollar = yyS[yypt-2 : yypt+1] // line internal/php7/php7.y:1842 { - yyVAL.node = &ast.ReturnType{ + yyVAL.node = &ReturnType{ ColonTkn: yyDollar[1].token, Type: yyDollar[2].node, } @@ -4251,7 +4251,7 @@ yydefault: yyDollar = yyS[yypt-2 : yypt+1] // line internal/php7/php7.y:1852 { - yyVAL.node = &ast.ArgumentList{ + yyVAL.node = &ArgumentList{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token), OpenParenthesisTkn: yyDollar[1].token, CloseParenthesisTkn: yyDollar[2].token, @@ -4261,7 +4261,7 @@ yydefault: yyDollar = yyS[yypt-4 : yypt+1] // line internal/php7/php7.y:1860 { - argumentList := yyDollar[2].node.(*ast.ArgumentList) + argumentList := yyDollar[2].node.(*ArgumentList) argumentList.Position = yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) argumentList.OpenParenthesisTkn = yyDollar[1].token if yyDollar[3].token != nil { @@ -4275,7 +4275,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:1875 { - yyVAL.node = &ast.ArgumentList{ + yyVAL.node = &ArgumentList{ Arguments: []ast.Vertex{yyDollar[1].node}, } } @@ -4283,8 +4283,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:1881 { - yyDollar[1].node.(*ast.ArgumentList).SeparatorTkns = append(yyDollar[1].node.(*ast.ArgumentList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ArgumentList).Arguments = append(yyDollar[1].node.(*ast.ArgumentList).Arguments, yyDollar[3].node) + yyDollar[1].node.(*ArgumentList).SeparatorTkns = append(yyDollar[1].node.(*ArgumentList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ArgumentList).Arguments = append(yyDollar[1].node.(*ArgumentList).Arguments, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -4402,8 +4402,8 @@ yydefault: Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[4].token), Modifiers: yyDollar[1].list, Type: yyDollar[2].node, - Properties: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Properties: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: yyDollar[4].token, } } @@ -4415,8 +4415,8 @@ yydefault: Position: yylex.(*Parser).builder.NewOptionalListTokensPosition(yyDollar[1].list, yyDollar[2].token, yyDollar[4].token), Modifiers: yyDollar[1].list, ConstTkn: yyDollar[2].token, - Consts: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Consts: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: yyDollar[4].token, } } @@ -4427,12 +4427,12 @@ yydefault: traitUse := &ast.StmtTraitUse{ Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node), UseTkn: yyDollar[1].token, - Traits: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Traits: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, } switch n := yyDollar[3].node.(type) { - case *ast.TraitAdaptationList: + case *TraitAdaptationList: traitUse.OpenCurlyBracketTkn = n.OpenCurlyBracketTkn traitUse.Adaptations = n.Adaptations traitUse.CloseCurlyBracketTkn = n.CloseCurlyBracketTkn @@ -4462,11 +4462,11 @@ yydefault: Value: yyDollar[4].token.Value, }, OpenParenthesisTkn: yyDollar[6].token, - Params: yyDollar[7].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[7].node.(*ast.ParserSeparatedList).SeparatorTkns, + Params: yyDollar[7].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[7].node.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: yyDollar[8].token, - ColonTkn: yyDollar[9].node.(*ast.ReturnType).ColonTkn, - ReturnType: yyDollar[9].node.(*ast.ReturnType).Type, + ColonTkn: yyDollar[9].node.(*ReturnType).ColonTkn, + ReturnType: yyDollar[9].node.(*ReturnType).Type, Stmt: yyDollar[10].node, } } @@ -4474,7 +4474,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:2064 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -4482,8 +4482,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:2070 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -4500,7 +4500,7 @@ yydefault: yyDollar = yyS[yypt-2 : yypt+1] // line internal/php7/php7.y:2087 { - yyVAL.node = &ast.TraitAdaptationList{ + yyVAL.node = &TraitAdaptationList{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token), OpenCurlyBracketTkn: yyDollar[1].token, CloseCurlyBracketTkn: yyDollar[2].token, @@ -4510,7 +4510,7 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:2095 { - yyVAL.node = &ast.TraitAdaptationList{ + yyVAL.node = &TraitAdaptationList{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), OpenCurlyBracketTkn: yyDollar[1].token, Adaptations: yyDollar[2].list, @@ -4550,13 +4550,13 @@ yydefault: // line internal/php7/php7.y:2133 { yyVAL.node = &ast.StmtTraitUsePrecedence{ - Position: yylex.(*Parser).builder.NewNodeNodeListPosition(yyDollar[1].node, yyDollar[3].node.(*ast.ParserSeparatedList).Items), - Trait: yyDollar[1].node.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: yyDollar[1].node.(*ast.TraitMethodRef).DoubleColonTkn, - Method: yyDollar[1].node.(*ast.TraitMethodRef).Method, + Position: yylex.(*Parser).builder.NewNodeNodeListPosition(yyDollar[1].node, yyDollar[3].node.(*ParserSeparatedList).Items), + Trait: yyDollar[1].node.(*TraitMethodRef).Trait, + DoubleColonTkn: yyDollar[1].node.(*TraitMethodRef).DoubleColonTkn, + Method: yyDollar[1].node.(*TraitMethodRef).Method, InsteadofTkn: yyDollar[2].token, - Insteadof: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Insteadof: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, } } case 257: @@ -4565,9 +4565,9 @@ yydefault: { yyVAL.node = &ast.StmtTraitUseAlias{ Position: yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token), - Trait: yyDollar[1].node.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: yyDollar[1].node.(*ast.TraitMethodRef).DoubleColonTkn, - Method: yyDollar[1].node.(*ast.TraitMethodRef).Method, + Trait: yyDollar[1].node.(*TraitMethodRef).Trait, + DoubleColonTkn: yyDollar[1].node.(*TraitMethodRef).DoubleColonTkn, + Method: yyDollar[1].node.(*TraitMethodRef).Method, AsTkn: yyDollar[2].token, Alias: &ast.Identifier{ Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token), @@ -4582,9 +4582,9 @@ yydefault: { yyVAL.node = &ast.StmtTraitUseAlias{ Position: yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token), - Trait: yyDollar[1].node.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: yyDollar[1].node.(*ast.TraitMethodRef).DoubleColonTkn, - Method: yyDollar[1].node.(*ast.TraitMethodRef).Method, + Trait: yyDollar[1].node.(*TraitMethodRef).Trait, + DoubleColonTkn: yyDollar[1].node.(*TraitMethodRef).DoubleColonTkn, + Method: yyDollar[1].node.(*TraitMethodRef).Method, AsTkn: yyDollar[2].token, Alias: &ast.Identifier{ Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token), @@ -4599,9 +4599,9 @@ yydefault: { yyVAL.node = &ast.StmtTraitUseAlias{ Position: yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token), - Trait: yyDollar[1].node.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: yyDollar[1].node.(*ast.TraitMethodRef).DoubleColonTkn, - Method: yyDollar[1].node.(*ast.TraitMethodRef).Method, + Trait: yyDollar[1].node.(*TraitMethodRef).Trait, + DoubleColonTkn: yyDollar[1].node.(*TraitMethodRef).DoubleColonTkn, + Method: yyDollar[1].node.(*TraitMethodRef).Method, AsTkn: yyDollar[2].token, Modifier: yyDollar[3].node, Alias: &ast.Identifier{ @@ -4617,9 +4617,9 @@ yydefault: { yyVAL.node = &ast.StmtTraitUseAlias{ Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node), - Trait: yyDollar[1].node.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: yyDollar[1].node.(*ast.TraitMethodRef).DoubleColonTkn, - Method: yyDollar[1].node.(*ast.TraitMethodRef).Method, + Trait: yyDollar[1].node.(*TraitMethodRef).Trait, + DoubleColonTkn: yyDollar[1].node.(*TraitMethodRef).DoubleColonTkn, + Method: yyDollar[1].node.(*TraitMethodRef).Method, AsTkn: yyDollar[2].token, Modifier: yyDollar[3].node, } @@ -4628,7 +4628,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:2208 { - yyVAL.node = &ast.TraitMethodRef{ + yyVAL.node = &TraitMethodRef{ Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token), Method: &ast.Identifier{ Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token), @@ -4647,7 +4647,7 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:2226 { - yyVAL.node = &ast.TraitMethodRef{ + yyVAL.node = &TraitMethodRef{ Position: yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token), Trait: yyDollar[1].node, DoubleColonTkn: yyDollar[2].token, @@ -4784,8 +4784,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:2351 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -4793,7 +4793,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:2358 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -4836,8 +4836,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:2401 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -4845,7 +4845,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:2408 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -4906,7 +4906,7 @@ yydefault: yyDollar = yyS[yypt-0 : yypt+1] // line internal/php7/php7.y:2472 { - yyVAL.node = &ast.ParserSeparatedList{} + yyVAL.node = &ParserSeparatedList{} } case 290: yyDollar = yyS[yypt-1 : yypt+1] @@ -4918,8 +4918,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:2483 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -4927,7 +4927,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:2490 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -4938,10 +4938,10 @@ yydefault: class := &ast.StmtClass{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[8].token), ClassTkn: yyDollar[1].token, - OpenParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[2].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[2].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[2].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[2].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[2].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[2].node.(*ArgumentList).CloseParenthesisTkn, OpenCurlyBracketTkn: yyDollar[6].token, Stmts: yyDollar[7].list, CloseCurlyBracketTkn: yyDollar[8].token, @@ -4969,10 +4969,10 @@ yydefault: Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node), NewTkn: yyDollar[1].token, Class: yyDollar[2].node, - OpenParenthesisTkn: yyDollar[3].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[3].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[3].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[3].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[3].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[3].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[3].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[3].node.(*ArgumentList).CloseParenthesisTkn, } } else { yyVAL.node = &ast.ExprNew{ @@ -5002,8 +5002,8 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), ListTkn: yyDollar[1].token, OpenBracketTkn: yyDollar[2].token, - Items: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[4].token, }, EqualTkn: yyDollar[5].token, @@ -5019,8 +5019,8 @@ yydefault: Var: &ast.ExprList{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), OpenBracketTkn: yyDollar[1].token, - Items: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[3].token, }, EqualTkn: yyDollar[4].token, @@ -5837,11 +5837,11 @@ yydefault: closure.FunctionTkn = yyDollar[1].token closure.AmpersandTkn = yyDollar[2].token closure.OpenParenthesisTkn = yyDollar[4].token - closure.Params = yyDollar[5].node.(*ast.ParserSeparatedList).Items - closure.SeparatorTkns = yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns + closure.Params = yyDollar[5].node.(*ParserSeparatedList).Items + closure.SeparatorTkns = yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns closure.CloseParenthesisTkn = yyDollar[6].token - closure.ColonTkn = yyDollar[8].node.(*ast.ReturnType).ColonTkn - closure.ReturnType = yyDollar[8].node.(*ast.ReturnType).Type + closure.ColonTkn = yyDollar[8].node.(*ReturnType).ColonTkn + closure.ReturnType = yyDollar[8].node.(*ReturnType).Type closure.OpenCurlyBracketTkn = yyDollar[9].token closure.Stmts = yyDollar[10].list closure.CloseCurlyBracketTkn = yyDollar[11].token @@ -5857,11 +5857,11 @@ yydefault: FnTkn: yyDollar[1].token, AmpersandTkn: yyDollar[2].token, OpenParenthesisTkn: yyDollar[3].token, - Params: yyDollar[4].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[4].node.(*ast.ParserSeparatedList).SeparatorTkns, + Params: yyDollar[4].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: yyDollar[5].token, - ColonTkn: yyDollar[6].node.(*ast.ReturnType).ColonTkn, - ReturnType: yyDollar[6].node.(*ast.ReturnType).Type, + ColonTkn: yyDollar[6].node.(*ReturnType).ColonTkn, + ReturnType: yyDollar[6].node.(*ReturnType).Type, DoubleArrowTkn: yyDollar[8].token, Expr: yyDollar[9].node, } @@ -5891,8 +5891,8 @@ yydefault: yyVAL.node = &ast.ExprClosure{ UseTkn: yyDollar[1].token, UseOpenParenthesisTkn: yyDollar[2].token, - Use: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - UseSeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Use: yyDollar[3].node.(*ParserSeparatedList).Items, + UseSeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, UseCloseParenthesisTkn: yyDollar[4].token, } } @@ -5900,8 +5900,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:3314 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -5909,7 +5909,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:3321 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -5953,10 +5953,10 @@ yydefault: yyVAL.node = &ast.ExprFunctionCall{ Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[2].node), Function: yyDollar[1].node, - OpenParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[2].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[2].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[2].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[2].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[2].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[2].node.(*ArgumentList).CloseParenthesisTkn, } } case 385: @@ -5968,13 +5968,13 @@ yydefault: Class: yyDollar[1].node, DoubleColonTkn: yyDollar[2].token, Call: yyDollar[3].node, - OpenParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[4].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[4].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[4].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[4].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn, } - if brackets, ok := yyDollar[3].node.(*ast.ParserBrackets); ok { + if brackets, ok := yyDollar[3].node.(*ParserBrackets); ok { staticCall.OpenCurlyBracketTkn = brackets.OpenBracketTkn staticCall.Call = brackets.Child staticCall.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -5991,13 +5991,13 @@ yydefault: Class: yyDollar[1].node, DoubleColonTkn: yyDollar[2].token, Call: yyDollar[3].node, - OpenParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[4].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[4].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[4].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[4].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn, } - if brackets, ok := yyDollar[3].node.(*ast.ParserBrackets); ok { + if brackets, ok := yyDollar[3].node.(*ParserBrackets); ok { staticCall.OpenCurlyBracketTkn = brackets.OpenBracketTkn staticCall.Call = brackets.Child staticCall.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -6012,10 +6012,10 @@ yydefault: yyVAL.node = &ast.ExprFunctionCall{ Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[2].node), Function: yyDollar[1].node, - OpenParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[2].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[2].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[2].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[2].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[2].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[2].node.(*ArgumentList).CloseParenthesisTkn, } } case 388: @@ -6091,7 +6091,7 @@ yydefault: yyDollar = yyS[yypt-0 : yypt+1] // line internal/php7/php7.y:3492 { - yyVAL.node = &ast.ArgumentList{} + yyVAL.node = &ArgumentList{} } case 398: yyDollar = yyS[yypt-1 : yypt+1] @@ -6107,8 +6107,8 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), ArrayTkn: yyDollar[1].token, OpenBracketTkn: yyDollar[2].token, - Items: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[4].token, } } @@ -6119,8 +6119,8 @@ yydefault: yyVAL.node = &ast.ExprArray{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), OpenBracketTkn: yyDollar[1].token, - Items: yyDollar[2].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[2].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[3].token, } } @@ -6461,13 +6461,13 @@ yydefault: Var: yyDollar[1].node, ObjectOperatorTkn: yyDollar[2].token, Method: yyDollar[3].node, - OpenParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: yyDollar[4].node.(*ast.ArgumentList).Arguments, - SeparatorTkns: yyDollar[4].node.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: yyDollar[4].node.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn, + Arguments: yyDollar[4].node.(*ArgumentList).Arguments, + SeparatorTkns: yyDollar[4].node.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn, } - if brackets, ok := yyDollar[3].node.(*ast.ParserBrackets); ok { + if brackets, ok := yyDollar[3].node.(*ParserBrackets); ok { methodCall.OpenCurlyBracketTkn = brackets.OpenBracketTkn methodCall.Method = brackets.Child methodCall.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -6504,7 +6504,7 @@ yydefault: Property: yyDollar[3].node, } - if brackets, ok := yyDollar[3].node.(*ast.ParserBrackets); ok { + if brackets, ok := yyDollar[3].node.(*ParserBrackets); ok { propertyFetch.OpenCurlyBracketTkn = brackets.OpenBracketTkn propertyFetch.Property = brackets.Child propertyFetch.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -6610,7 +6610,7 @@ yydefault: Property: yyDollar[3].node, } - if brackets, ok := yyDollar[3].node.(*ast.ParserBrackets); ok { + if brackets, ok := yyDollar[3].node.(*ParserBrackets); ok { propertyFetch.OpenCurlyBracketTkn = brackets.OpenBracketTkn propertyFetch.Property = brackets.Child propertyFetch.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -6654,7 +6654,7 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:3985 { - yyVAL.node = &ast.ParserBrackets{ + yyVAL.node = &ParserBrackets{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), OpenBracketTkn: yyDollar[1].token, Child: yyDollar[2].node, @@ -6681,7 +6681,7 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:4009 { - yyVAL.node = &ast.ParserBrackets{ + yyVAL.node = &ParserBrackets{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token), OpenBracketTkn: yyDollar[1].token, Child: yyDollar[2].node, @@ -6698,7 +6698,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:4025 { - pairList := yyDollar[1].node.(*ast.ParserSeparatedList) + pairList := yyDollar[1].node.(*ParserSeparatedList) fistPair := pairList.Items[0].(*ast.ExprArrayItem) if fistPair.Key == nil && fistPair.Val == nil && len(pairList.Items) == 1 { @@ -6723,8 +6723,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:4050 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } @@ -6732,7 +6732,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:4057 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -6800,8 +6800,8 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[3].token, yyDollar[6].token), ListTkn: yyDollar[3].token, OpenBracketTkn: yyDollar[4].token, - Items: yyDollar[5].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[5].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[5].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[6].token, }, } @@ -6816,8 +6816,8 @@ yydefault: Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token), ListTkn: yyDollar[1].token, OpenBracketTkn: yyDollar[2].token, - Items: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Items: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: yyDollar[4].token, }, } @@ -7042,15 +7042,15 @@ yydefault: // line internal/php7/php7.y:4335 { if yyDollar[4].token != nil { - yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[4].token) + yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[4].token) } yyVAL.node = &ast.ExprIsset{ Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token), IssetTkn: yyDollar[1].token, OpenParenthesisTkn: yyDollar[2].token, - Vars: yyDollar[3].node.(*ast.ParserSeparatedList).Items, - SeparatorTkns: yyDollar[3].node.(*ast.ParserSeparatedList).SeparatorTkns, + Vars: yyDollar[3].node.(*ParserSeparatedList).Items, + SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: yyDollar[5].token, } } @@ -7122,7 +7122,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] // line internal/php7/php7.y:4405 { - yyVAL.node = &ast.ParserSeparatedList{ + yyVAL.node = &ParserSeparatedList{ Items: []ast.Vertex{yyDollar[1].node}, } } @@ -7130,8 +7130,8 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] // line internal/php7/php7.y:4411 { - yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ast.ParserSeparatedList).SeparatorTkns, yyDollar[2].token) - yyDollar[1].node.(*ast.ParserSeparatedList).Items = append(yyDollar[1].node.(*ast.ParserSeparatedList).Items, yyDollar[3].node) + yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[2].token) + yyDollar[1].node.(*ParserSeparatedList).Items = append(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].node) yyVAL.node = yyDollar[1].node } diff --git a/internal/php7/php7.y b/internal/php7/php7.y index 0b15329..6a3f21d 100644 --- a/internal/php7/php7.y +++ b/internal/php7/php7.y @@ -336,7 +336,7 @@ top_statement_list: namespace_name: T_STRING { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{ &ast.NameNamePart{ Position: yylex.(*Parser).builder.NewTokenPosition($1), @@ -354,8 +354,8 @@ namespace_name: Value: $3.Value, } - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, part) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, part) $$ = $1 } @@ -365,28 +365,28 @@ name: namespace_name { $$ = &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, } } | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$ = &ast.NameRelative{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $3.(*ParserSeparatedList).Items), NsTkn: $1, NsSeparatorTkn: $2, - Parts: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, } } | T_NS_SEPARATOR namespace_name { $$ = &ast.NameFullyQualified{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), NsSeparatorTkn: $1, - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, } } ; @@ -433,9 +433,9 @@ top_statement: Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), NsTkn: $1, Name: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ast.ParserSeparatedList).Items), - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items), + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, SemiColonTkn: $3, } @@ -446,9 +446,9 @@ top_statement: Position: yylex.(*Parser).builder.NewTokensPosition($1, $5), NsTkn: $1, Name: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ast.ParserSeparatedList).Items), - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items), + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, OpenCurlyBracketTkn: $3, Stmts: $4, @@ -491,8 +491,8 @@ top_statement: $$ = &ast.StmtUse{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), UseTkn: $1, - UseDeclarations: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: $3, } } @@ -502,8 +502,8 @@ top_statement: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), UseTkn: $1, Type: $2, - UseDeclarations: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: $4, } } @@ -512,8 +512,8 @@ top_statement: $$ = &ast.StmtConstList{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), ConstTkn: $1, - Consts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Consts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: $3, } } @@ -542,41 +542,41 @@ group_use_declaration: namespace_name T_NS_SEPARATOR '{' unprefixed_use_declarations possible_comma '}' { if $5 != nil { - $4.(*ast.ParserSeparatedList).SeparatorTkns = append($4.(*ast.ParserSeparatedList).SeparatorTkns, $5) + $4.(*ParserSeparatedList).SeparatorTkns = append($4.(*ParserSeparatedList).SeparatorTkns, $5) } $$ = &ast.StmtGroupUse{ - Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ast.ParserSeparatedList).Items, $6), + Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ParserSeparatedList).Items, $6), Prefix: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, }, NsSeparatorTkn: $2, OpenCurlyBracketTkn: $3, - UseDeclarations: $4.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $4.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: $4.(*ParserSeparatedList).Items, + SeparatorTkns: $4.(*ParserSeparatedList).SeparatorTkns, CloseCurlyBracketTkn: $6, } } | T_NS_SEPARATOR namespace_name T_NS_SEPARATOR '{' unprefixed_use_declarations possible_comma '}' { if $6 != nil { - $5.(*ast.ParserSeparatedList).SeparatorTkns = append($5.(*ast.ParserSeparatedList).SeparatorTkns, $6) + $5.(*ParserSeparatedList).SeparatorTkns = append($5.(*ParserSeparatedList).SeparatorTkns, $6) } $$ = &ast.StmtGroupUse{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $7), LeadingNsSeparatorTkn: $1, Prefix: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ast.ParserSeparatedList).Items), - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items), + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, NsSeparatorTkn: $3, OpenCurlyBracketTkn: $4, - UseDeclarations: $5.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $5.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: $5.(*ParserSeparatedList).Items, + SeparatorTkns: $5.(*ParserSeparatedList).SeparatorTkns, CloseCurlyBracketTkn: $7, } } @@ -586,41 +586,41 @@ mixed_group_use_declaration: namespace_name T_NS_SEPARATOR '{' inline_use_declarations possible_comma '}' { if $5 != nil { - $4.(*ast.ParserSeparatedList).SeparatorTkns = append($4.(*ast.ParserSeparatedList).SeparatorTkns, $5) + $4.(*ParserSeparatedList).SeparatorTkns = append($4.(*ParserSeparatedList).SeparatorTkns, $5) } $$ = &ast.StmtGroupUse{ - Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ast.ParserSeparatedList).Items, $6), + Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ParserSeparatedList).Items, $6), Prefix: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, }, NsSeparatorTkn: $2, OpenCurlyBracketTkn: $3, - UseDeclarations: $4.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $4.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: $4.(*ParserSeparatedList).Items, + SeparatorTkns: $4.(*ParserSeparatedList).SeparatorTkns, CloseCurlyBracketTkn: $6, } } | T_NS_SEPARATOR namespace_name T_NS_SEPARATOR '{' inline_use_declarations possible_comma '}' { if $6 != nil { - $5.(*ast.ParserSeparatedList).SeparatorTkns = append($5.(*ast.ParserSeparatedList).SeparatorTkns, $6) + $5.(*ParserSeparatedList).SeparatorTkns = append($5.(*ParserSeparatedList).SeparatorTkns, $6) } $$ = &ast.StmtGroupUse{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $7), LeadingNsSeparatorTkn: $1, Prefix: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ast.ParserSeparatedList).Items), - Parts: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items), + Parts: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }, NsSeparatorTkn: $3, OpenCurlyBracketTkn: $4, - UseDeclarations: $5.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $5.(*ast.ParserSeparatedList).SeparatorTkns, + UseDeclarations: $5.(*ParserSeparatedList).Items, + SeparatorTkns: $5.(*ParserSeparatedList).SeparatorTkns, CloseCurlyBracketTkn: $7, } } @@ -640,14 +640,14 @@ possible_comma: inline_use_declarations: inline_use_declarations ',' inline_use_declaration { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | inline_use_declaration { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -656,14 +656,14 @@ inline_use_declarations: unprefixed_use_declarations: unprefixed_use_declarations ',' unprefixed_use_declaration { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | unprefixed_use_declaration { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -672,14 +672,14 @@ unprefixed_use_declarations: use_declarations: use_declarations ',' use_declaration { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | use_declaration { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -704,22 +704,22 @@ unprefixed_use_declaration: namespace_name { $$ = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, }, } } | namespace_name T_AS T_STRING { $$ = &ast.StmtUseDeclaration{ - Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ast.ParserSeparatedList).Items, $3), + Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ParserSeparatedList).Items, $3), Use: &ast.NameName{ - Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ast.ParserSeparatedList).Items), - Parts: $1.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $1.(*ast.ParserSeparatedList).SeparatorTkns, + Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items), + Parts: $1.(*ParserSeparatedList).Items, + SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns, }, AsTkn: $2, Alias: &ast.Identifier{ @@ -749,14 +749,14 @@ use_declaration: const_list: const_list ',' const_decl { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | const_decl { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -857,14 +857,14 @@ statement: { $9.(*ast.StmtFor).ForTkn = $1 $9.(*ast.StmtFor).OpenParenthesisTkn = $2 - $9.(*ast.StmtFor).Init = $3.(*ast.ParserSeparatedList).Items - $9.(*ast.StmtFor).InitSeparatorTkns = $3.(*ast.ParserSeparatedList).SeparatorTkns + $9.(*ast.StmtFor).Init = $3.(*ParserSeparatedList).Items + $9.(*ast.StmtFor).InitSeparatorTkns = $3.(*ParserSeparatedList).SeparatorTkns $9.(*ast.StmtFor).InitSemiColonTkn = $4 - $9.(*ast.StmtFor).Cond = $5.(*ast.ParserSeparatedList).Items - $9.(*ast.StmtFor).CondSeparatorTkns = $5.(*ast.ParserSeparatedList).SeparatorTkns + $9.(*ast.StmtFor).Cond = $5.(*ParserSeparatedList).Items + $9.(*ast.StmtFor).CondSeparatorTkns = $5.(*ParserSeparatedList).SeparatorTkns $9.(*ast.StmtFor).CondSemiColonTkn = $6 - $9.(*ast.StmtFor).Loop = $7.(*ast.ParserSeparatedList).Items - $9.(*ast.StmtFor).LoopSeparatorTkns = $7.(*ast.ParserSeparatedList).SeparatorTkns + $9.(*ast.StmtFor).Loop = $7.(*ParserSeparatedList).Items + $9.(*ast.StmtFor).LoopSeparatorTkns = $7.(*ParserSeparatedList).SeparatorTkns $9.(*ast.StmtFor).CloseParenthesisTkn = $8 $9.(*ast.StmtFor).Position = yylex.(*Parser).builder.NewTokenNodePosition($1, $9) @@ -1004,8 +1004,8 @@ statement: { $5.(*ast.StmtDeclare).DeclareTkn = $1 $5.(*ast.StmtDeclare).OpenParenthesisTkn = $2 - $5.(*ast.StmtDeclare).Consts = $3.(*ast.ParserSeparatedList).Items - $5.(*ast.StmtDeclare).SeparatorTkns = $3.(*ast.ParserSeparatedList).SeparatorTkns + $5.(*ast.StmtDeclare).Consts = $3.(*ParserSeparatedList).Items + $5.(*ast.StmtDeclare).SeparatorTkns = $3.(*ParserSeparatedList).SeparatorTkns $5.(*ast.StmtDeclare).CloseParenthesisTkn = $4 $5.(*ast.StmtDeclare).Position = yylex.(*Parser).builder.NewTokenNodePosition($1, $5) @@ -1166,11 +1166,11 @@ function_declaration_statement: Value: $3.Value, }, OpenParenthesisTkn: $5, - Params: $6.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $6.(*ast.ParserSeparatedList).SeparatorTkns, + Params: $6.(*ParserSeparatedList).Items, + SeparatorTkns: $6.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: $7, - ColonTkn: $8.(*ast.ReturnType).ColonTkn, - ReturnType: $8.(*ast.ReturnType).Type, + ColonTkn: $8.(*ReturnType).ColonTkn, + ReturnType: $8.(*ReturnType).Type, OpenCurlyBracketTkn: $9, Stmts: $10, CloseCurlyBracketTkn: $11, @@ -1357,10 +1357,10 @@ interface_extends_list: | T_EXTENDS name_list { $$ = &ast.StmtInterface{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), ExtendsTkn: $1, - Extends: $2.(*ast.ParserSeparatedList).Items, - ExtendsSeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Extends: $2.(*ParserSeparatedList).Items, + ExtendsSeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }; } ; @@ -1373,10 +1373,10 @@ implements_list: | T_IMPLEMENTS name_list { $$ = &ast.StmtClass{ - Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ast.ParserSeparatedList).Items), + Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items), ImplementsTkn: $1, - Implements: $2.(*ast.ParserSeparatedList).Items, - ImplementsSeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Implements: $2.(*ParserSeparatedList).Items, + ImplementsSeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, }; } ; @@ -1400,8 +1400,8 @@ foreach_variable: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), ListTkn: $1, OpenBracketTkn: $2, - Items: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $4, } } @@ -1410,8 +1410,8 @@ foreach_variable: $$ = &ast.ExprList{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), OpenBracketTkn: $1, - Items: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $3, } } @@ -1707,21 +1707,21 @@ parameter_list: } | /* empty */ { - $$ = &ast.ParserSeparatedList{} + $$ = &ParserSeparatedList{} } ; non_empty_parameter_list: parameter { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } | non_empty_parameter_list ',' parameter { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } @@ -1836,11 +1836,11 @@ type: return_type: /* empty */ { - $$ = &ast.ReturnType{} + $$ = &ReturnType{} } | ':' type_expr { - $$ = &ast.ReturnType{ + $$ = &ReturnType{ ColonTkn: $1, Type: $2, } @@ -1850,7 +1850,7 @@ return_type: argument_list: '(' ')' { - $$ = &ast.ArgumentList{ + $$ = &ArgumentList{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $2), OpenParenthesisTkn: $1, CloseParenthesisTkn: $2, @@ -1858,7 +1858,7 @@ argument_list: } | '(' non_empty_argument_list possible_comma ')' { - argumentList := $2.(*ast.ArgumentList) + argumentList := $2.(*ArgumentList) argumentList.Position = yylex.(*Parser).builder.NewTokensPosition($1, $4) argumentList.OpenParenthesisTkn = $1 if $3 != nil { @@ -1873,14 +1873,14 @@ argument_list: non_empty_argument_list: argument { - $$ = &ast.ArgumentList{ + $$ = &ArgumentList{ Arguments: []ast.Vertex{$1}, } } | non_empty_argument_list ',' argument { - $1.(*ast.ArgumentList).SeparatorTkns = append($1.(*ast.ArgumentList).SeparatorTkns, $2) - $1.(*ast.ArgumentList).Arguments = append($1.(*ast.ArgumentList).Arguments, $3) + $1.(*ArgumentList).SeparatorTkns = append($1.(*ArgumentList).SeparatorTkns, $2) + $1.(*ArgumentList).Arguments = append($1.(*ArgumentList).Arguments, $3) $$ = $1 } @@ -1995,8 +1995,8 @@ class_statement: Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1, $4), Modifiers: $1, Type: $2, - Properties: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Properties: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: $4, } } @@ -2006,8 +2006,8 @@ class_statement: Position: yylex.(*Parser).builder.NewOptionalListTokensPosition($1, $2, $4), Modifiers: $1, ConstTkn: $2, - Consts: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Consts: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, SemiColonTkn: $4, } } @@ -2016,12 +2016,12 @@ class_statement: traitUse := &ast.StmtTraitUse{ Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $3), UseTkn: $1, - Traits: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Traits: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, } switch n := $3.(type) { - case *ast.TraitAdaptationList : + case *TraitAdaptationList : traitUse.OpenCurlyBracketTkn = n.OpenCurlyBracketTkn traitUse.Adaptations = n.Adaptations traitUse.CloseCurlyBracketTkn = n.CloseCurlyBracketTkn @@ -2049,11 +2049,11 @@ class_statement: Value: $4.Value, }, OpenParenthesisTkn: $6, - Params: $7.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $7.(*ast.ParserSeparatedList).SeparatorTkns, + Params: $7.(*ParserSeparatedList).Items, + SeparatorTkns: $7.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: $8, - ColonTkn: $9.(*ast.ReturnType).ColonTkn, - ReturnType: $9.(*ast.ReturnType).Type, + ColonTkn: $9.(*ReturnType).ColonTkn, + ReturnType: $9.(*ReturnType).Type, Stmt: $10, } } @@ -2062,14 +2062,14 @@ class_statement: name_list: name { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } | name_list ',' name { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } @@ -2085,7 +2085,7 @@ trait_adaptations: } | '{' '}' { - $$ = &ast.TraitAdaptationList{ + $$ = &TraitAdaptationList{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $2), OpenCurlyBracketTkn: $1, CloseCurlyBracketTkn: $2, @@ -2093,7 +2093,7 @@ trait_adaptations: } | '{' trait_adaptation_list '}' { - $$ = &ast.TraitAdaptationList{ + $$ = &TraitAdaptationList{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), OpenCurlyBracketTkn: $1, Adaptations: $2, @@ -2132,13 +2132,13 @@ trait_precedence: absolute_trait_method_reference T_INSTEADOF name_list { $$ = &ast.StmtTraitUsePrecedence{ - 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, + Position: yylex.(*Parser).builder.NewNodeNodeListPosition($1, $3.(*ParserSeparatedList).Items), + Trait: $1.(*TraitMethodRef).Trait, + DoubleColonTkn: $1.(*TraitMethodRef).DoubleColonTkn, + Method: $1.(*TraitMethodRef).Method, InsteadofTkn: $2, - Insteadof: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Insteadof: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, } } ; @@ -2148,9 +2148,9 @@ trait_alias: { $$ = &ast.StmtTraitUseAlias{ Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3), - Trait: $1.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn, - Method: $1.(*ast.TraitMethodRef).Method, + Trait: $1.(*TraitMethodRef).Trait, + DoubleColonTkn: $1.(*TraitMethodRef).DoubleColonTkn, + Method: $1.(*TraitMethodRef).Method, AsTkn: $2, Alias: &ast.Identifier{ Position: yylex.(*Parser).builder.NewTokenPosition($3), @@ -2163,9 +2163,9 @@ trait_alias: { $$ = &ast.StmtTraitUseAlias{ Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3), - Trait: $1.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn, - Method: $1.(*ast.TraitMethodRef).Method, + Trait: $1.(*TraitMethodRef).Trait, + DoubleColonTkn: $1.(*TraitMethodRef).DoubleColonTkn, + Method: $1.(*TraitMethodRef).Method, AsTkn: $2, Alias: &ast.Identifier{ Position: yylex.(*Parser).builder.NewTokenPosition($3), @@ -2178,9 +2178,9 @@ trait_alias: { $$ = &ast.StmtTraitUseAlias{ Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $4), - Trait: $1.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn, - Method: $1.(*ast.TraitMethodRef).Method, + Trait: $1.(*TraitMethodRef).Trait, + DoubleColonTkn: $1.(*TraitMethodRef).DoubleColonTkn, + Method: $1.(*TraitMethodRef).Method, AsTkn: $2, Modifier: $3, Alias: &ast.Identifier{ @@ -2194,9 +2194,9 @@ trait_alias: { $$ = &ast.StmtTraitUseAlias{ Position: yylex.(*Parser).builder.NewNodesPosition($1, $3), - Trait: $1.(*ast.TraitMethodRef).Trait, - DoubleColonTkn: $1.(*ast.TraitMethodRef).DoubleColonTkn, - Method: $1.(*ast.TraitMethodRef).Method, + Trait: $1.(*TraitMethodRef).Trait, + DoubleColonTkn: $1.(*TraitMethodRef).DoubleColonTkn, + Method: $1.(*TraitMethodRef).Method, AsTkn: $2, Modifier: $3, } @@ -2206,7 +2206,7 @@ trait_alias: trait_method_reference: identifier { - $$ = &ast.TraitMethodRef{ + $$ = &TraitMethodRef{ Position: yylex.(*Parser).builder.NewTokenPosition($1), Method: &ast.Identifier{ Position: yylex.(*Parser).builder.NewTokenPosition($1), @@ -2224,7 +2224,7 @@ trait_method_reference: absolute_trait_method_reference: name T_PAAMAYIM_NEKUDOTAYIM identifier { - $$ = &ast.TraitMethodRef{ + $$ = &TraitMethodRef{ Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3), Trait: $1, DoubleColonTkn: $2, @@ -2349,14 +2349,14 @@ member_modifier: property_list: property_list ',' property { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | property { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -2399,14 +2399,14 @@ property: class_const_list: class_const_list ',' class_const_decl { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | class_const_decl { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -2470,7 +2470,7 @@ echo_expr: for_exprs: /* empty */ { - $$ = &ast.ParserSeparatedList{} + $$ = &ParserSeparatedList{} } | non_empty_for_exprs { @@ -2481,14 +2481,14 @@ for_exprs: non_empty_for_exprs: non_empty_for_exprs ',' expr { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | expr { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -2500,10 +2500,10 @@ anonymous_class: class := &ast.StmtClass{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $8), ClassTkn: $1, - OpenParenthesisTkn: $2.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $2.(*ast.ArgumentList).Arguments, - SeparatorTkns: $2.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $2.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $2.(*ArgumentList).OpenParenthesisTkn, + Arguments: $2.(*ArgumentList).Arguments, + SeparatorTkns: $2.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $2.(*ArgumentList).CloseParenthesisTkn, OpenCurlyBracketTkn: $6, Stmts: $7, CloseCurlyBracketTkn: $8, @@ -2532,10 +2532,10 @@ new_expr: Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $3), NewTkn: $1, Class: $2, - OpenParenthesisTkn: $3.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $3.(*ast.ArgumentList).Arguments, - SeparatorTkns: $3.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $3.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $3.(*ArgumentList).OpenParenthesisTkn, + Arguments: $3.(*ArgumentList).Arguments, + SeparatorTkns: $3.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $3.(*ArgumentList).CloseParenthesisTkn, } } else { $$ = &ast.ExprNew{ @@ -2564,8 +2564,8 @@ expr_without_variable: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), ListTkn: $1, OpenBracketTkn: $2, - Items: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $4, }, EqualTkn: $5, @@ -2579,8 +2579,8 @@ expr_without_variable: Var: &ast.ExprList{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), OpenBracketTkn: $1, - Items: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $3, }, EqualTkn: $4, @@ -3248,11 +3248,11 @@ inline_function: closure.FunctionTkn = $1 closure.AmpersandTkn = $2 closure.OpenParenthesisTkn = $4 - closure.Params = $5.(*ast.ParserSeparatedList).Items - closure.SeparatorTkns = $5.(*ast.ParserSeparatedList).SeparatorTkns + closure.Params = $5.(*ParserSeparatedList).Items + closure.SeparatorTkns = $5.(*ParserSeparatedList).SeparatorTkns closure.CloseParenthesisTkn = $6 - closure.ColonTkn = $8.(*ast.ReturnType).ColonTkn - closure.ReturnType = $8.(*ast.ReturnType).Type + closure.ColonTkn = $8.(*ReturnType).ColonTkn + closure.ReturnType = $8.(*ReturnType).Type closure.OpenCurlyBracketTkn = $9 closure.Stmts = $10 closure.CloseCurlyBracketTkn = $11 @@ -3266,11 +3266,11 @@ inline_function: FnTkn: $1, AmpersandTkn: $2, OpenParenthesisTkn: $3, - Params: $4.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $4.(*ast.ParserSeparatedList).SeparatorTkns, + Params: $4.(*ParserSeparatedList).Items, + SeparatorTkns: $4.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: $5, - ColonTkn: $6.(*ast.ReturnType).ColonTkn, - ReturnType: $6.(*ast.ReturnType).Type, + ColonTkn: $6.(*ReturnType).ColonTkn, + ReturnType: $6.(*ReturnType).Type, DoubleArrowTkn: $8, Expr: $9, } @@ -3302,8 +3302,8 @@ lexical_vars: $$ = &ast.ExprClosure{ UseTkn: $1, UseOpenParenthesisTkn: $2, - Use: $3.(*ast.ParserSeparatedList).Items, - UseSeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Use: $3.(*ParserSeparatedList).Items, + UseSeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, UseCloseParenthesisTkn: $4, } } @@ -3312,14 +3312,14 @@ lexical_vars: lexical_var_list: lexical_var_list ',' lexical_var { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | lexical_var { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -3363,10 +3363,10 @@ function_call: $$ = &ast.ExprFunctionCall{ Position: yylex.(*Parser).builder.NewNodesPosition($1, $2), Function: $1, - OpenParenthesisTkn: $2.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $2.(*ast.ArgumentList).Arguments, - SeparatorTkns: $2.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $2.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $2.(*ArgumentList).OpenParenthesisTkn, + Arguments: $2.(*ArgumentList).Arguments, + SeparatorTkns: $2.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $2.(*ArgumentList).CloseParenthesisTkn, } } | class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list @@ -3376,13 +3376,13 @@ function_call: Class: $1, DoubleColonTkn: $2, Call: $3, - OpenParenthesisTkn: $4.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $4.(*ast.ArgumentList).Arguments, - SeparatorTkns: $4.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $4.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $4.(*ArgumentList).OpenParenthesisTkn, + Arguments: $4.(*ArgumentList).Arguments, + SeparatorTkns: $4.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn, } - if brackets, ok := $3.(*ast.ParserBrackets); ok { + if brackets, ok := $3.(*ParserBrackets); ok { staticCall.OpenCurlyBracketTkn = brackets.OpenBracketTkn staticCall.Call = brackets.Child staticCall.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -3397,13 +3397,13 @@ function_call: Class: $1, DoubleColonTkn: $2, Call: $3, - OpenParenthesisTkn: $4.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $4.(*ast.ArgumentList).Arguments, - SeparatorTkns: $4.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $4.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $4.(*ArgumentList).OpenParenthesisTkn, + Arguments: $4.(*ArgumentList).Arguments, + SeparatorTkns: $4.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn, } - if brackets, ok := $3.(*ast.ParserBrackets); ok { + if brackets, ok := $3.(*ParserBrackets); ok { staticCall.OpenCurlyBracketTkn = brackets.OpenBracketTkn staticCall.Call = brackets.Child staticCall.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -3416,10 +3416,10 @@ function_call: $$ = &ast.ExprFunctionCall{ Position: yylex.(*Parser).builder.NewNodesPosition($1, $2), Function: $1, - OpenParenthesisTkn: $2.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $2.(*ast.ArgumentList).Arguments, - SeparatorTkns: $2.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $2.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $2.(*ArgumentList).OpenParenthesisTkn, + Arguments: $2.(*ArgumentList).Arguments, + SeparatorTkns: $2.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $2.(*ArgumentList).CloseParenthesisTkn, } } ; @@ -3490,7 +3490,7 @@ backticks_expr: ctor_arguments: /* empty */ { - $$ = &ast.ArgumentList{} + $$ = &ArgumentList{} } | argument_list { @@ -3505,8 +3505,8 @@ dereferencable_scalar: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), ArrayTkn: $1, OpenBracketTkn: $2, - Items: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $4, } } @@ -3515,8 +3515,8 @@ dereferencable_scalar: $$ = &ast.ExprArray{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), OpenBracketTkn: $1, - Items: $2.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $2.(*ParserSeparatedList).Items, + SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $3, } } @@ -3809,13 +3809,13 @@ callable_variable: Var: $1, ObjectOperatorTkn: $2, Method: $3, - OpenParenthesisTkn: $4.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $4.(*ast.ArgumentList).Arguments, - SeparatorTkns: $4.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $4.(*ast.ArgumentList).CloseParenthesisTkn, + OpenParenthesisTkn: $4.(*ArgumentList).OpenParenthesisTkn, + Arguments: $4.(*ArgumentList).Arguments, + SeparatorTkns: $4.(*ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn, } - if brackets, ok := $3.(*ast.ParserBrackets); ok { + if brackets, ok := $3.(*ParserBrackets); ok { methodCall.OpenCurlyBracketTkn = brackets.OpenBracketTkn methodCall.Method = brackets.Child methodCall.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -3847,7 +3847,7 @@ variable: Property: $3, } - if brackets, ok := $3.(*ast.ParserBrackets); ok { + if brackets, ok := $3.(*ParserBrackets); ok { propertyFetch.OpenCurlyBracketTkn = brackets.OpenBracketTkn propertyFetch.Property = brackets.Child propertyFetch.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -3944,7 +3944,7 @@ new_variable: Property: $3, } - if brackets, ok := $3.(*ast.ParserBrackets); ok { + if brackets, ok := $3.(*ParserBrackets); ok { propertyFetch.OpenCurlyBracketTkn = brackets.OpenBracketTkn propertyFetch.Property = brackets.Child propertyFetch.CloseCurlyBracketTkn = brackets.CloseBracketTkn @@ -3983,7 +3983,7 @@ member_name: } | '{' expr '}' { - $$ = &ast.ParserBrackets{ + $$ = &ParserBrackets{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), OpenBracketTkn: $1, Child: $2, @@ -4007,7 +4007,7 @@ property_name: } | '{' expr '}' { - $$ = &ast.ParserBrackets{ + $$ = &ParserBrackets{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), OpenBracketTkn: $1, Child: $2, @@ -4023,7 +4023,7 @@ property_name: array_pair_list: non_empty_array_pair_list { - pairList := $1.(*ast.ParserSeparatedList) + pairList := $1.(*ParserSeparatedList) fistPair := pairList.Items[0].(*ast.ExprArrayItem) if fistPair.Key == nil && fistPair.Val == nil && len(pairList.Items) == 1 { @@ -4048,14 +4048,14 @@ possible_array_pair: non_empty_array_pair_list: non_empty_array_pair_list ',' possible_array_pair { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } | possible_array_pair { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } @@ -4114,8 +4114,8 @@ array_pair: Position: yylex.(*Parser).builder.NewTokensPosition($3, $6), ListTkn: $3, OpenBracketTkn: $4, - Items: $5.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $5.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $5.(*ParserSeparatedList).Items, + SeparatorTkns: $5.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $6, }, } @@ -4128,8 +4128,8 @@ array_pair: Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), ListTkn: $1, OpenBracketTkn: $2, - Items: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Items: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, CloseBracketTkn: $4, }, } @@ -4334,15 +4334,15 @@ internal_functions_in_yacc: T_ISSET '(' isset_variables possible_comma ')' { if $4 != nil { - $3.(*ast.ParserSeparatedList).SeparatorTkns = append($3.(*ast.ParserSeparatedList).SeparatorTkns, $4) + $3.(*ParserSeparatedList).SeparatorTkns = append($3.(*ParserSeparatedList).SeparatorTkns, $4) } $$ = &ast.ExprIsset{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $5), IssetTkn: $1, OpenParenthesisTkn: $2, - Vars: $3.(*ast.ParserSeparatedList).Items, - SeparatorTkns: $3.(*ast.ParserSeparatedList).SeparatorTkns, + Vars: $3.(*ParserSeparatedList).Items, + SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns, CloseParenthesisTkn: $5, } } @@ -4403,14 +4403,14 @@ internal_functions_in_yacc: isset_variables: isset_variable { - $$ = &ast.ParserSeparatedList{ + $$ = &ParserSeparatedList{ Items: []ast.Vertex{$1}, } } | isset_variables ',' isset_variable { - $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2) - $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3) + $1.(*ParserSeparatedList).SeparatorTkns = append($1.(*ParserSeparatedList).SeparatorTkns, $2) + $1.(*ParserSeparatedList).Items = append($1.(*ParserSeparatedList).Items, $3) $$ = $1 } diff --git a/pkg/ast/node.go b/pkg/ast/node.go index 043c404..40e1093 100644 --- a/pkg/ast/node.go +++ b/pkg/ast/node.go @@ -2644,97 +2644,3 @@ func (n *NameNamePart) Accept(v Visitor) { func (n *NameNamePart) GetPosition() *position.Position { return n.Position } - -// TODO: move to private section - -type ParserBrackets struct { - Position *position.Position - OpenBracketTkn *token.Token - Child Vertex - CloseBracketTkn *token.Token -} - -func (n *ParserBrackets) Accept(v Visitor) { - // do nothing -} - -func (n *ParserBrackets) GetPosition() *position.Position { - return n.Position -} - -type ParserSeparatedList struct { - Position *position.Position - Items []Vertex - SeparatorTkns []*token.Token -} - -func (n *ParserSeparatedList) Accept(v Visitor) { - // do nothing -} - -func (n *ParserSeparatedList) GetPosition() *position.Position { - return n.Position -} - -// TraitAdaptationList node -type TraitAdaptationList struct { - Position *position.Position - OpenCurlyBracketTkn *token.Token - Adaptations []Vertex - CloseCurlyBracketTkn *token.Token -} - -func (n *TraitAdaptationList) Accept(v Visitor) { - // do nothing -} - -func (n *TraitAdaptationList) GetPosition() *position.Position { - return n.Position -} - -// ArgumentList node -type ArgumentList struct { - Position *position.Position - OpenParenthesisTkn *token.Token - Arguments []Vertex - SeparatorTkns []*token.Token - CloseParenthesisTkn *token.Token -} - -func (n *ArgumentList) Accept(v Visitor) { - // do nothing -} - -func (n *ArgumentList) GetPosition() *position.Position { - return n.Position -} - -type ReturnType struct { - Position *position.Position - ColonTkn *token.Token - Type Vertex -} - -func (n *ReturnType) Accept(v Visitor) { - // do nothing -} - -func (n *ReturnType) GetPosition() *position.Position { - return n.Position -} - -// TraitMethodRef node -type TraitMethodRef struct { - Position *position.Position - Trait Vertex - DoubleColonTkn *token.Token - Method Vertex -} - -func (n *TraitMethodRef) Accept(v Visitor) { - // do nothing -} - -func (n *TraitMethodRef) GetPosition() *position.Position { - return n.Position -}