maride/php-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring: fix naming

Browse Source
This commit is contained in:
Vadym Slizov
2020-12-28 23:01:02 +02:00
parent 0701b3552e
commit cb4b4e69c4
19 changed files with 2733 additions and 2733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1096
internal/php5/parser_test.go
View File

File diff suppressed because it is too large Load Diff

248
internal/php5/php5.go generated
View File

@@ -2344,7 +2344,7 @@ yydefault:
{
yyVAL.node = &ParserSeparatedList{
Items: []ast.Vertex{
&ast.NameNamePart{
&ast.NamePart{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
StringTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
@@ -2356,7 +2356,7 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
// line internal/php5/php5.y:305
{
part := &ast.NameNamePart{
part := &ast.NamePart{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
StringTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,
@@ -2411,7 +2411,7 @@ yydefault:
yyVAL.node = &ast.StmtNamespace{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
NsTkn: yyDollar[1].token,
Name: &ast.NameName{
Name: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items),
Parts: yyDollar[2].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2426,7 +2426,7 @@ yydefault:
yyVAL.node = &ast.StmtNamespace{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token),
NsTkn: yyDollar[1].token,
Name: &ast.NameName{
Name: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items),
Parts: yyDollar[2].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2452,19 +2452,19 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
// line internal/php5/php5.y:386
{
yyVAL.node = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
UseTkn: yyDollar[1].token,
UseDeclarations: yyDollar[2].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
SemiColonTkn: yyDollar[3].token,
yyVAL.node = &ast.StmtUseList{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
UseTkn: yyDollar[1].token,
Uses: yyDollar[2].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
SemiColonTkn: yyDollar[3].token,
}
}
case 15:
yyDollar = yyS[yypt-4 : yypt+1]
// line internal/php5/php5.y:396
{
yyVAL.node = &ast.StmtUse{
yyVAL.node = &ast.StmtUseList{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
UseTkn: yyDollar[1].token,
Type: &ast.Identifier{
@@ -2472,16 +2472,16 @@ yydefault:
IdentifierTkn: yyDollar[2].token,
Value: yyDollar[2].token.Value,
},
UseDeclarations: yyDollar[3].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns,
SemiColonTkn: yyDollar[4].token,
Uses: yyDollar[3].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns,
SemiColonTkn: yyDollar[4].token,
}
}
case 16:
yyDollar = yyS[yypt-4 : yypt+1]
// line internal/php5/php5.y:411
{
yyVAL.node = &ast.StmtUse{
yyVAL.node = &ast.StmtUseList{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
UseTkn: yyDollar[1].token,
Type: &ast.Identifier{
@@ -2489,9 +2489,9 @@ yydefault:
IdentifierTkn: yyDollar[2].token,
Value: yyDollar[2].token.Value,
},
UseDeclarations: yyDollar[3].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns,
SemiColonTkn: yyDollar[4].token,
Uses: yyDollar[3].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns,
SemiColonTkn: yyDollar[4].token,
}
}
case 17:
@@ -2523,9 +2523,9 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
// line internal/php5/php5.y:451
{
yyVAL.node = &ast.StmtUseDeclaration{
yyVAL.node = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Parts: yyDollar[1].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2536,9 +2536,9 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
// line internal/php5/php5.y:462
{
yyVAL.node = &ast.StmtUseDeclaration{
yyVAL.node = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].token),
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Parts: yyDollar[1].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2555,10 +2555,10 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
// line internal/php5/php5.y:479
{
yyVAL.node = &ast.StmtUseDeclaration{
yyVAL.node = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items),
NsSeparatorTkn: yyDollar[1].token,
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items),
Parts: yyDollar[2].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2569,10 +2569,10 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1]
// line internal/php5/php5.y:491
{
yyVAL.node = &ast.StmtUseDeclaration{
yyVAL.node = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
NsSeparatorTkn: yyDollar[1].token,
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items),
Parts: yyDollar[2].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2606,9 +2606,9 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
// line internal/php5/php5.y:528
{
yyVAL.node = &ast.StmtUseDeclaration{
yyVAL.node = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Parts: yyDollar[1].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2619,9 +2619,9 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
// line internal/php5/php5.y:539
{
yyVAL.node = &ast.StmtUseDeclaration{
yyVAL.node = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].token),
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Parts: yyDollar[1].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2638,10 +2638,10 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
// line internal/php5/php5.y:556
{
yyVAL.node = &ast.StmtUseDeclaration{
yyVAL.node = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items),
NsSeparatorTkn: yyDollar[1].token,
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items),
Parts: yyDollar[2].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2652,10 +2652,10 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1]
// line internal/php5/php5.y:568
{
yyVAL.node = &ast.StmtUseDeclaration{
yyVAL.node = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
NsSeparatorTkn: yyDollar[1].token,
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items),
Parts: yyDollar[2].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2689,9 +2689,9 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
// line internal/php5/php5.y:605
{
yyVAL.node = &ast.StmtUseDeclaration{
yyVAL.node = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Parts: yyDollar[1].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2702,9 +2702,9 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
// line internal/php5/php5.y:616
{
yyVAL.node = &ast.StmtUseDeclaration{
yyVAL.node = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].token),
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Parts: yyDollar[1].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2721,10 +2721,10 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
// line internal/php5/php5.y:633
{
yyVAL.node = &ast.StmtUseDeclaration{
yyVAL.node = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].node.(*ParserSeparatedList).Items),
NsSeparatorTkn: yyDollar[1].token,
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items),
Parts: yyDollar[2].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2735,10 +2735,10 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1]
// line internal/php5/php5.y:645
{
yyVAL.node = &ast.StmtUseDeclaration{
yyVAL.node = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
NsSeparatorTkn: yyDollar[1].token,
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items),
Parts: yyDollar[2].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2855,7 +2855,7 @@ yydefault:
{
yyVAL.node = &ast.StmtLabel{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token),
LabelName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
IdentifierTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
@@ -3269,7 +3269,7 @@ yydefault:
Types: []ast.Vertex{yyDollar[3].node},
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
IdentifierTkn: yyDollar[4].token,
Value: yyDollar[4].token.Value,
@@ -3335,7 +3335,7 @@ yydefault:
Types: []ast.Vertex{yyDollar[3].node},
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
IdentifierTkn: yyDollar[4].token,
Value: yyDollar[4].token.Value,
@@ -3414,7 +3414,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[9].token),
FunctionTkn: yyDollar[1].token,
AmpersandTkn: yyDollar[2].token,
FunctionName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
IdentifierTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,
@@ -3441,7 +3441,7 @@ yydefault:
}
n.Position = yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[7].token)
n.ClassName = className
n.Name = className
n.OpenCurlyBracketTkn = yyDollar[5].token
n.Stmts = yyDollar[6].list
n.CloseCurlyBracketTkn = yyDollar[7].token
@@ -3464,7 +3464,7 @@ yydefault:
}
n.Position = yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[7].token)
n.TraitName = traitName
n.Name = traitName
n.OpenCurlyBracketTkn = yyDollar[5].token
n.Stmts = yyDollar[6].list
n.CloseCurlyBracketTkn = yyDollar[7].token
@@ -3487,7 +3487,7 @@ yydefault:
iface := &ast.StmtInterface{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[6].token),
InterfaceTkn: yyDollar[1].token,
InterfaceName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
IdentifierTkn: yyDollar[2].token,
Value: yyDollar[2].token.Value,
@@ -3798,7 +3798,7 @@ yydefault:
yyVAL.node = &ast.StmtSwitch{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
OpenCurlyBracketTkn: yyDollar[1].token,
CaseList: yyDollar[2].list,
Cases: yyDollar[2].list,
CloseCurlyBracketTkn: yyDollar[3].token,
}
}
@@ -3810,7 +3810,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
OpenCurlyBracketTkn: yyDollar[1].token,
CaseSeparatorTkn: yyDollar[2].token,
CaseList: yyDollar[3].list,
Cases: yyDollar[3].list,
CloseCurlyBracketTkn: yyDollar[4].token,
}
}
@@ -3821,7 +3821,7 @@ yydefault:
yyVAL.node = &ast.StmtSwitch{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
ColonTkn: yyDollar[1].token,
CaseList: yyDollar[2].list,
Cases: yyDollar[2].list,
EndSwitchTkn: yyDollar[3].token,
SemiColonTkn: yyDollar[4].token,
}
@@ -3834,7 +3834,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token),
ColonTkn: yyDollar[1].token,
CaseSeparatorTkn: yyDollar[2].token,
CaseList: yyDollar[3].list,
Cases: yyDollar[3].list,
EndSwitchTkn: yyDollar[4].token,
SemiColonTkn: yyDollar[5].token,
}
@@ -4031,7 +4031,7 @@ yydefault:
VariadicTkn: yyDollar[3].token,
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
IdentifierTkn: yyDollar[4].token,
Value: yyDollar[4].token.Value,
@@ -4059,7 +4059,7 @@ yydefault:
VariadicTkn: yyDollar[3].token,
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
IdentifierTkn: yyDollar[4].token,
Value: yyDollar[4].token.Value,
@@ -4216,7 +4216,7 @@ yydefault:
{
yyVAL.node = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
IdentifierTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
@@ -4230,7 +4230,7 @@ yydefault:
yyVAL.node = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
DollarTkn: yyDollar[1].token,
VarName: yyDollar[2].node,
Name: yyDollar[2].node,
}
}
case 164:
@@ -4241,7 +4241,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
DollarTkn: yyDollar[1].token,
OpenCurlyBracketTkn: yyDollar[2].token,
VarName: yyDollar[3].node,
Name: yyDollar[3].node,
CloseCurlyBracketTkn: yyDollar[4].token,
}
}
@@ -4253,7 +4253,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
IdentifierTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,
@@ -4272,7 +4272,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[3].token, yyDollar[5].node),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
IdentifierTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,
@@ -4295,7 +4295,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
IdentifierTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
@@ -4315,7 +4315,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
IdentifierTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
@@ -4346,7 +4346,7 @@ yydefault:
yyVAL.node = &ast.StmtPropertyList{
Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token),
Modifiers: yyDollar[1].list,
Properties: yyDollar[2].node.(*ParserSeparatedList).Items,
Props: yyDollar[2].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
SemiColonTkn: yyDollar[3].token,
}
@@ -4379,7 +4379,7 @@ yydefault:
Modifiers: yyDollar[1].list,
FunctionTkn: yyDollar[2].token,
AmpersandTkn: yyDollar[3].token,
MethodName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
IdentifierTkn: yyDollar[4].token,
Value: yyDollar[4].token.Value,
@@ -4728,7 +4728,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
IdentifierTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,
@@ -4749,7 +4749,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[3].token, yyDollar[5].node),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
IdentifierTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,
@@ -4774,7 +4774,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
IdentifierTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
@@ -4795,7 +4795,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
IdentifierTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
@@ -4974,7 +4974,7 @@ yydefault:
NewTkn: yyDollar[1].token,
Class: yyDollar[2].node,
OpenParenthesisTkn: yyDollar[3].node.(*ArgumentList).OpenParenthesisTkn,
Arguments: yyDollar[3].node.(*ArgumentList).Arguments,
Args: yyDollar[3].node.(*ArgumentList).Arguments,
SeparatorTkns: yyDollar[3].node.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: yyDollar[3].node.(*ArgumentList).CloseParenthesisTkn,
}
@@ -5037,7 +5037,7 @@ yydefault:
NewTkn: yyDollar[4].token,
Class: yyDollar[5].node,
OpenParenthesisTkn: yyDollar[6].node.(*ArgumentList).OpenParenthesisTkn,
Arguments: yyDollar[6].node.(*ArgumentList).Arguments,
Args: yyDollar[6].node.(*ArgumentList).Arguments,
SeparatorTkns: yyDollar[6].node.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: yyDollar[6].node.(*ArgumentList).CloseParenthesisTkn,
}
@@ -5618,7 +5618,7 @@ yydefault:
{
yyVAL.node = &ast.ExprTernary{
Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[5].node),
Condition: yyDollar[1].node,
Cond: yyDollar[1].node,
QuestionTkn: yyDollar[2].token,
IfTrue: yyDollar[3].node,
ColonTkn: yyDollar[4].token,
@@ -5631,7 +5631,7 @@ yydefault:
{
yyVAL.node = &ast.ExprTernary{
Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node),
Condition: yyDollar[1].node,
Cond: yyDollar[1].node,
QuestionTkn: yyDollar[2].token,
ColonTkn: yyDollar[3].token,
IfFalse: yyDollar[4].node,
@@ -5836,7 +5836,7 @@ yydefault:
yyVAL.node = &ast.ExprYield{
Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
YieldTkn: yyDollar[1].token,
Value: yyDollar[2].node,
Val: yyDollar[2].node,
}
}
case 307:
@@ -5846,7 +5846,7 @@ yydefault:
yyVAL.node = &ast.ExprYield{
Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
YieldTkn: yyDollar[1].token,
Value: yyDollar[2].node,
Val: yyDollar[2].node,
}
}
case 308:
@@ -5858,7 +5858,7 @@ yydefault:
YieldTkn: yyDollar[1].token,
Key: yyDollar[2].node,
DoubleArrowTkn: yyDollar[3].token,
Value: yyDollar[4].node,
Val: yyDollar[4].node,
}
}
case 309:
@@ -5870,7 +5870,7 @@ yydefault:
YieldTkn: yyDollar[1].token,
Key: yyDollar[2].node,
DoubleArrowTkn: yyDollar[3].token,
Value: yyDollar[4].node,
Val: yyDollar[4].node,
}
}
case 310:
@@ -5969,7 +5969,7 @@ yydefault:
yyVAL.node = &ast.ExprClosure{
UseTkn: yyDollar[1].token,
UseOpenParenthesisTkn: yyDollar[2].token,
Use: yyDollar[3].node.(*ParserSeparatedList).Items,
Uses: yyDollar[3].node.(*ParserSeparatedList).Items,
UseSeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns,
UseCloseParenthesisTkn: yyDollar[4].token,
}
@@ -5982,7 +5982,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
IdentifierTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,
@@ -6004,7 +6004,7 @@ yydefault:
AmpersandTkn: yyDollar[3].token,
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
IdentifierTkn: yyDollar[4].token,
Value: yyDollar[4].token.Value,
@@ -6025,7 +6025,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
IdentifierTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
@@ -6046,7 +6046,7 @@ yydefault:
AmpersandTkn: yyDollar[1].token,
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
IdentifierTkn: yyDollar[2].token,
Value: yyDollar[2].token.Value,
@@ -6064,13 +6064,13 @@ yydefault:
{
yyVAL.node = &ast.ExprFunctionCall{
Position: yylex.(*Parser).builder.NewNodeListNodePosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[2].node),
Function: &ast.NameName{
Function: &ast.Name{
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.(*ArgumentList).OpenParenthesisTkn,
Arguments: yyDollar[2].node.(*ArgumentList).Arguments,
Args: yyDollar[2].node.(*ArgumentList).Arguments,
SeparatorTkns: yyDollar[2].node.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: yyDollar[2].node.(*ArgumentList).CloseParenthesisTkn,
}
@@ -6089,7 +6089,7 @@ yydefault:
SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns,
},
OpenParenthesisTkn: yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn,
Arguments: yyDollar[4].node.(*ArgumentList).Arguments,
Args: yyDollar[4].node.(*ArgumentList).Arguments,
SeparatorTkns: yyDollar[4].node.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn,
}
@@ -6107,7 +6107,7 @@ yydefault:
SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
},
OpenParenthesisTkn: yyDollar[3].node.(*ArgumentList).OpenParenthesisTkn,
Arguments: yyDollar[3].node.(*ArgumentList).Arguments,
Args: yyDollar[3].node.(*ArgumentList).Arguments,
SeparatorTkns: yyDollar[3].node.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: yyDollar[3].node.(*ArgumentList).CloseParenthesisTkn,
}
@@ -6122,7 +6122,7 @@ yydefault:
DoubleColonTkn: yyDollar[2].token,
Call: yyDollar[3].node,
OpenParenthesisTkn: yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn,
Arguments: yyDollar[4].node.(*ArgumentList).Arguments,
Args: yyDollar[4].node.(*ArgumentList).Arguments,
SeparatorTkns: yyDollar[4].node.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn,
}
@@ -6145,7 +6145,7 @@ yydefault:
DoubleColonTkn: yyDollar[2].token,
Call: yyDollar[3].node,
OpenParenthesisTkn: yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn,
Arguments: yyDollar[4].node.(*ArgumentList).Arguments,
Args: yyDollar[4].node.(*ArgumentList).Arguments,
SeparatorTkns: yyDollar[4].node.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn,
}
@@ -6160,7 +6160,7 @@ yydefault:
DoubleColonTkn: yyDollar[2].token,
Call: yyDollar[3].node,
OpenParenthesisTkn: yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn,
Arguments: yyDollar[4].node.(*ArgumentList).Arguments,
Args: yyDollar[4].node.(*ArgumentList).Arguments,
SeparatorTkns: yyDollar[4].node.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn,
}
@@ -6183,7 +6183,7 @@ yydefault:
DoubleColonTkn: yyDollar[2].token,
Call: yyDollar[3].node,
OpenParenthesisTkn: yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn,
Arguments: yyDollar[4].node.(*ArgumentList).Arguments,
Args: yyDollar[4].node.(*ArgumentList).Arguments,
SeparatorTkns: yyDollar[4].node.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn,
}
@@ -6196,7 +6196,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[2].node),
Function: yyDollar[1].node,
OpenParenthesisTkn: yyDollar[2].node.(*ArgumentList).OpenParenthesisTkn,
Arguments: yyDollar[2].node.(*ArgumentList).Arguments,
Args: yyDollar[2].node.(*ArgumentList).Arguments,
SeparatorTkns: yyDollar[2].node.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: yyDollar[2].node.(*ArgumentList).CloseParenthesisTkn,
}
@@ -6215,7 +6215,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
// line internal/php5/php5.y:3812
{
yyVAL.node = &ast.NameName{
yyVAL.node = &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Parts: yyDollar[1].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
@@ -6248,7 +6248,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
// line internal/php5/php5.y:3842
{
yyVAL.node = &ast.NameName{
yyVAL.node = &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Parts: yyDollar[1].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
@@ -6544,7 +6544,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
Class: yyDollar[1].node,
DoubleColonTkn: yyDollar[2].token,
ConstantName: &ast.Identifier{
Const: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
IdentifierTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,
@@ -6575,7 +6575,7 @@ yydefault:
{
yyVAL.node = &ast.ExprConstFetch{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Const: &ast.NameName{
Const: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Parts: yyDollar[1].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
@@ -6971,7 +6971,7 @@ yydefault:
{
yyVAL.node = &ast.ExprTernary{
Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node),
Condition: yyDollar[1].node,
Cond: yyDollar[1].node,
QuestionTkn: yyDollar[2].token,
ColonTkn: yyDollar[3].token,
IfFalse: yyDollar[4].node,
@@ -6983,7 +6983,7 @@ yydefault:
{
yyVAL.node = &ast.ExprTernary{
Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[5].node),
Condition: yyDollar[1].node,
Cond: yyDollar[1].node,
QuestionTkn: yyDollar[2].token,
IfTrue: yyDollar[3].node,
ColonTkn: yyDollar[4].token,
@@ -7033,7 +7033,7 @@ yydefault:
{
yyVAL.node = &ast.ExprConstFetch{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Const: &ast.NameName{
Const: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
Parts: yyDollar[1].node.(*ParserSeparatedList).Items,
SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
@@ -7075,7 +7075,7 @@ yydefault:
{
yyVAL.node = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
IdentifierTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
@@ -7287,7 +7287,7 @@ yydefault:
yyDollar[3].list = append(yyDollar[3].list, &ast.ExprFunctionCall{
Position: yylex.(*Parser).builder.NewNodePosition(mc),
OpenParenthesisTkn: mc.OpenParenthesisTkn,
Arguments: mc.Arguments,
Args: mc.Args,
SeparatorTkns: mc.SeparatorTkns,
CloseParenthesisTkn: mc.CloseParenthesisTkn,
},
@@ -7295,7 +7295,7 @@ yydefault:
yyDollar[3].list = append(yyDollar[3].list, yyDollar[4].list[1:len(yyDollar[4].list)]...)
case *ast.ExprPropertyFetch:
yyDollar[4].list[0].(*ast.ExprMethodCall).OpenCurlyBracketTkn = l.OpenCurlyBracketTkn
yyDollar[4].list[0].(*ast.ExprMethodCall).Method = l.Property
yyDollar[4].list[0].(*ast.ExprMethodCall).Method = l.Prop
yyDollar[4].list[0].(*ast.ExprMethodCall).CloseCurlyBracketTkn = l.CloseCurlyBracketTkn
yyDollar[4].list[0].(*ast.ExprMethodCall).ObjectOperatorTkn = l.ObjectOperatorTkn
yyDollar[3].list = append(yyDollar[3].list[:len(yyDollar[3].list)-1], yyDollar[4].list...)
@@ -7382,7 +7382,7 @@ yydefault:
yyDollar[2].list = append(yyDollar[2].list, &ast.ExprFunctionCall{
Position: yylex.(*Parser).builder.NewNodePosition(mc),
OpenParenthesisTkn: mc.OpenParenthesisTkn,
Arguments: mc.Arguments,
Args: mc.Args,
SeparatorTkns: mc.SeparatorTkns,
CloseParenthesisTkn: mc.OpenParenthesisTkn,
},
@@ -7390,7 +7390,7 @@ yydefault:
yyDollar[2].list = append(yyDollar[2].list, yyDollar[3].list[1:len(yyDollar[3].list)]...)
case *ast.ExprPropertyFetch:
yyDollar[3].list[0].(*ast.ExprMethodCall).OpenCurlyBracketTkn = l.OpenCurlyBracketTkn
yyDollar[3].list[0].(*ast.ExprMethodCall).Method = l.Property
yyDollar[3].list[0].(*ast.ExprMethodCall).Method = l.Prop
yyDollar[3].list[0].(*ast.ExprMethodCall).CloseCurlyBracketTkn = l.CloseCurlyBracketTkn
yyDollar[3].list[0].(*ast.ExprMethodCall).ObjectOperatorTkn = l.ObjectOperatorTkn
yyDollar[2].list = append(yyDollar[2].list[:len(yyDollar[2].list)-1], yyDollar[3].list...)
@@ -7434,7 +7434,7 @@ yydefault:
yyVAL.node = &ast.ExprMethodCall{
Position: yylex.(*Parser).builder.NewNodePosition(yyDollar[1].node),
OpenParenthesisTkn: yyDollar[1].node.(*ArgumentList).OpenParenthesisTkn,
Arguments: yyDollar[1].node.(*ArgumentList).Arguments,
Args: yyDollar[1].node.(*ArgumentList).Arguments,
SeparatorTkns: yyDollar[1].node.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: yyDollar[1].node.(*ArgumentList).CloseParenthesisTkn,
}
@@ -7468,7 +7468,7 @@ yydefault:
// line internal/php5/php5.y:4927
{
for i := len(yyDollar[1].list) - 1; i >= 0; i-- {
yyDollar[1].list[i].(*ast.ExprVariable).VarName = yyDollar[2].node
yyDollar[1].list[i].(*ast.ExprVariable).Name = yyDollar[2].node
yyDollar[1].list[i].(*ast.ExprVariable).Position = yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].list[i], yyDollar[2].node)
yyDollar[2].node = yyDollar[1].list[i]
}
@@ -7483,7 +7483,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
Class: yyDollar[1].node,
DoubleColonTkn: yyDollar[2].token,
Property: yyDollar[3].node,
Prop: yyDollar[3].node,
}
}
case 450:
@@ -7494,7 +7494,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
Class: yyDollar[1].node,
DoubleColonTkn: yyDollar[2].token,
Property: yyDollar[3].node,
Prop: yyDollar[3].node,
}
}
case 451:
@@ -7556,7 +7556,7 @@ yydefault:
// line internal/php5/php5.y:5011
{
for i := len(yyDollar[1].list) - 1; i >= 0; i-- {
yyDollar[1].list[i].(*ast.ExprVariable).VarName = yyDollar[2].node
yyDollar[1].list[i].(*ast.ExprVariable).Name = yyDollar[2].node
yyDollar[1].list[i].(*ast.ExprVariable).Position = yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].list[i], yyDollar[2].node)
yyDollar[2].node = yyDollar[1].list[i]
}
@@ -7605,7 +7605,7 @@ yydefault:
{
yyVAL.node = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
IdentifierTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
@@ -7620,7 +7620,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
DollarTkn: yyDollar[1].token,
OpenCurlyBracketTkn: yyDollar[2].token,
VarName: yyDollar[3].node,
Name: yyDollar[3].node,
CloseCurlyBracketTkn: yyDollar[4].token,
}
}
@@ -7649,7 +7649,7 @@ yydefault:
yyVAL.list = []ast.Vertex{
&ast.ExprPropertyFetch{
Position: yylex.(*Parser).builder.NewNodePosition(yyDollar[1].node),
Property: yyDollar[1].node,
Prop: yyDollar[1].node,
},
}
}
@@ -7687,12 +7687,12 @@ yydefault:
{
property := &ast.ExprPropertyFetch{
Position: yylex.(*Parser).builder.NewNodePosition(yyDollar[1].node),
Property: yyDollar[1].node,
Prop: yyDollar[1].node,
}
if brackets, ok := yyDollar[1].node.(*ParserBrackets); ok {
property.OpenCurlyBracketTkn = brackets.OpenBracketTkn
property.Property = brackets.Child
property.Prop = brackets.Child
property.CloseCurlyBracketTkn = brackets.CloseBracketTkn
}
@@ -7975,7 +7975,7 @@ yydefault:
{
yyVAL.node = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
IdentifierTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
@@ -7990,7 +7990,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
IdentifierTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
@@ -8009,14 +8009,14 @@ yydefault:
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
IdentifierTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
},
},
ObjectOperatorTkn: yyDollar[2].token,
Property: &ast.Identifier{
Prop: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
IdentifierTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,
@@ -8030,7 +8030,7 @@ yydefault:
yyVAL.node = &ast.ScalarEncapsedStringVar{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
DollarOpenCurlyBracketTkn: yyDollar[1].token,
VarName: yyDollar[2].node,
Name: yyDollar[2].node,
CloseCurlyBracketTkn: yyDollar[3].token,
}
}
@@ -8041,7 +8041,7 @@ yydefault:
yyVAL.node = &ast.ScalarEncapsedStringVar{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
DollarOpenCurlyBracketTkn: yyDollar[1].token,
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
IdentifierTkn: yyDollar[2].token,
Value: yyDollar[2].token.Value,
@@ -8056,7 +8056,7 @@ yydefault:
yyVAL.node = &ast.ScalarEncapsedStringVar{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
DollarOpenCurlyBracketTkn: yyDollar[1].token,
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
IdentifierTkn: yyDollar[2].token,
Value: yyDollar[2].token.Value,
@@ -8113,7 +8113,7 @@ yydefault:
{
yyVAL.node = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
IdentifierTkn: yyDollar[1].token,
Value: yyDollar[1].token.Value,
@@ -8246,7 +8246,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
Class: yyDollar[1].node,
DoubleColonTkn: yyDollar[2].token,
ConstantName: &ast.Identifier{
Const: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
IdentifierTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,
@@ -8261,7 +8261,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
Class: yyDollar[1].node,
DoubleColonTkn: yyDollar[2].token,
ConstantName: &ast.Identifier{
Const: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
IdentifierTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,
@@ -8276,7 +8276,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
Class: yyDollar[1].node,
DoubleColonTkn: yyDollar[2].token,
ConstantName: &ast.Identifier{
Const: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
IdentifierTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,
@@ -8291,7 +8291,7 @@ yydefault:
Position: yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
Class: yyDollar[1].node,
DoubleColonTkn: yyDollar[2].token,
ConstantName: &ast.Identifier{
Const: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
IdentifierTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,

232
internal/php5/php5.y
View File

@@ -293,7 +293,7 @@ namespace_name:
{
$$ = &ParserSeparatedList{
Items: []ast.Vertex{
&ast.NameNamePart{
&ast.NamePart{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
StringTkn: $1,
Value: $1.Value,
@@ -303,7 +303,7 @@ namespace_name:
}
| namespace_name T_NS_SEPARATOR T_STRING
{
part := &ast.NameNamePart{
part := &ast.NamePart{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
StringTkn: $3,
Value: $3.Value,
@@ -349,7 +349,7 @@ top_statement:
$$ = &ast.StmtNamespace{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
NsTkn: $1,
Name: &ast.NameName{
Name: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items),
Parts: $2.(*ParserSeparatedList).Items,
SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
@@ -362,7 +362,7 @@ top_statement:
$$ = &ast.StmtNamespace{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $5),
NsTkn: $1,
Name: &ast.NameName{
Name: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items),
Parts: $2.(*ParserSeparatedList).Items,
SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
@@ -384,17 +384,17 @@ top_statement:
}
| T_USE use_declarations ';'
{
$$ = &ast.StmtUse{
$$ = &ast.StmtUseList{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
UseTkn: $1,
UseDeclarations: $2.(*ParserSeparatedList).Items,
Uses: $2.(*ParserSeparatedList).Items,
SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
SemiColonTkn: $3,
}
}
| T_USE T_FUNCTION use_function_declarations ';'
{
$$ = &ast.StmtUse{
$$ = &ast.StmtUseList{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
UseTkn: $1,
Type: &ast.Identifier{
@@ -402,14 +402,14 @@ top_statement:
IdentifierTkn: $2,
Value: $2.Value,
},
UseDeclarations: $3.(*ParserSeparatedList).Items,
Uses: $3.(*ParserSeparatedList).Items,
SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns,
SemiColonTkn: $4,
}
}
| T_USE T_CONST use_const_declarations ';'
{
$$ = &ast.StmtUse{
$$ = &ast.StmtUseList{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
UseTkn: $1,
Type: &ast.Identifier{
@@ -417,7 +417,7 @@ top_statement:
IdentifierTkn: $2,
Value: $2.Value,
},
UseDeclarations: $3.(*ParserSeparatedList).Items,
Uses: $3.(*ParserSeparatedList).Items,
SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns,
SemiColonTkn: $4,
}
@@ -449,9 +449,9 @@ use_declarations:
use_declaration:
namespace_name
{
$$ = &ast.StmtUseDeclaration{
$$ = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Parts: $1.(*ParserSeparatedList).Items,
SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
@@ -460,9 +460,9 @@ use_declaration:
}
| namespace_name T_AS T_STRING
{
$$ = &ast.StmtUseDeclaration{
$$ = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ParserSeparatedList).Items, $3),
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Parts: $1.(*ParserSeparatedList).Items,
SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
@@ -477,10 +477,10 @@ use_declaration:
}
| T_NS_SEPARATOR namespace_name
{
$$ = &ast.StmtUseDeclaration{
$$ = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items),
NsSeparatorTkn: $1,
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items),
Parts: $2.(*ParserSeparatedList).Items,
SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
@@ -489,10 +489,10 @@ use_declaration:
}
| T_NS_SEPARATOR namespace_name T_AS T_STRING
{
$$ = &ast.StmtUseDeclaration{
$$ = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
NsSeparatorTkn: $1,
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items),
Parts: $2.(*ParserSeparatedList).Items,
SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
@@ -526,9 +526,9 @@ use_function_declarations:
use_function_declaration:
namespace_name
{
$$ = &ast.StmtUseDeclaration{
$$ = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Parts: $1.(*ParserSeparatedList).Items,
SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
@@ -537,9 +537,9 @@ use_function_declaration:
}
| namespace_name T_AS T_STRING
{
$$ = &ast.StmtUseDeclaration{
$$ = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ParserSeparatedList).Items, $3),
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Parts: $1.(*ParserSeparatedList).Items,
SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
@@ -554,10 +554,10 @@ use_function_declaration:
}
| T_NS_SEPARATOR namespace_name
{
$$ = &ast.StmtUseDeclaration{
$$ = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items),
NsSeparatorTkn: $1,
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items),
Parts: $2.(*ParserSeparatedList).Items,
SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
@@ -566,10 +566,10 @@ use_function_declaration:
}
| T_NS_SEPARATOR namespace_name T_AS T_STRING
{
$$ = &ast.StmtUseDeclaration{
$$ = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
NsSeparatorTkn: $1,
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items),
Parts: $2.(*ParserSeparatedList).Items,
SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
@@ -603,9 +603,9 @@ use_const_declarations:
use_const_declaration:
namespace_name
{
$$ = &ast.StmtUseDeclaration{
$$ = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Parts: $1.(*ParserSeparatedList).Items,
SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
@@ -614,9 +614,9 @@ use_const_declaration:
}
| namespace_name T_AS T_STRING
{
$$ = &ast.StmtUseDeclaration{
$$ = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ParserSeparatedList).Items, $3),
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Parts: $1.(*ParserSeparatedList).Items,
SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
@@ -631,10 +631,10 @@ use_const_declaration:
}
| T_NS_SEPARATOR namespace_name
{
$$ = &ast.StmtUseDeclaration{
$$ = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $2.(*ParserSeparatedList).Items),
NsSeparatorTkn: $1,
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items),
Parts: $2.(*ParserSeparatedList).Items,
SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
@@ -643,10 +643,10 @@ use_const_declaration:
}
| T_NS_SEPARATOR namespace_name T_AS T_STRING
{
$$ = &ast.StmtUseDeclaration{
$$ = &ast.StmtUse{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
NsSeparatorTkn: $1,
Use: &ast.NameName{
Use: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items),
Parts: $2.(*ParserSeparatedList).Items,
SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
@@ -755,7 +755,7 @@ statement:
{
$$ = &ast.StmtLabel{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $2),
LabelName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
IdentifierTkn: $1,
Value: $1.Value,
@@ -1115,7 +1115,7 @@ catch_statement:
Types: []ast.Vertex{$3},
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($4),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($4),
IdentifierTkn: $4,
Value: $4.Value,
@@ -1179,7 +1179,7 @@ additional_catch:
Types: []ast.Vertex{$3},
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($4),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($4),
IdentifierTkn: $4,
Value: $4.Value,
@@ -1259,7 +1259,7 @@ unticked_function_declaration_statement:
Position: yylex.(*Parser).builder.NewTokensPosition($1, $9),
FunctionTkn: $1,
AmpersandTkn: $2,
FunctionName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
IdentifierTkn: $3,
Value: $3.Value,
@@ -1287,7 +1287,7 @@ unticked_class_declaration_statement:
}
n.Position = yylex.(*Parser).builder.NewNodeTokenPosition($1, $7)
n.ClassName = className
n.Name = className
n.OpenCurlyBracketTkn = $5
n.Stmts = $6
n.CloseCurlyBracketTkn = $7
@@ -1310,7 +1310,7 @@ unticked_class_declaration_statement:
}
n.Position = yylex.(*Parser).builder.NewNodeTokenPosition($1, $7)
n.TraitName = traitName
n.Name = traitName
n.OpenCurlyBracketTkn = $5
n.Stmts = $6
n.CloseCurlyBracketTkn = $7
@@ -1331,7 +1331,7 @@ unticked_class_declaration_statement:
iface := &ast.StmtInterface{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $6),
InterfaceTkn: $1,
InterfaceName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($2),
IdentifierTkn: $2,
Value: $2.Value,
@@ -1631,7 +1631,7 @@ switch_case_list:
$$ = &ast.StmtSwitch{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
OpenCurlyBracketTkn: $1,
CaseList: $2,
Cases: $2,
CloseCurlyBracketTkn: $3,
}
}
@@ -1641,7 +1641,7 @@ switch_case_list:
Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
OpenCurlyBracketTkn: $1,
CaseSeparatorTkn: $2,
CaseList: $3,
Cases: $3,
CloseCurlyBracketTkn: $4,
}
}
@@ -1650,7 +1650,7 @@ switch_case_list:
$$ = &ast.StmtSwitch{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
ColonTkn: $1,
CaseList: $2,
Cases: $2,
EndSwitchTkn: $3,
SemiColonTkn: $4,
}
@@ -1661,7 +1661,7 @@ switch_case_list:
Position: yylex.(*Parser).builder.NewTokensPosition($1, $5),
ColonTkn: $1,
CaseSeparatorTkn: $2,
CaseList: $3,
Cases: $3,
EndSwitchTkn: $4,
SemiColonTkn: $5,
}
@@ -1857,7 +1857,7 @@ parameter:
VariadicTkn: $3,
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($4),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($4),
IdentifierTkn: $4,
Value: $4.Value,
@@ -1883,7 +1883,7 @@ parameter:
VariadicTkn: $3,
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($4),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($4),
IdentifierTkn: $4,
Value: $4.Value,
@@ -2030,7 +2030,7 @@ global_var:
{
$$ = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
IdentifierTkn: $1,
Value: $1.Value,
@@ -2042,7 +2042,7 @@ global_var:
$$ = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $2),
DollarTkn: $1,
VarName: $2,
Name: $2,
}
}
| '$' '{' expr '}'
@@ -2051,7 +2051,7 @@ global_var:
Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
DollarTkn: $1,
OpenCurlyBracketTkn: $2,
VarName: $3,
Name: $3,
CloseCurlyBracketTkn: $4,
}
}
@@ -2065,7 +2065,7 @@ static_var_list:
Position: yylex.(*Parser).builder.NewTokenPosition($3),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
IdentifierTkn: $3,
Value: $3.Value,
@@ -2082,7 +2082,7 @@ static_var_list:
Position: yylex.(*Parser).builder.NewTokenNodePosition($3, $5),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
IdentifierTkn: $3,
Value: $3.Value,
@@ -2103,7 +2103,7 @@ static_var_list:
Position: yylex.(*Parser).builder.NewTokenPosition($1),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
IdentifierTkn: $1,
Value: $1.Value,
@@ -2121,7 +2121,7 @@ static_var_list:
Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $3),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
IdentifierTkn: $1,
Value: $1.Value,
@@ -2154,7 +2154,7 @@ class_statement:
$$ = &ast.StmtPropertyList{
Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1, $3),
Modifiers: $1,
Properties: $2.(*ParserSeparatedList).Items,
Props: $2.(*ParserSeparatedList).Items,
SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
SemiColonTkn: $3,
}
@@ -2181,7 +2181,7 @@ class_statement:
Modifiers: $1,
FunctionTkn: $2,
AmpersandTkn: $3,
MethodName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($4),
IdentifierTkn: $4,
Value: $4.Value,
@@ -2512,7 +2512,7 @@ class_variable_declaration:
Position: yylex.(*Parser).builder.NewTokenPosition($3),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
IdentifierTkn: $3,
Value: $3.Value,
@@ -2531,7 +2531,7 @@ class_variable_declaration:
Position: yylex.(*Parser).builder.NewTokenNodePosition($3, $5),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
IdentifierTkn: $3,
Value: $3.Value,
@@ -2554,7 +2554,7 @@ class_variable_declaration:
Position: yylex.(*Parser).builder.NewTokenPosition($1),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
IdentifierTkn: $1,
Value: $1.Value,
@@ -2573,7 +2573,7 @@ class_variable_declaration:
Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $3),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
IdentifierTkn: $1,
Value: $1.Value,
@@ -2744,7 +2744,7 @@ new_expr:
NewTkn: $1,
Class: $2,
OpenParenthesisTkn: $3.(*ArgumentList).OpenParenthesisTkn,
Arguments: $3.(*ArgumentList).Arguments,
Args: $3.(*ArgumentList).Arguments,
SeparatorTkns: $3.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: $3.(*ArgumentList).CloseParenthesisTkn,
}
@@ -2802,7 +2802,7 @@ expr_without_variable:
NewTkn: $4,
Class: $5,
OpenParenthesisTkn: $6.(*ArgumentList).OpenParenthesisTkn,
Arguments: $6.(*ArgumentList).Arguments,
Args: $6.(*ArgumentList).Arguments,
SeparatorTkns: $6.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: $6.(*ArgumentList).CloseParenthesisTkn,
}
@@ -3281,7 +3281,7 @@ expr_without_variable:
{
$$ = &ast.ExprTernary{
Position: yylex.(*Parser).builder.NewNodesPosition($1, $5),
Condition: $1,
Cond: $1,
QuestionTkn: $2,
IfTrue: $3,
ColonTkn: $4,
@@ -3292,7 +3292,7 @@ expr_without_variable:
{
$$ = &ast.ExprTernary{
Position: yylex.(*Parser).builder.NewNodesPosition($1, $4),
Condition: $1,
Cond: $1,
QuestionTkn: $2,
ColonTkn: $3,
IfFalse: $4,
@@ -3462,7 +3462,7 @@ yield_expr:
$$ = &ast.ExprYield{
Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $2),
YieldTkn: $1,
Value: $2,
Val: $2,
}
}
| T_YIELD variable
@@ -3470,7 +3470,7 @@ yield_expr:
$$ = &ast.ExprYield{
Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $2),
YieldTkn: $1,
Value: $2,
Val: $2,
}
}
| T_YIELD expr T_DOUBLE_ARROW expr_without_variable
@@ -3480,7 +3480,7 @@ yield_expr:
YieldTkn: $1,
Key: $2,
DoubleArrowTkn: $3,
Value: $4,
Val: $4,
}
}
| T_YIELD expr T_DOUBLE_ARROW variable
@@ -3490,7 +3490,7 @@ yield_expr:
YieldTkn: $1,
Key: $2,
DoubleArrowTkn: $3,
Value: $4,
Val: $4,
}
}
;
@@ -3583,7 +3583,7 @@ lexical_vars:
$$ = &ast.ExprClosure{
UseTkn: $1,
UseOpenParenthesisTkn: $2,
Use: $3.(*ParserSeparatedList).Items,
Uses: $3.(*ParserSeparatedList).Items,
UseSeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns,
UseCloseParenthesisTkn: $4,
}
@@ -3597,7 +3597,7 @@ lexical_var_list:
Position: yylex.(*Parser).builder.NewTokenPosition($3),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
IdentifierTkn: $3,
Value: $3.Value,
@@ -3617,7 +3617,7 @@ lexical_var_list:
AmpersandTkn: $3,
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($4),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($4),
IdentifierTkn: $4,
Value: $4.Value,
@@ -3636,7 +3636,7 @@ lexical_var_list:
Position: yylex.(*Parser).builder.NewTokenPosition($1),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
IdentifierTkn: $1,
Value: $1.Value,
@@ -3655,7 +3655,7 @@ lexical_var_list:
AmpersandTkn: $1,
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($2),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($2),
IdentifierTkn: $2,
Value: $2.Value,
@@ -3674,13 +3674,13 @@ function_call:
{
$$ = &ast.ExprFunctionCall{
Position: yylex.(*Parser).builder.NewNodeListNodePosition($1.(*ParserSeparatedList).Items, $2),
Function: &ast.NameName{
Function: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Parts: $1.(*ParserSeparatedList).Items,
SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
},
OpenParenthesisTkn: $2.(*ArgumentList).OpenParenthesisTkn,
Arguments: $2.(*ArgumentList).Arguments,
Args: $2.(*ArgumentList).Arguments,
SeparatorTkns: $2.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: $2.(*ArgumentList).CloseParenthesisTkn,
}
@@ -3697,7 +3697,7 @@ function_call:
SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns,
},
OpenParenthesisTkn: $4.(*ArgumentList).OpenParenthesisTkn,
Arguments: $4.(*ArgumentList).Arguments,
Args: $4.(*ArgumentList).Arguments,
SeparatorTkns: $4.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn,
}
@@ -3713,7 +3713,7 @@ function_call:
SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
},
OpenParenthesisTkn: $3.(*ArgumentList).OpenParenthesisTkn,
Arguments: $3.(*ArgumentList).Arguments,
Args: $3.(*ArgumentList).Arguments,
SeparatorTkns: $3.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: $3.(*ArgumentList).CloseParenthesisTkn,
}
@@ -3726,7 +3726,7 @@ function_call:
DoubleColonTkn: $2,
Call: $3,
OpenParenthesisTkn: $4.(*ArgumentList).OpenParenthesisTkn,
Arguments: $4.(*ArgumentList).Arguments,
Args: $4.(*ArgumentList).Arguments,
SeparatorTkns: $4.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn,
}
@@ -3747,7 +3747,7 @@ function_call:
DoubleColonTkn: $2,
Call: $3,
OpenParenthesisTkn: $4.(*ArgumentList).OpenParenthesisTkn,
Arguments: $4.(*ArgumentList).Arguments,
Args: $4.(*ArgumentList).Arguments,
SeparatorTkns: $4.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn,
}
@@ -3760,7 +3760,7 @@ function_call:
DoubleColonTkn: $2,
Call: $3,
OpenParenthesisTkn: $4.(*ArgumentList).OpenParenthesisTkn,
Arguments: $4.(*ArgumentList).Arguments,
Args: $4.(*ArgumentList).Arguments,
SeparatorTkns: $4.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn,
}
@@ -3781,7 +3781,7 @@ function_call:
DoubleColonTkn: $2,
Call: $3,
OpenParenthesisTkn: $4.(*ArgumentList).OpenParenthesisTkn,
Arguments: $4.(*ArgumentList).Arguments,
Args: $4.(*ArgumentList).Arguments,
SeparatorTkns: $4.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn,
}
@@ -3792,7 +3792,7 @@ function_call:
Position: yylex.(*Parser).builder.NewNodesPosition($1, $2),
Function: $1,
OpenParenthesisTkn: $2.(*ArgumentList).OpenParenthesisTkn,
Arguments: $2.(*ArgumentList).Arguments,
Args: $2.(*ArgumentList).Arguments,
SeparatorTkns: $2.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: $2.(*ArgumentList).CloseParenthesisTkn,
}
@@ -3810,7 +3810,7 @@ class_name:
}
| namespace_name
{
$$ = &ast.NameName{
$$ = &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Parts: $1.(*ParserSeparatedList).Items,
SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
@@ -3840,7 +3840,7 @@ class_name:
fully_qualified_class_name:
namespace_name
{
$$ = &ast.NameName{
$$ = &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Parts: $1.(*ParserSeparatedList).Items,
SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
@@ -4105,7 +4105,7 @@ static_class_constant:
Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3),
Class: $1,
DoubleColonTkn: $2,
ConstantName: &ast.Identifier{
Const: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
IdentifierTkn: $3,
Value: $3.Value,
@@ -4134,7 +4134,7 @@ static_scalar_value:
{
$$ = &ast.ExprConstFetch{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Const: &ast.NameName{
Const: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Parts: $1.(*ParserSeparatedList).Items,
SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
@@ -4461,7 +4461,7 @@ static_operation:
{
$$ = &ast.ExprTernary{
Position: yylex.(*Parser).builder.NewNodesPosition($1, $4),
Condition: $1,
Cond: $1,
QuestionTkn: $2,
ColonTkn: $3,
IfFalse: $4,
@@ -4471,7 +4471,7 @@ static_operation:
{
$$ = &ast.ExprTernary{
Position: yylex.(*Parser).builder.NewNodesPosition($1, $5),
Condition: $1,
Cond: $1,
QuestionTkn: $2,
IfTrue: $3,
ColonTkn: $4,
@@ -4514,7 +4514,7 @@ general_constant:
{
$$ = &ast.ExprConstFetch{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Const: &ast.NameName{
Const: &ast.Name{
Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
Parts: $1.(*ParserSeparatedList).Items,
SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
@@ -4553,7 +4553,7 @@ scalar:
{
$$ = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
IdentifierTkn: $1,
Value: $1.Value,
@@ -4750,7 +4750,7 @@ variable:
$3 = append($3, &ast.ExprFunctionCall{
Position: yylex.(*Parser).builder.NewNodePosition(mc),
OpenParenthesisTkn: mc.OpenParenthesisTkn,
Arguments: mc.Arguments,
Args: mc.Args,
SeparatorTkns: mc.SeparatorTkns,
CloseParenthesisTkn: mc.CloseParenthesisTkn,
},
@@ -4758,7 +4758,7 @@ variable:
$3 = append($3, $4[1:len($4)]...)
case *ast.ExprPropertyFetch:
$4[0].(*ast.ExprMethodCall).OpenCurlyBracketTkn = l.OpenCurlyBracketTkn
$4[0].(*ast.ExprMethodCall).Method = l.Property
$4[0].(*ast.ExprMethodCall).Method = l.Prop
$4[0].(*ast.ExprMethodCall).CloseCurlyBracketTkn = l.CloseCurlyBracketTkn
$4[0].(*ast.ExprMethodCall).ObjectOperatorTkn = l.ObjectOperatorTkn
$3 = append($3[:len($3)-1], $4...)
@@ -4844,7 +4844,7 @@ variable_property:
$2 = append($2, &ast.ExprFunctionCall{
Position: yylex.(*Parser).builder.NewNodePosition(mc),
OpenParenthesisTkn: mc.OpenParenthesisTkn,
Arguments: mc.Arguments,
Args: mc.Args,
SeparatorTkns: mc.SeparatorTkns,
CloseParenthesisTkn: mc.OpenParenthesisTkn,
},
@@ -4852,7 +4852,7 @@ variable_property:
$2 = append($2, $3[1:len($3)]...)
case *ast.ExprPropertyFetch:
$3[0].(*ast.ExprMethodCall).OpenCurlyBracketTkn = l.OpenCurlyBracketTkn
$3[0].(*ast.ExprMethodCall).Method = l.Property
$3[0].(*ast.ExprMethodCall).Method = l.Prop
$3[0].(*ast.ExprMethodCall).CloseCurlyBracketTkn = l.CloseCurlyBracketTkn
$3[0].(*ast.ExprMethodCall).ObjectOperatorTkn = l.ObjectOperatorTkn
$2 = append($2[:len($2)-1], $3...)
@@ -4896,7 +4896,7 @@ method:
$$ = &ast.ExprMethodCall{
Position: yylex.(*Parser).builder.NewNodePosition($1),
OpenParenthesisTkn: $1.(*ArgumentList).OpenParenthesisTkn,
Arguments: $1.(*ArgumentList).Arguments,
Args: $1.(*ArgumentList).Arguments,
SeparatorTkns: $1.(*ArgumentList).SeparatorTkns,
CloseParenthesisTkn: $1.(*ArgumentList).CloseParenthesisTkn,
}
@@ -4926,7 +4926,7 @@ variable_without_objects:
| simple_indirect_reference reference_variable
{
for i := len($1)-1; i>=0; i-- {
$1[i].(*ast.ExprVariable).VarName = $2
$1[i].(*ast.ExprVariable).Name = $2
$1[i].(*ast.ExprVariable).Position = yylex.(*Parser).builder.NewNodesPosition($1[i], $2)
$2 = $1[i]
}
@@ -4942,7 +4942,7 @@ static_member:
Position: yylex.(*Parser).builder.NewNodesPosition($1, $3),
Class: $1,
DoubleColonTkn: $2,
Property: $3,
Prop: $3,
}
}
| variable_class_name T_PAAMAYIM_NEKUDOTAYIM variable_without_objects
@@ -4951,7 +4951,7 @@ static_member:
Position: yylex.(*Parser).builder.NewNodesPosition($1, $3),
Class: $1,
DoubleColonTkn: $2,
Property: $3,
Prop: $3,
}
}
;
@@ -5010,7 +5010,7 @@ base_variable:
| simple_indirect_reference reference_variable
{
for i := len($1)-1; i>=0; i-- {
$1[i].(*ast.ExprVariable).VarName = $2
$1[i].(*ast.ExprVariable).Name = $2
$1[i].(*ast.ExprVariable).Position = yylex.(*Parser).builder.NewNodesPosition($1[i], $2)
$2 = $1[i]
}
@@ -5056,7 +5056,7 @@ compound_variable:
{
$$ = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
IdentifierTkn: $1,
Value: $1.Value,
@@ -5069,7 +5069,7 @@ compound_variable:
Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
DollarTkn: $1,
OpenCurlyBracketTkn: $2,
VarName: $3,
Name: $3,
CloseCurlyBracketTkn: $4,
}
}
@@ -5097,7 +5097,7 @@ object_property:
$$ = []ast.Vertex{
&ast.ExprPropertyFetch{
Position: yylex.(*Parser).builder.NewNodePosition($1),
Property: $1,
Prop: $1,
},
}
}
@@ -5132,12 +5132,12 @@ object_dim_list:
{
property := &ast.ExprPropertyFetch{
Position: yylex.(*Parser).builder.NewNodePosition($1),
Property: $1,
Prop: $1,
}
if brackets, ok := $1.(*ParserBrackets); ok {
property.OpenCurlyBracketTkn = brackets.OpenBracketTkn
property.Property = brackets.Child
property.Prop = brackets.Child
property.CloseCurlyBracketTkn = brackets.CloseBracketTkn
}
@@ -5398,7 +5398,7 @@ encaps_var:
{
$$ = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
IdentifierTkn: $1,
Value: $1.Value,
@@ -5411,7 +5411,7 @@ encaps_var:
Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
IdentifierTkn: $1,
Value: $1.Value,
@@ -5428,14 +5428,14 @@ encaps_var:
Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
Var: &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
IdentifierTkn: $1,
Value: $1.Value,
},
},
ObjectOperatorTkn: $2,
Property: &ast.Identifier{
Prop: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
IdentifierTkn: $3,
Value: $3.Value,
@@ -5447,7 +5447,7 @@ encaps_var:
$$ = &ast.ScalarEncapsedStringVar{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
DollarOpenCurlyBracketTkn: $1,
VarName: $2,
Name: $2,
CloseCurlyBracketTkn: $3,
}
}
@@ -5456,7 +5456,7 @@ encaps_var:
$$ = &ast.ScalarEncapsedStringVar{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
DollarOpenCurlyBracketTkn: $1,
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($2),
IdentifierTkn: $2,
Value: $2.Value,
@@ -5469,7 +5469,7 @@ encaps_var:
$$ = &ast.ScalarEncapsedStringVar{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
DollarOpenCurlyBracketTkn: $1,
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($2),
IdentifierTkn: $2,
Value: $2.Value,
@@ -5521,7 +5521,7 @@ encaps_var_offset:
{
$$ = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
VarName: &ast.Identifier{
Name: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($1),
IdentifierTkn: $1,
Value: $1.Value,
@@ -5640,7 +5640,7 @@ class_constant:
Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3),
Class: $1,
DoubleColonTkn: $2,
ConstantName: &ast.Identifier{
Const: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
IdentifierTkn: $3,
Value: $3.Value,
@@ -5653,7 +5653,7 @@ class_constant:
Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3),
Class: $1,
DoubleColonTkn: $2,
ConstantName: &ast.Identifier{
Const: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
IdentifierTkn: $3,
Value: $3.Value,
@@ -5669,7 +5669,7 @@ static_class_name_scalar:
Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3),
Class: $1,
DoubleColonTkn: $2,
ConstantName: &ast.Identifier{
Const: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
IdentifierTkn: $3,
Value: $3.Value,
@@ -5685,7 +5685,7 @@ class_name_scalar:
Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3),
Class: $1,
DoubleColonTkn: $2,
ConstantName: &ast.Identifier{
Const: &ast.Identifier{
Position: yylex.(*Parser).builder.NewTokenPosition($3),
IdentifierTkn: $3,
Value: $3.Value,