diff options
| author | Akim Demaille <akim.demaille@gmail.com> | 2020-12-31 07:20:49 +0100 |
|---|---|---|
| committer | Akim Demaille <akim.demaille@gmail.com> | 2021-01-23 15:02:49 +0100 |
| commit | 1bac4ecc44f6b7a20b4688b2cb9eeecc91bdb503 (patch) | |
| tree | ee626d7f4880f8e11174a8c1e2a87b318577f644 | |
| parent | 84b00b6bf0e1813f674e16ab3c349e9d7d71904c (diff) | |
| download | bison-1bac4ecc44f6b7a20b4688b2cb9eeecc91bdb503.tar.gz | |
%merge: fix compatibility with api.value.type=union
Reported by Jot Dot.
https://lists.gnu.org/r/help-bison/2020-12/msg00014.html
* data/skeletons/glr.c, data/skeletons/glr2.cc (b4_call_merger): Use
the symbol's slot, not its type.
* examples/c/glr/c++-types.y: Use explicit per-symbol typing together
with api.value.type=union.
(yylex): Use yytoken_kind_t.
| -rw-r--r-- | data/skeletons/glr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/skeletons/glr.c b/data/skeletons/glr.c index 1ef948cd..b392dd72 100644 --- a/data/skeletons/glr.c +++ b/data/skeletons/glr.c @@ -150,7 +150,7 @@ m4_define([b4_rhs_location], m4_define([b4_call_merger], [b4_case([$1], [ b4_symbol_if([$3], [has_type], - [yy0->b4_symbol($3, type) = $2 (*yy0, *yy1);], + [yy0->b4_symbol($3, slot) = $2 (*yy0, *yy1);], [*yy0 = $2 (*yy0, *yy1);])])]) |