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

glr2.cc: remove remains from glr.cc

Browse Source 
* data/skeletons/glr2.cc: We no longer play dirty tricks with
parse-params, remove the now useless dance around them.
We now have genuine objects for locations, leave the initial action
alone.
This commit is contained in:
Akim Demaille
2021-01-10 21:30:34 +01:00
parent 6833b1be47
commit 983364d76a
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
data/skeletons/glr2.cc
View File

@@ -36,14 +36,6 @@ b4_variant_if([m4_include(b4_skeletonsdir/[variant.hh])])
m4_define([b4_parser_class], m4_define([b4_parser_class],
[b4_percent_define_get([[api.parser.class]])]) [b4_percent_define_get([[api.parser.class]])])
# Save the parse parameters.
m4_define([b4_parse_param_orig], m4_defn([b4_parse_param]))
# Hijack the initial action to initialize the locations.
]b4_bison_locations_if([m4_define([b4_initial_action],
[yystack.yylloc.initialize ();]m4_ifdef([b4_initial_action], [
m4_defn([b4_initial_action])]))])[
]m4_define([b4_define_symbol_kind], ]m4_define([b4_define_symbol_kind],
[m4_format([#define %-15s %s], [m4_format([#define %-15s %s],
b4_symbol($][1, kind_base), b4_symbol($][1, kind_base),
@@ -173,8 +165,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))])])
# Declaration that might either go into the header (if --header, $1 = hh) # Declaration that might either go into the header (if --header, $1 = hh)
# or in the implementation file. # or in the implementation file.
m4_define([b4_shared_declarations], m4_define([b4_shared_declarations],
[m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl [b4_percent_code_get([[requires]])[
b4_percent_code_get([[requires]])[
#include <algorithm> #include <algorithm>
#include <cstddef> // ptrdiff_t #include <cstddef> // ptrdiff_t
#include <cstring> // memcpy #include <cstring> // memcpy
@@ -391,8 +382,7 @@ const std::ptrdiff_t strong_index_alias<T>::INVALID_INDEX =
]b4_namespace_close[ ]b4_namespace_close[
]b4_percent_code_get([[provides]])[ ]b4_percent_code_get([[provides]])[
]m4_popdef([b4_parse_param])dnl ]])[
])[
## -------------- ## ## -------------- ##
@@ -3067,9 +3057,7 @@ static void yypdumpstack (const glr_stack& yystack)
#endif #endif
]b4_namespace_open[ ]b4_namespace_open[
]dnl In this section, the parse params are the original parse_params. /// Build a parser object.
m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
[ /// Build a parser object.
]b4_parser_class::b4_parser_class[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [ ]b4_parser_class::b4_parser_class[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [
:])[ :])[
#if ]b4_api_PREFIX[DEBUG #if ]b4_api_PREFIX[DEBUG
@@ -3438,10 +3426,7 @@ b4_dollar_popdef])[]dnl
#endif // ]b4_api_PREFIX[DEBUG #endif // ]b4_api_PREFIX[DEBUG
]b4_token_ctor_if([], [b4_yytranslate_define([cc])])[ ]b4_token_ctor_if([], [b4_yytranslate_define([cc])])[
]m4_popdef([b4_parse_param])dnl ]b4_namespace_close[]dnl
b4_namespace_close[]dnl
b4_epilogue[]dnl b4_epilogue[]dnl
b4_output_end b4_output_end
m4_popdef([b4_parse_param])