X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/62a3e4f0c54505834cb89c40726771ad32aabb27..cb48f1919ce8ccbd8587556c165a8b8b0d78d80f:/src/closure.c diff --git a/src/closure.c b/src/closure.c index 738ecaa8..001b8316 100644 --- a/src/closure.c +++ b/src/closure.c @@ -1,5 +1,7 @@ -/* Subroutines for bison - Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc. +/* Closures for Bison + + Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005 Free + Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -15,23 +17,27 @@ You should have received a copy of the GNU General Public License along with Bison; see the file COPYING. If not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ +#include #include "system.h" -#include "quotearg.h" -#include "bitset.h" -#include "bitsetv.h" + +#include +#include +#include +#include + +#include "closure.h" +#include "derives.h" #include "getargs.h" -#include "symtab.h" #include "gram.h" #include "reader.h" -#include "closure.h" -#include "derives.h" +#include "symtab.h" /* NITEMSET is the size of the array ITEMSET. */ -item_number_t *itemset; -int nritemset; +item_number *itemset; +size_t nritemset; static bitset ruleset; @@ -49,17 +55,16 @@ static bitsetv firsts = NULL; `-----------------*/ static void -print_closure (const char *title, item_number_t *array, size_t size) +print_closure (char const *title, item_number *array, size_t size) { size_t i; fprintf (stderr, "Closure: %s\n", title); for (i = 0; i < size; ++i) { - item_number_t *rp; + item_number *rp; fprintf (stderr, " %2d: .", array[i]); for (rp = &ritem[array[i]]; *rp >= 0; ++rp) - fprintf (stderr, " %s", - quotearg_style (escape_quoting_style, symbols[*rp]->tag)); + fprintf (stderr, " %s", symbols[*rp]->tag); fprintf (stderr, " (rule %d)\n", -*rp - 1); } fputs ("\n\n", stderr); @@ -69,19 +74,18 @@ print_closure (const char *title, item_number_t *array, size_t size) static void print_firsts (void) { - int i, j; + symbol_number i, j; fprintf (stderr, "FIRSTS\n"); for (i = ntokens; i < nsyms; i++) { - fprintf (stderr, "\t%s firsts\n", - quotearg_style (escape_quoting_style, symbols[i]->tag)); - for (j = 0; j < nvars; j++) - if (bitset_test (FIRSTS (i), j)) - fprintf (stderr, "\t\t%d (%s)\n", - j + ntokens, - quotearg_style (escape_quoting_style, - symbols[j + ntokens]->tag)); + bitset_iterator iter; + fprintf (stderr, "\t%s firsts\n", symbols[i]->tag); + BITSET_FOR_EACH (iter, FIRSTS (i), j, 0) + { + fprintf (stderr, "\t\t%s\n", + symbols[j + ntokens]->tag); + } } fprintf (stderr, "\n\n"); } @@ -90,75 +94,22 @@ print_firsts (void) static void print_fderives (void) { - int i, j; + int i; + rule_number r; fprintf (stderr, "FDERIVES\n"); for (i = ntokens; i < nsyms; i++) { - fprintf (stderr, "\t%s derives\n", - quotearg_style (escape_quoting_style, symbols[i]->tag)); - for (j = 0; j < nrules + 1; j++) - if (bitset_test (FDERIVES (i), j)) - { - item_number_t *rhsp; - fprintf (stderr, "\t\t%d:", j - 1); - for (rhsp = rules[j].rhs; *rhsp >= 0; ++rhsp) - fprintf (stderr, " %s", - quotearg_style (escape_quoting_style, - symbols[*rhsp]->tag)); - fputc ('\n', stderr); - } + bitset_iterator iter; + fprintf (stderr, "\t%s derives\n", symbols[i]->tag); + BITSET_FOR_EACH (iter, FDERIVES (i), r, 0) + { + fprintf (stderr, "\t\t%3d ", r); + rule_rhs_print (&rules[r], 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); -} /*------------------------------------------------------------------. | Set FIRSTS to be an NVARS array of NVARS bitsets indicating which | @@ -174,25 +125,25 @@ bitmatrix_print (const char *title, bitsetv matrix) static void set_firsts (void) { - int i, j; + symbol_number i, j; firsts = bitsetv_create (nvars, nvars, BITSET_FIXED); for (i = ntokens; i < nsyms; i++) - for (j = 0; derives[i][j] >= 0; ++j) + for (j = 0; derives[i - ntokens][j]; ++j) { - int symbol = rules[derives[i][j]].rhs[0]; - if (ISVAR (symbol)) - bitset_set (FIRSTS (i), symbol - ntokens); + item_number sym = derives[i - ntokens][j]->rhs[0]; + if (ISVAR (sym)) + bitset_set (FIRSTS (i), sym - ntokens); } - if (trace_flag) - bitmatrix_print ("RTC: Input", firsts); + if (trace_flag & trace_sets) + bitsetv_matrix_dump (stderr, "RTC: Firsts Input", firsts); bitsetv_reflexive_transitive_closure (firsts); - if (trace_flag) - bitmatrix_print ("RTC: Output", firsts); + if (trace_flag & trace_sets) + bitsetv_matrix_dump (stderr, "RTC: Firsts Output", firsts); - if (trace_flag) + if (trace_flag & trace_sets) print_firsts (); } @@ -209,31 +160,33 @@ set_firsts (void) static void set_fderives (void) { - int i, j, k; + symbol_number i, j; + rule_number k; - fderives = bitsetv_create (nvars, nrules + 1, BITSET_FIXED); + fderives = bitsetv_create (nvars, nrules, BITSET_FIXED); set_firsts (); for (i = ntokens; i < nsyms; ++i) for (j = ntokens; j < nsyms; ++j) if (bitset_test (FIRSTS (i), j - ntokens)) - for (k = 0; derives[j][k] > 0; ++k) - bitset_set (FDERIVES (i), derives[j][k]); + for (k = 0; derives[j - ntokens][k]; ++k) + bitset_set (FDERIVES (i), derives[j - ntokens][k]->number); - if (trace_flag) + if (trace_flag & trace_sets) print_fderives (); bitsetv_free (firsts); } + void -new_closure (int n) +new_closure (unsigned int n) { - itemset = XCALLOC (item_number_t, n); + itemset = xnmalloc (n, sizeof *itemset); - ruleset = bitset_create (nrules + 1, BITSET_FIXED); + ruleset = bitset_create (nrules, BITSET_FIXED); set_fderives (); } @@ -241,15 +194,17 @@ new_closure (int n) void -closure (item_number_t *core, int n) +closure (item_number *core, size_t n) { /* Index over CORE. */ - int c; + size_t c; /* A bit index over RULESET. */ - int ruleno; + rule_number ruleno; + + bitset_iterator iter; - if (trace_flag) + if (trace_flag & trace_sets) print_closure ("input", core, n); bitset_zero (ruleset); @@ -260,19 +215,18 @@ closure (item_number_t *core, int n) nritemset = 0; c = 0; - for (ruleno = 0; ruleno < nrules + 1; ++ruleno) - if (bitset_test (ruleset, ruleno)) - { - item_number_t itemno = rules[ruleno].rhs - ritem; - while (c < n && core[c] < itemno) - { - itemset[nritemset] = core[c]; - nritemset++; - c++; - } - itemset[nritemset] = itemno; - nritemset++; - } + BITSET_FOR_EACH (iter, ruleset, ruleno, 0) + { + item_number itemno = rules[ruleno].rhs - ritem; + while (c < n && core[c] < itemno) + { + itemset[nritemset] = core[c]; + nritemset++; + c++; + } + itemset[nritemset] = itemno; + nritemset++; + }; while (c < n) { @@ -281,7 +235,7 @@ closure (item_number_t *core, int n) c++; } - if (trace_flag) + if (trace_flag & trace_sets) print_closure ("output", itemset, nritemset); } @@ -289,7 +243,7 @@ closure (item_number_t *core, int n) void free_closure (void) { - XFREE (itemset); + free (itemset); bitset_free (ruleset); bitsetv_free (fderives); }