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

Get rid of (yy)rhs and (yy)prhs.

Browse Source 
These tables are no longer needed in the parsers, and they don't seem to
be useful.  They are not documented either.

	* src/output.c (prepare_rules): Get rid of rhs and prhs.
	Adjust the computation of (yy)r2.
This commit is contained in:
Akim Demaille
2008-11-25 21:09:20 +01:00
parent 08c81469c6
commit 3d3bc1fe30
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2008-11-26 Akim Demaille <demaille@gostai.com>
Get rid of (yy)rhs and (yy)prhs.
These tables are no longer needed in the parsers, and they don't seem to
be useful. They are not documented either.
* src/output.c (prepare_rules): Get rid of rhs and prhs.
Adjust the computation of (yy)r2.
2008-11-26 Akim Demaille <demaille@gostai.com> 2008-11-26 Akim Demaille <demaille@gostai.com>
Rule length is unsigned. Rule length is unsigned.

28
src/output.c
View File

@@ -201,38 +201,27 @@ prepare_symbols (void)
} }
/*-------------------------------------------------------------. /*----------------------------------------------------------------.
| Prepare the muscles related to the rules: rhs, prhs, r1, r2, | | Prepare the muscles related to the rules: r1, r2, rline, dprec, |
| rline, dprec, merger. | | merger. |
`-------------------------------------------------------------*/ `----------------------------------------------------------------*/
static void static void
prepare_rules (void) prepare_rules (void)
{ {
rule_number r;
unsigned int i = 0;
item_number *rhs = xnmalloc (nritems, sizeof *rhs);
unsigned int *prhs = xnmalloc (nrules, sizeof *prhs);
unsigned int *rline = xnmalloc (nrules, sizeof *rline); unsigned int *rline = xnmalloc (nrules, sizeof *rline);
symbol_number *r1 = xnmalloc (nrules, sizeof *r1); symbol_number *r1 = xnmalloc (nrules, sizeof *r1);
unsigned int *r2 = xnmalloc (nrules, sizeof *r2); unsigned int *r2 = xnmalloc (nrules, sizeof *r2);
int *dprec = xnmalloc (nrules, sizeof *dprec); int *dprec = xnmalloc (nrules, sizeof *dprec);
int *merger = xnmalloc (nrules, sizeof *merger); int *merger = xnmalloc (nrules, sizeof *merger);
rule_number r;
for (r = 0; r < nrules; ++r) for (r = 0; r < nrules; ++r)
{ {
item_number *rhsp = NULL;
/* Index of rule R in RHS. */
prhs[r] = i;
/* RHS of the rule R. */
for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp)
rhs[i++] = *rhsp;
/* LHS of the rule R. */ /* LHS of the rule R. */
r1[r] = rules[r].lhs->number; r1[r] = rules[r].lhs->number;
/* Length of rule R's RHS. */ /* Length of rule R's RHS. */
r2[r] = i - prhs[r]; r2[r] = rule_rhs_length(&rules[r]);
/* Separator in RHS. */
rhs[i++] = -1;
/* Line where rule was defined. */ /* Line where rule was defined. */
rline[r] = rules[r].location.start.line; rline[r] = rules[r].location.start.line;
/* Dynamic precedence (GLR). */ /* Dynamic precedence (GLR). */
@@ -240,10 +229,7 @@ prepare_rules (void)
/* Merger-function index (GLR). */ /* Merger-function index (GLR). */
merger[r] = rules[r].merger; merger[r] = rules[r].merger;
} }
aver (i == nritems);
muscle_insert_item_number_table ("rhs", rhs, ritem[0], 1, nritems);
muscle_insert_unsigned_int_table ("prhs", prhs, 0, 0, nrules);
muscle_insert_unsigned_int_table ("rline", rline, 0, 0, nrules); muscle_insert_unsigned_int_table ("rline", rline, 0, 0, nrules);
muscle_insert_symbol_number_table ("r1", r1, 0, 0, nrules); muscle_insert_symbol_number_table ("r1", r1, 0, 0, nrules);
muscle_insert_unsigned_int_table ("r2", r2, 0, 0, nrules); muscle_insert_unsigned_int_table ("r2", r2, 0, 0, nrules);
@@ -253,8 +239,6 @@ prepare_rules (void)
MUSCLE_INSERT_INT ("rules_number", nrules); MUSCLE_INSERT_INT ("rules_number", nrules);
MUSCLE_INSERT_INT ("max_left_semantic_context", max_left_semantic_context); MUSCLE_INSERT_INT ("max_left_semantic_context", max_left_semantic_context);
free (rhs);
free (prhs);
free (rline); free (rline);
free (r1); free (r1);
free (r2); free (r2);