diff --git a/php5/php5.go b/php5/php5.go index 9b655ff..f326c23 100644 --- a/php5/php5.go +++ b/php5/php5.go @@ -2866,7 +2866,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, constList)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.ConstToken).AppendTo(yyVAL.node.GetMeta()) + yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta()) yyDollar[2].token.Meta.SetTokenName(meta.NodeStart).AppendTo(name.GetMeta()) yyDollar[3].token.Meta.SetTokenName(meta.EqualToken).AppendTo(constant.GetMeta()) diff --git a/php5/php5.y b/php5/php5.y index 7b02cb8..ed34ae2 100644 --- a/php5/php5.y +++ b/php5/php5.y @@ -774,7 +774,7 @@ constant_declaration: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, constList)) // save comments - $1.Meta.SetTokenName(meta.ConstToken).AppendTo($$.GetMeta()) + $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta()) $2.Meta.SetTokenName(meta.NodeStart).AppendTo(name.GetMeta()) $3.Meta.SetTokenName(meta.EqualToken).AppendTo(constant.GetMeta()) diff --git a/php7/php7.go b/php7/php7.go index 263c31d..e3c04ef 100644 --- a/php7/php7.go +++ b/php7/php7.go @@ -2869,7 +2869,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.ConstToken).AppendTo(yyVAL.node.GetMeta()) + yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta()) yyDollar[3].token.Meta.SetTokenName(meta.SemiColonToken).AppendTo(yyVAL.node.GetMeta()) yylex.(*Parser).appendMetaToken(yyVAL.node, yyDollar[3].token, meta.SemiColonToken) diff --git a/php7/php7.y b/php7/php7.y index 3f1dff3..9965ddc 100644 --- a/php7/php7.y +++ b/php7/php7.y @@ -590,7 +590,7 @@ top_statement: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)) // save comments - $1.Meta.SetTokenName(meta.ConstToken).AppendTo($$.GetMeta()) + $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta()) $3.Meta.SetTokenName(meta.SemiColonToken).AppendTo($$.GetMeta()) yylex.(*Parser).appendMetaToken($$, $3, meta.SemiColonToken) diff --git a/printer/printer.go b/printer/printer.go index 2a494f9..3c4a475 100644 --- a/printer/printer.go +++ b/printer/printer.go @@ -2013,7 +2013,6 @@ func (p *Printer) printStmtConstList(n node.Node) { nn := n.(*stmt.ConstList) p.printMeta(nn, meta.NodeStart) - p.printMeta(nn, meta.ConstToken) io.WriteString(p.w, "const") p.joinPrint(",", nn.Consts) diff --git a/printer/printer_test.go b/printer/printer_test.go index 619a8db..f918ff8 100644 --- a/printer/printer_test.go +++ b/printer/printer_test.go @@ -6057,7 +6057,7 @@ func TestPrinterPrintStmtConstList(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.ConstToken, + TokenName: meta.NodeStart, }, &meta.Data{ Type: meta.WhiteSpaceType,