+2001-12-05 Akim Demaille <akim@epita.fr>
+
+ * src/gram.c, src/gram.h (ritem_print): New.
+ * src/gram.c (dummy): Remove, now there is actual code in gram.c.
+ (This useless function was defined only to work around VMS linkers
+ that can't handle compilation units with variables only).
+ * src/reduce.c (dump_grammar): Use it to trace the construction of
+ ritem.
+
2001-12-04 Paul Eggert <eggert@twinsun.com>
* src/bison.simple (union yyalloc): Change member names
#include "system.h"
#include "gram.h"
+#include "reader.h"
void dummy PARAMS((void));
int error_token_number;
-/* This is to avoid linker problems which occur on VMS when using GCC,
- when the file in question contains data definitions only. */
-
void
-dummy (void)
+ritem_print (FILE *out)
{
+ int i;
+ fputs ("RITEM\n", out);
+ for (i = 0; ritem[i]; ++i)
+ if (ritem[i] > 0)
+ fprintf (out, " %s", tags[ritem[i]]);
+ else
+ fprintf (out, " (rule %d)\n", -ritem[i]);
+ fputs ("\n\n", out);
}
fprintf (out, "%5d %5d %5d %s\n", i, sprec[i], sassoc[i], tags[i]);
fprintf (out, "\n\n");
fprintf (out, "Rules\n-----\n\n");
- fprintf (out, "Num (Prec, Assoc) Lhs : (@Rhs) Ritems [Num?]\n");
+ fprintf (out, "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n");
for (i = 1; i <= nrules; i++)
{
- fprintf (out, "%-5d(%5d%5d)%5d : (@%-5d)",
+ int rhs_count = 0;
+ /* Find the last RHS index in ritems. */
+ for (r = &ritem[rule_table[i].rhs]; *r > 0; ++r)
+ ++rhs_count;
+ fprintf (out, "%3d (%2d, %2d, %2d, %2d-%2d) %2d ->",
i,
- rule_table[i].prec,
- rule_table[i].assoc,
- rule_table[i].lhs,
- rule_table[i].rhs);
+ rule_table[i].prec, rule_table[i].assoc, rule_table[i].useful,
+ rule_table[i].rhs, rule_table[i].rhs + rhs_count - 1,
+ rule_table[i].lhs);
+ /* Dumped the RHS. */
for (r = &ritem[rule_table[i].rhs]; *r > 0; r++)
- fprintf (out, "%5d", *r);
- fprintf (out, " [%d]\n", -(*r));
+ fprintf (out, "%3d", *r);
+ fprintf (out, " [%d]\n", -(*r));
}
fprintf (out, "\n\n");
fprintf (out, "Rules interpreted\n-----------------\n\n");