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

c++: make stack.hh completely useless

Browse Source 
Let's completely deprecate stack.hh.  Don't provide a means to give it
a new name, allow only its removal.

See https://lists.gnu.org/archive/html/bison-patches/2018-09/msg00151.html
and https://lists.gnu.org/archive/html/bison-patches/2018-09/msg00182.html.

* data/stack.hh: Reduce stack.hh to a simple comment explaining how to
get rid of it.
* data/lalr1.cc: Adjust
* tests/input.at (%define file variables): Adjust.
* tests/output.at: Remove cases where stack.hh was removed.
This commit is contained in:
Akim Demaille
2018-10-02 07:01:13 +02:00
parent 667588ee8a
commit 29b1da4e18
5 changed files with 17 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/lalr1.cc
View File

@@ -163,8 +163,6 @@ m4_define([b4_shared_declarations],
# include <vector>
]b4_cxx_portability[
]m4_ifdef([b4_stack_file],
[[# include "]b4_stack_file["]])[
]m4_ifdef([b4_position_file],
[[# include "]b4_position_file["]])[
]m4_ifdef([b4_location_file],
@@ -178,7 +176,7 @@ m4_define([b4_shared_declarations],
]b4_namespace_open[
]m4_ifndef([b4_stack_file], [b4_stack_define])[
]b4_stack_define[
]b4_bison_locations_if([m4_ifndef([b4_location_file],
[m4_ifndef([b4_position_file], [b4_position_define

35
data/stack.hh
View File

@@ -15,15 +15,14 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
m4_pushdef([b4_copyright_years],
[2002-2015, 2018])
# b4_stack_file
# -------------
# Name of the file containing the stack class, if we want this file.
b4_percent_define_check_file([b4_stack_file],
[[api.stack.file]],
b4_defines_if([[stack.hh]]))
b4_percent_define_ifdef([[api.stack.file]],
[b4_percent_define_check_values([[[[api.stack.file]],
[[none]]]])],
[b4_defines_if([m4_define([b4_stack_file], [stack.hh])])])
# b4_stack_define
@@ -140,25 +139,13 @@ m4_define([b4_stack_define],
m4_ifdef([b4_stack_file],
[b4_output_begin([b4_dir_prefix[]b4_stack_file])[
]b4_copyright([Stack handling for Bison parsers in C++])[
// Starting with Bison 3.2, this file is useless: the structure it
// used to define is now defined with the parser itself.
//
// To get rid of this file:
// 1. add '%define api.stack.file none' to your grammar file
// 2. add 'require "3.2"' to your grammar file
// 3. remove references to this file from your build system.
/**
** \file ]b4_dir_prefix[]b4_stack_file[
** Define the ]b4_namespace_ref[::stack class.
*/
]b4_cpp_guard_open([b4_dir_prefix[]b4_stack_file])[
# include <vector>
]b4_cxx_portability[
]b4_namespace_open[
]b4_stack_define[
]b4_namespace_close[
]b4_cpp_guard_close([b4_dir_prefix[]b4_stack_file])[
]b4_output_end[
]])
m4_popdef([b4_copyright_years])