diff --git a/php5/php5.go b/php5/php5.go index 8db2d7f..d2805ba 100644 --- a/php5/php5.go +++ b/php5/php5.go @@ -3707,7 +3707,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[9].token)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.FunctionToken).AppendTo(yyVAL.node.GetMeta()) + yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta()) if yyDollar[2].token != nil { yyDollar[2].token.Meta.SetTokenName(meta.AmpersandToken).AppendTo(yyVAL.node.GetMeta()) } diff --git a/php5/php5.y b/php5/php5.y index 89cc9eb..bfc677c 100644 --- a/php5/php5.y +++ b/php5/php5.y @@ -1553,7 +1553,7 @@ unticked_function_declaration_statement: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition($1, $9)) // save comments - $1.Meta.SetTokenName(meta.FunctionToken).AppendTo($$.GetMeta()) + $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta()) if $2 != nil { $2.Meta.SetTokenName(meta.AmpersandToken).AppendTo($$.GetMeta()) } diff --git a/php7/php7.go b/php7/php7.go index c607c9c..3661560 100644 --- a/php7/php7.go +++ b/php7/php7.go @@ -3784,7 +3784,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[11].token)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.FunctionToken).AppendTo(yyVAL.node.GetMeta()) + yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta()) if yyDollar[2].token != nil { yyDollar[2].token.Meta.SetTokenName(meta.AmpersandToken).AppendTo(yyVAL.node.GetMeta()) } diff --git a/php7/php7.y b/php7/php7.y index 46356ff..b87d91c 100644 --- a/php7/php7.y +++ b/php7/php7.y @@ -1433,7 +1433,7 @@ function_declaration_statement: // save comments - $1.Meta.SetTokenName(meta.FunctionToken).AppendTo($$.GetMeta()) + $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta()) if $2 != nil { $2.Meta.SetTokenName(meta.AmpersandToken).AppendTo($$.GetMeta()) } diff --git a/printer/printer.go b/printer/printer.go index 58cd406..14679a7 100644 --- a/printer/printer.go +++ b/printer/printer.go @@ -2229,7 +2229,6 @@ func (p *Printer) printStmtFunction(n node.Node) { nn := n.(*stmt.Function) p.printMeta(nn, meta.NodeStart) - p.printMeta(nn, meta.FunctionToken) io.WriteString(p.w, "function") if nn.ReturnsRef { diff --git a/printer/printer_test.go b/printer/printer_test.go index 3119b58..dd1e6f4 100644 --- a/printer/printer_test.go +++ b/printer/printer_test.go @@ -6951,7 +6951,7 @@ func TestPrinterPrintStmtFunction(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.FunctionToken, + TokenName: meta.NodeStart, }, &meta.Data{ Type: meta.WhiteSpaceType, diff --git a/visitor/pretty_json_dumper_test.go b/visitor/pretty_json_dumper_test.go index cc63f5a..16e2164 100644 --- a/visitor/pretty_json_dumper_test.go +++ b/visitor/pretty_json_dumper_test.go @@ -429,7 +429,7 @@ func ExamplePrettyJsonDumper() { // { // "type": "*meta.WhiteSpaceType", // "value": "\n\n\t\t\t", - // "tokenName": "FunctionToken" + // "tokenName": "NodeStart" // }, // { // "type": "*meta.WhiteSpaceType",