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

remove meta.EmptyToken

Browse Source
This commit is contained in:
z7zmey 2018-10-26 11:50:21 +03:00
parent 221129e959
commit 3b5fd08743
7 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/tokenName.go
View File

@ -46,7 +46,6 @@ const (
VarToken
UnsetToken
IssetToken
EmptyToken
ClassToken
TraitToken
InterfaceToken

4
php5/php5.go
View File

@ -9395,7 +9395,7 @@ yydefault:
yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token))
// save comments
yyDollar[1].token.Meta.SetTokenName(meta.EmptyToken).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())
@ -9411,7 +9411,7 @@ yydefault:
yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token))
// save comments
yyDollar[1].token.Meta.SetTokenName(meta.EmptyToken).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())

4
php5/php5.y
View File

@ -6804,7 +6804,7 @@ internal_functions_in_yacc:
$$.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4))
// save comments
$1.Meta.SetTokenName(meta.EmptyToken).AppendTo($$.GetMeta())
$1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
$2.Meta.SetTokenName(meta.OpenParenthesisToken).AppendTo($$.GetMeta())
$4.Meta.SetTokenName(meta.CloseParenthesisToken).AppendTo($$.GetMeta())
@ -6818,7 +6818,7 @@ internal_functions_in_yacc:
$$.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4))
// save comments
$1.Meta.SetTokenName(meta.EmptyToken).AppendTo($$.GetMeta())
$1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
$2.Meta.SetTokenName(meta.OpenParenthesisToken).AppendTo($$.GetMeta())
$4.Meta.SetTokenName(meta.CloseParenthesisToken).AppendTo($$.GetMeta())

2
php7/php7.go
View File

@ -8057,7 +8057,7 @@ yydefault:
yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token))
// save comments
yyDollar[1].token.Meta.SetTokenName(meta.EmptyToken).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

@ -5364,7 +5364,7 @@ internal_functions_in_yacc:
$$.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4))
// save comments
$1.Meta.SetTokenName(meta.EmptyToken).AppendTo($$.GetMeta())
$1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
$2.Meta.SetTokenName(meta.OpenParenthesisToken).AppendTo($$.GetMeta())
$4.Meta.SetTokenName(meta.CloseParenthesisToken).AppendTo($$.GetMeta())

4
printer/printer.go
View File

@ -1282,17 +1282,13 @@ func (p *Printer) printExprClosure(n node.Node) {
func (p *Printer) printExprConstFetch(n node.Node) {
nn := n.(*expr.ConstFetch)
p.printMeta(nn, meta.NodeStart)
p.Print(nn.Constant)
p.printMeta(nn, meta.NodeEnd)
}
func (p *Printer) printExprEmpty(n node.Node) {
nn := n.(*expr.Empty)
p.printMeta(nn, meta.NodeStart)
p.printMeta(nn, meta.EmptyToken)
io.WriteString(p.w, "empty")
p.printMeta(nn, meta.OpenParenthesisToken)
io.WriteString(p.w, "(")

2
printer/printer_test.go
View File

@ -3261,7 +3261,7 @@ func TestPrinterPrintEmpty(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.EmptyToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.WhiteSpaceType,