mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 12:23:04 +00:00
Install these changes:
* data/c.m4 (b4_union_name): Leave a default value. * data/glr.c, data/yacc.c: Use it.
This commit is contained in:
@@ -88,7 +88,8 @@ m4_define([b4_identification],
|
||||
|
||||
m4_define_default([b4_epilogue], [])
|
||||
|
||||
|
||||
# If the %union is not named, its name is YYSTYPE.
|
||||
m4_define_default([b4_union_name], [YYSTYPE])
|
||||
|
||||
## ------------------------ ##
|
||||
## Pure/impure interfaces. ##
|
||||
@@ -196,7 +197,7 @@ m4_define([b4_define_flag_if],
|
||||
m4_define([_b4_define_flag_if],
|
||||
[m4_if([$1$2], $[1]$[2], [],
|
||||
[m4_fatal([$0: Invalid arguments: $@])])dnl
|
||||
m4_define([b4_$3_if],
|
||||
m4_define([b4_$3_if],
|
||||
[b4_flag_if([$3], [$1], [$2])])])
|
||||
|
||||
|
||||
|
||||
@@ -173,7 +173,7 @@ m4_define([b4_shared_declarations],
|
||||
|
||||
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
|
||||
]m4_ifdef([b4_stype],
|
||||
[typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])
|
||||
[typedef union b4_union_name
|
||||
b4_stype
|
||||
/* Line __line__ of glr.c. */
|
||||
b4_syncline([@oline@], [@ofile@])
|
||||
|
||||
@@ -185,7 +185,7 @@ b4_locations_if([#define yylloc b4_prefix[]lloc])])[
|
||||
|
||||
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
|
||||
]m4_ifdef([b4_stype],
|
||||
[typedef union[]m4_bregexp(b4_stype, [^{], [ YYSTYPE])
|
||||
[typedef union b4_union_name
|
||||
b4_stype
|
||||
/* Line __line__ of yacc.c. */
|
||||
b4_syncline([@oline@], [@ofile@])
|
||||
@@ -1495,7 +1495,7 @@ b4_token_enums_defines(b4_tokens)
|
||||
|
||||
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
|
||||
m4_ifdef([b4_stype],
|
||||
[typedef union[]m4_bregexp(b4_stype, [^{], [ YYSTYPE])
|
||||
[typedef union b4_union_name
|
||||
b4_stype
|
||||
/* Line __line__ of yacc.c. */
|
||||
b4_syncline([@oline@], [@ofile@])
|
||||
|
||||
Reference in New Issue
Block a user