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

%merge: delegate the generation of calls to mergers to m4

Browse Source 
Don't generate C code from bison, leave that to the skeletons.

* src/output.c (merger_output): Emit invocations to b4_call_merger.
* data/skeletons/glr.c, data/skeletons/glr2.cc (b4_call_merger): New.
This commit is contained in:
Akim Demaille
2020-12-30 09:10:05 +01:00
parent ac3d5b76f7
commit c09f2e4c7b
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data/skeletons/glr.c
View File

@@ -1,4 +1,4 @@
-*- C -*-
# -*- C -*-
# GLR skeleton for Bison
@@ -147,6 +147,15 @@ m4_define([b4_rhs_location],
[(b4_rhs_data([$1], [$2]).yyloc)])
# b4_call_merger(MERGER-NUM, MERGER-NAME, SYMBOL-SUM)
# ---------------------------------------------------
m4_define([b4_call_merger],
[b4_case([$1],
[ b4_symbol_if([$3], [has_type],
[yy0->b4_symbol($3, type) = $2 (*yy0, *yy1);],
[*yy0 = $2 (*yy0, *yy1);])])])
## -------------- ##
## Declarations. ##
## -------------- ##

8
data/skeletons/glr2.cc
View File

@@ -122,6 +122,14 @@ m4_define([b4_rhs_location],
[(b4_rhs_data([$1], [$2]).yyloc)])
# b4_call_merger(MERGER-NUM, MERGER-NAME, SYMBOL-SUM)
# ---------------------------------------------------
m4_define([b4_call_merger],
[b4_case([$1],
[ b4_symbol_if([$3], [has_type],
[yy0->b4_symbol($3, type) = $2 (*yy0, *yy1);],
[*yy0 = $2 (*yy0, *yy1);])])])
# b4_lex
# ------
# Call yylex.

8
src/output.c
View File

@@ -554,12 +554,8 @@ merger_output (FILE *out)
int n;
merger_list* p;
for (n = 1, p = merge_functions; p != NULL; n += 1, p = p->next)
if (p->sym && p->sym->content->type_name)
fprintf (out, " case %d: yy0->%s = %s (*yy0, *yy1); break;\n",
n, p->sym->content->type_name, p->name);
else
fprintf (out, " case %d: *yy0 = %s (*yy0, *yy1); break;\n",
n, p->name);
fprintf (out, "]b4_call_merger([%d], [%s], [%d])[\n",
n, p->name, p->sym->content->number);
fputs ("]])\n\n", out);
}