Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: rename stmtMerge as stmt_merge

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/c++/glr/c++-types.yy
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);
}

16
examples/c/glr/c++-types.y
View File

@@ -66,7 +66,7 @@
static void free_node (Node *);
static char *node_to_string (const Node *);
static void node_print (FILE *, const Node *);
static Node *stmtMerge (YYSTYPE x0, YYSTYPE x1);
static Node *stmt_merge (YYSTYPE x0, YYSTYPE x1);
static void yyerror (YYLTYPE const * const loc, const char *msg);
static yytoken_kind_t yylex (YYSTYPE *lval, YYLTYPE *lloc);
@@ -83,9 +83,9 @@
%glr-parser
%type <Node*> stmt expr decl declarator TYPENAME ID
%destructor { free_node ($$); } <Node*>
%printer { node_print (yyo, $$); } <Node*>
%type <Node *> stmt expr decl declarator TYPENAME ID
%destructor { free_node ($$); } <Node *>
%printer { node_print (yyo, $$); } <Node *>
%%
@@ -100,8 +100,8 @@ prog : %empty
}
;
stmt : expr ';' %merge <stmtMerge> { $$ = $1; }
| decl %merge <stmtMerge>
stmt : expr ';' %merge <stmt_merge> { $$ = $1; }
| decl %merge <stmt_merge>
| error ';' { $$ = new_nterm ("<error>", NULL, NULL, NULL); }
;
@@ -290,8 +290,8 @@ node_print (FILE *out, const Node *n)
}
static Node*
stmtMerge (YYSTYPE x0, YYSTYPE x1)
static Node *
stmt_merge (YYSTYPE x0, YYSTYPE x1)
{
return new_nterm ("<OR>(%s, %s)", x0.stmt, x1.stmt, NULL);
}