From 22cca215df528d8407f28fa36c0cca2e751c8621 Mon Sep 17 00:00:00 2001 From: z7zmey Date: Sun, 3 Jun 2018 12:50:08 +0300 Subject: [PATCH] create `ForInitSemicolonToken` and `ForCondSemicolonToken` comment anchors --- comment/tokenNames.go | 4 ++++ php7/php7.go | 4 ++-- php7/php7.y | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/comment/tokenNames.go b/comment/tokenNames.go index cff630f..f02c45b 100644 --- a/comment/tokenNames.go +++ b/comment/tokenNames.go @@ -22,6 +22,8 @@ const ( DoToken WhileToken EndwhileToken + ForInitSemicolonToken + ForCondSemicolonToken ForToken EndforToken ForeachToken @@ -182,6 +184,8 @@ var TokenNames = map[TokenName]string{ DoToken: "DoToken", WhileToken: "WhileToken", EndwhileToken: "EndwhileToken", + ForInitSemicolonToken: "ForInitSemicolonToken", + ForCondSemicolonToken: "ForCondSemicolonToken", ForToken: "ForToken", EndforToken: "EndforToken", ForeachToken: "ForeachToken", diff --git a/php7/php7.go b/php7/php7.go index 8a46d70..5cd837d 100644 --- a/php7/php7.go +++ b/php7/php7.go @@ -3194,8 +3194,8 @@ yydefault: // save comments yylex.(*Parser).comments.AddFromToken(yyVAL.node, yyDollar[1].token, comment.ForToken) yylex.(*Parser).comments.AddFromToken(yyVAL.node, yyDollar[2].token, comment.OpenParenthesisToken) - yylex.(*Parser).comments.AddFromToken(yyVAL.node, yyDollar[4].token, comment.SemiColonToken) - yylex.(*Parser).comments.AddFromToken(yyVAL.node, yyDollar[6].token, comment.SemiColonToken) + yylex.(*Parser).comments.AddFromToken(yyVAL.node, yyDollar[4].token, comment.ForInitSemicolonToken) + yylex.(*Parser).comments.AddFromToken(yyVAL.node, yyDollar[6].token, comment.ForCondSemicolonToken) yylex.(*Parser).comments.AddFromToken(yyVAL.node, yyDollar[8].token, comment.CloseParenthesisToken) } case 137: diff --git a/php7/php7.y b/php7/php7.y index a014892..98424da 100644 --- a/php7/php7.y +++ b/php7/php7.y @@ -832,8 +832,8 @@ statement: // save comments yylex.(*Parser).comments.AddFromToken($$, $1, comment.ForToken) yylex.(*Parser).comments.AddFromToken($$, $2, comment.OpenParenthesisToken) - yylex.(*Parser).comments.AddFromToken($$, $4, comment.SemiColonToken) - yylex.(*Parser).comments.AddFromToken($$, $6, comment.SemiColonToken) + yylex.(*Parser).comments.AddFromToken($$, $4, comment.ForInitSemicolonToken) + yylex.(*Parser).comments.AddFromToken($$, $6, comment.ForCondSemicolonToken) yylex.(*Parser).comments.AddFromToken($$, $8, comment.CloseParenthesisToken) } | T_SWITCH '(' expr ')' switch_case_list