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

skeletons: b4_args -> b4_join to prepare forthcoming changes

Browse Source 
* data/bison.m4 (b4_args, _b4_args): Rename as...
(b4_join, _b4_join): these.
* data/c++.m4, data/lalr1.cc, data/variant.hh: Adjust.
This commit is contained in:
Akim Demaille
2012-08-02 14:24:15 +02:00
parent 86027be930
commit 710c4a6571
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
data/lalr1.cc
View File

@@ -269,7 +269,7 @@ b4_location_define])])])[
inline stack_symbol_type ();
/// Constructor.
inline stack_symbol_type (]b4_args([state_type s],
inline stack_symbol_type (]b4_join([state_type s],
[const semantic_type& v],
b4_locations_if([const location_type& l]))[);
@@ -509,7 +509,7 @@ m4_if(b4_prefix, [yy], [],
{
}
]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (]b4_args(
]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (]b4_join(
[state_type s],
[const semantic_type& v],
b4_locations_if([const location_type& l]))[)
@@ -575,13 +575,13 @@ m4_if(b4_prefix, [yy], [],
if (m)
YY_SYMBOL_PRINT (m, sym);
]b4_variant_if(
[[ yystack_.push (stack_symbol_type (]b4_args(
[[ yystack_.push (stack_symbol_type (]b4_join(
[s],
[semantic_type()],
b4_locations_if([sym.location]))[));
]b4_symbol_variant([[yystos_[s]]], [[yystack_[0].value]],
[build], [sym.value])],
[[ yystack_.push (stack_symbol_type (]b4_args(
[[ yystack_.push (stack_symbol_type (]b4_join(
[s],
[sym.value],
b4_locations_if([sym.location]))[));]])[
@@ -593,7 +593,7 @@ m4_if(b4_prefix, [yy], [],
if (m)
YY_SYMBOL_PRINT (m, s);
]b4_variant_if(
[[ yystack_.push (stack_symbol_type (]b4_args(
[[ yystack_.push (stack_symbol_type (]b4_join(
[s.state],
[semantic_type()],
b4_locations_if([s.location]))[));
@@ -852,7 +852,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
if (!yyerrstatus_)
{
++yynerrs_;
error (]b4_args(b4_locations_if([yyla.location]),
error (]b4_join(b4_locations_if([yyla.location]),
[[yysyntax_error_ (yystack_[0].state,
yyempty ? yyempty_ : yyla.type)]])[);
}
@@ -967,7 +967,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
void
]b4_parser_class_name[::error (const syntax_error& yyexc)
{
error (]b4_args(b4_locations_if([yyexc.location]),
error (]b4_join(b4_locations_if([yyexc.location]),
[[yyexc.what()]])[);
}