* src/reduce.c (reduce_grammar_tables): No longer disable the

removal of useless rules via CPP but via `if (0)', so that the
compiler still check the code is valid.
For instance, it should have noticed `rline' no longer exists: use
the `line' member of rule_t.
* src/gram.c (dummy, rline): Remove, unused.
This commit is contained in:
Akim Demaille
2001-12-05 09:24:35 +00:00
parent 0fc1a97d9f
commit 5844cd0cfa
3 changed files with 52 additions and 39 deletions

View File

@@ -1,3 +1,13 @@
2001-12-05 Akim Demaille <akim@epita.fr>
* src/reduce.c (reduce_grammar_tables): No longer disable the
removal of useless rules via CPP but via `if (0)', so that the
compiler still check the code is valid.
For instance, it should have noticed `rline' no longer exists: use
the `line' member of rule_t.
* src/gram.c (dummy, rline): Remove, unused.
2001-12-05 Akim Demaille <akim@epita.fr>
* src/output.c (pack_vector): Use assert, not berror.

View File

@@ -23,8 +23,6 @@ Boston, MA 02111-1307, USA. */
#include "gram.h"
#include "reader.h"
void dummy PARAMS((void));
/* comments for these variables are in gram.h */
int nitems;
@@ -41,7 +39,6 @@ short *sprec = NULL;
short *rassoc = NULL;
short *sassoc = NULL;
short *token_translations = NULL;
short *rline = NULL;
int start_symbol;

View File

@@ -264,9 +264,17 @@ inaccessable_symbols (void)
static void
reduce_grammar_tables (void)
{
/* This is turned off because we would need to change the numbers
in the case statements in the actions file. */
#if 0
/* This is turned off because we would need to change the numbers in
the case statements in the actions file.
We don't disable it via CPP so that it is still checked with the
rest of the code, to avoid its becoming completely obsolete.
FIXME: I think the comment above demonstrates this code must be
turned off for *semantic* parser, not in the general case. Try
to understand this better --akim. */
if (0)
/* remove useless productions */
if (nuseless_productions > 0)
{
@@ -275,14 +283,13 @@ reduce_grammar_tables (void)
np = 0;
ni = 0;
for (pn = 1; pn <= nrules; pn++)
{
if (BITISSET (P, pn))
{
np++;
if (pn != np)
{
rule_table[np].lhs = rule_table[pn].lhs;
rline[np] = rline[pn];
rule_table[np].line = rule_table[pn].line;
rule_table[np].prec = rule_table[pn].prec;
rule_table[np].assoc = rule_table[pn].assoc;
rule_table[np].rhs = rule_table[pn].rhs;
@@ -300,16 +307,15 @@ reduce_grammar_tables (void)
while (ritem[ni++] >= 0);
}
}
}
ritem[ni] = 0;
nrules -= nuseless_productions;
nitems = ni;
/* Is it worth it to reduce the amount of memory for the
grammar? Probably not. */
}
#endif /* 0 */
/* Disable useless productions. */
if (nuseless_productions > 0)
{