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

lalr1.cc: don't generate location.hh when location_type is defined

Browse Source 
* data/bison.m4 (b4_percent_define_get): Accept a default value.
	* data/c++.m4: Do not provide a default value for the %define
	variable location_type, rather, use b4_percent_define_get with a
	default argument where its value is needed.
	* data/lalr1.cc: Do not load location.cc (which outputs both
	location.hh and position.hh) if the user defined location_type.
	Do not include location.hh either.
This commit is contained in:
Akim Demaille
2010-04-14 17:56:38 +02:00
parent 19ad326be4
commit 7789b6e3e7
4 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/c++.m4
View File

@@ -24,7 +24,12 @@ m4_include(b4_pkgdatadir/[c.m4])
## ---------------- ##
b4_percent_define_default([[parser_class_name]], [[parser]])
b4_percent_define_default([[location_type]], [[location]])
# Don't do that so that we remember whether we're using a user
# request, or the default value.
#
# b4_percent_define_default([[location_type]], [[location_type]])
b4_percent_define_default([[filename_type]], [[std::string]])
b4_percent_define_default([[api.namespace]], m4_defn([b4_prefix]))
@@ -123,7 +128,8 @@ m4_define([b4_public_types_declare],
typedef YYSTYPE semantic_type;
#endif]b4_locations_if([
/// Symbol locations.
typedef b4_percent_define_get([[location_type]]) location_type;])[
typedef b4_percent_define_get([[location_type]],
[[location]]) location_type;])[
/// Syntax errors thrown from user actions.
struct syntax_error : std::runtime_error