style: rename stmtMerge as stmt_merge

Follow the GNU Coding Style.

* doc/bison.texi, examples/c++/glr/c++-types.yy,
* examples/c/glr/c++-types.y, tests/cxx-type.at: s/stmtMerge/stmt_merge/g.
This commit is contained in:
Akim Demaille
2021-08-29 16:22:16 +02:00
parent a5c55bb758
commit a7ded4284e
4 changed files with 31 additions and 31 deletions

View File

@@ -45,7 +45,7 @@
#include <cstring>
static Node
stmtMerge (const Node& x0, const Node& x1);
stmt_merge (const Node& x0, const Node& x1);
static yy::parser::symbol_type
yylex ();
@@ -74,9 +74,9 @@ prog : %empty
| prog stmt { std::cout << @2 << ": " << $2 << '\n'; }
;
stmt : expr ";" %merge <stmtMerge> { $$ = $1; }
| decl %merge <stmtMerge>
| error ";" { $$ = Nterm ("<error>"); }
stmt : expr ";" %merge <stmt_merge> { $$ = $1; }
| decl %merge <stmt_merge>
| error ";" { $$ = Nterm ("<error>"); }
;
expr : ID
@@ -169,7 +169,7 @@ yylex ()
}
static Node
stmtMerge (const Node& x0, const Node& x1)
stmt_merge (const Node& x0, const Node& x1)
{
return Nterm ("<OR>", x0, x1);
}