02111-1307, USA. */
#include "system.h"
+#include "quotearg.h"
#include "bitset.h"
#include "bitsetv.h"
+#include "bitsetv-print.h"
#include "getargs.h"
#include "symtab.h"
#include "gram.h"
#include "derives.h"
/* NITEMSET is the size of the array ITEMSET. */
-short *itemset;
-int nitemset;
+item_number_t *itemset;
+int nritemset;
static bitset ruleset;
`-----------------*/
static void
-print_closure (const char *title, short *array, size_t size)
+print_closure (const char *title, item_number_t *array, size_t size)
{
size_t i;
fprintf (stderr, "Closure: %s\n", title);
for (i = 0; i < size; ++i)
{
- short *rp;
+ item_number_t *rp;
fprintf (stderr, " %2d: .", array[i]);
for (rp = &ritem[array[i]]; *rp >= 0; ++rp)
- fprintf (stderr, " %s", symbols[*rp]->tag);
+ fprintf (stderr, " %s", symbol_tag_get (symbols[*rp]));
fprintf (stderr, " (rule %d)\n", -*rp - 1);
}
fputs ("\n\n", stderr);
fprintf (stderr, "FIRSTS\n");
for (i = ntokens; i < nsyms; i++)
{
- fprintf (stderr, "\t%s firsts\n", symbols[i]->tag);
+ fprintf (stderr, "\t%s firsts\n", symbol_tag_get (symbols[i]));
for (j = 0; j < nvars; j++)
if (bitset_test (FIRSTS (i), j))
- fprintf (stderr, "\t\t%d (%s)\n",
- j + ntokens, symbols[j + ntokens]->tag);
+ fprintf (stderr, "\t\t%s\n",
+ symbol_tag_get (symbols[j + ntokens]));
}
fprintf (stderr, "\n\n");
}
fprintf (stderr, "FDERIVES\n");
for (i = ntokens; i < nsyms; i++)
{
- fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
+ fprintf (stderr, "\t%s derives\n", symbol_tag_get (symbols[i]));
for (j = 0; j < nrules + 1; j++)
if (bitset_test (FDERIVES (i), j))
{
- short *rhsp;
+ item_number_t *rhsp;
fprintf (stderr, "\t\t%d:", j - 1);
for (rhsp = rules[j].rhs; *rhsp >= 0; ++rhsp)
- fprintf (stderr, " %s", symbols[*rhsp]->tag);
+ fprintf (stderr, " %s", symbol_tag_get (symbols[*rhsp]));
fputc ('\n', stderr);
}
}
fprintf (stderr, "\n\n");
}
-
-/*--------------------------------------------------------.
-| Display the MATRIX array of SIZE bitsets of size SIZE. |
-`--------------------------------------------------------*/
-
-static void
-bitmatrix_print (const char *title, bitsetv matrix)
-{
- size_t i, j;
- size_t size = bitset_size (matrix[0]);
-
- /* Title. */
- fprintf (stderr, "%s BEGIN\n", title);
-
- /* Column numbers. */
- fputs (" ", stderr);
- for (i = 0; i < size; ++i)
- putc (i / 10 ? '0' + i / 10 : ' ', stderr);
- putc ('\n', stderr);
- fputs (" ", stderr);
- for (i = 0; i < size; ++i)
- fprintf (stderr, "%d", i % 10);
- putc ('\n', stderr);
-
- /* Bar. */
- fputs (" .", stderr);
- for (i = 0; i < size; ++i)
- putc ('-', stderr);
- fputs (".\n", stderr);
-
- /* Contents. */
- for (i = 0; i < size; ++i)
- {
- fprintf (stderr, "%2d|", i);
- for (j = 0; j < size; ++j)
- fputs (bitset_test (matrix[i], j) ? "1" : " ", stderr);
- fputs ("|\n", stderr);
- }
-
- /* Bar. */
- fputs (" `", stderr);
- for (i = 0; i < size; ++i)
- putc ('-', stderr);
- fputs ("'\n", stderr);
-
- /* End title. */
- fprintf (stderr, "%s END\n\n", title);
-}
\f
/*------------------------------------------------------------------.
| Set FIRSTS to be an NVARS array of NVARS bitsets indicating which |
}
if (trace_flag)
- bitmatrix_print ("RTC: Input", firsts);
+ bitsetv_matrix_dump (stderr, "RTC: Firsts Input", firsts);
bitsetv_reflexive_transitive_closure (firsts);
if (trace_flag)
- bitmatrix_print ("RTC: Output", firsts);
+ bitsetv_matrix_dump (stderr, "RTC: Firsts Output", firsts);
if (trace_flag)
print_firsts ();
bitsetv_free (firsts);
}
+
\f
void
new_closure (int n)
{
- itemset = XCALLOC (short, n);
+ itemset = XCALLOC (item_number_t, n);
ruleset = bitset_create (nrules + 1, BITSET_FIXED);
void
-closure (short *core, int n)
+closure (item_number_t *core, int n)
{
/* Index over CORE. */
int c;
if (ISVAR (ritem[core[c]]))
bitset_or (ruleset, ruleset, FDERIVES (ritem[core[c]]));
- nitemset = 0;
+ nritemset = 0;
c = 0;
for (ruleno = 0; ruleno < nrules + 1; ++ruleno)
if (bitset_test (ruleset, ruleno))
{
- int itemno = rules[ruleno].rhs - ritem;
+ item_number_t itemno = rules[ruleno].rhs - ritem;
while (c < n && core[c] < itemno)
{
- itemset[nitemset] = core[c];
- nitemset++;
+ itemset[nritemset] = core[c];
+ nritemset++;
c++;
}
- itemset[nitemset] = itemno;
- nitemset++;
+ itemset[nritemset] = itemno;
+ nritemset++;
}
while (c < n)
{
- itemset[nitemset] = core[c];
- nitemset++;
+ itemset[nritemset] = core[c];
+ nritemset++;
c++;
}
if (trace_flag)
- print_closure ("output", itemset, nitemset);
+ print_closure ("output", itemset, nritemset);
}