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

replace meta.WhileToken

Browse Source
This commit is contained in:
z7zmey 2018-10-29 13:04:44 +02:00
parent cb04c4a92a
commit e19956b303
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
php5/php5.go
View File

@ -3042,7 +3042,7 @@ yydefault:
yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node))
// save comments
yyDollar[1].token.Meta.SetTokenName(meta.WhileToken).AppendTo(yyVAL.node.GetMeta())
yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta())
yyDollar[2].node.GetMeta().Cut(meta.TokenNameFilter(meta.OpenParenthesisToken)).Cut(meta.NotFilter(meta.TypeFilter(meta.TokenType))).AppendTo(yyVAL.node.GetMeta())
yyDollar[2].node.GetMeta().Cut(meta.TokenNameFilter(meta.CloseParenthesisToken)).Cut(meta.NotFilter(meta.TypeFilter(meta.TokenType))).AppendTo(yyVAL.node.GetMeta())

2
php5/php5.y
View File

@ -938,7 +938,7 @@ unticked_statement:
$$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3))
// save comments
$1.Meta.SetTokenName(meta.WhileToken).AppendTo($$.GetMeta())
$1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
$2.GetMeta().Cut(meta.TokenNameFilter(meta.OpenParenthesisToken)).Cut(meta.NotFilter(meta.TypeFilter(meta.TokenType))).AppendTo($$.GetMeta())
$2.GetMeta().Cut(meta.TokenNameFilter(meta.CloseParenthesisToken)).Cut(meta.NotFilter(meta.TypeFilter(meta.TokenType))).AppendTo($$.GetMeta())

2
php7/php7.go
View File

@ -3284,7 +3284,7 @@ yydefault:
yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node))
// save comments
yyDollar[1].token.Meta.SetTokenName(meta.WhileToken).AppendTo(yyVAL.node.GetMeta())
yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta())
yyDollar[2].token.Meta.SetTokenName(meta.OpenParenthesisToken).AppendTo(yyVAL.node.GetMeta())
yyDollar[4].token.Meta.SetTokenName(meta.CloseParenthesisToken).AppendTo(yyVAL.node.GetMeta())

2
php7/php7.y
View File

@ -976,7 +976,7 @@ statement:
$$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5))
// save comments
$1.Meta.SetTokenName(meta.WhileToken).AppendTo($$.GetMeta())
$1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
$2.Meta.SetTokenName(meta.OpenParenthesisToken).AppendTo($$.GetMeta())
$4.Meta.SetTokenName(meta.CloseParenthesisToken).AppendTo($$.GetMeta())

2
printer/printer.go
View File

@ -1842,7 +1842,6 @@ func (p *Printer) printStmtAltWhile(n node.Node) {
nn := n.(*stmt.AltWhile)
p.printMeta(nn, meta.NodeStart)
p.printMeta(nn, meta.WhileToken)
io.WriteString(p.w, "while")
p.printMeta(nn, meta.OpenParenthesisToken)
io.WriteString(p.w, "(")
@ -2712,7 +2711,6 @@ func (p *Printer) printStmtWhile(n node.Node) {
nn := n.(*stmt.While)
p.printMeta(nn, meta.NodeStart)
p.printMeta(nn, meta.WhileToken)
io.WriteString(p.w, "while")
p.printMeta(nn, meta.OpenParenthesisToken)
io.WriteString(p.w, "(")

4
printer/printer_test.go
View File

@ -5389,7 +5389,7 @@ func TestPrinterPrintAltWhile(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.WhileToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.WhiteSpaceType,
@ -8555,7 +8555,7 @@ func TestPrinterPrintWhileStmtList(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.WhileToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.WhiteSpaceType,