X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/97650f4efc420eb5eb0af124f28987875e10428a..b09a18c50d221b54e6bc94e03deb65ecd52c4288:/src/closure.c diff --git a/src/closure.c b/src/closure.c index 689326de..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,24 +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 "bitsetv-print.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; @@ -50,13 +55,13 @@ 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", symbols[*rp]->tag); @@ -69,17 +74,18 @@ print_closure (const char *title, item_number_t *array, size_t size) static void print_firsts (void) { - symbol_number_t i, j; + symbol_number i, j; fprintf (stderr, "FIRSTS\n"); for (i = ntokens; i < nsyms; i++) { + bitset_iterator iter; fprintf (stderr, "\t%s firsts\n", symbols[i]->tag); - BITSET_EXECUTE (FIRSTS (i), 0, j, - { - fprintf (stderr, "\t\t%s\n", - symbols[j + ntokens]->tag); - }); + BITSET_FOR_EACH (iter, FIRSTS (i), j, 0) + { + fprintf (stderr, "\t\t%s\n", + symbols[j + ntokens]->tag); + } } fprintf (stderr, "\n\n"); } @@ -89,20 +95,18 @@ static void print_fderives (void) { int i; - rule_number_t r; + rule_number r; fprintf (stderr, "FDERIVES\n"); for (i = ntokens; i < nsyms; i++) { + bitset_iterator iter; fprintf (stderr, "\t%s derives\n", symbols[i]->tag); - BITSET_EXECUTE (FDERIVES (i), 0, r, - { - item_number_t *rhsp = NULL; - fprintf (stderr, "\t\t%d:", r - 1); - for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp) - fprintf (stderr, " %s", symbols[*rhsp]->tag); - fputc ('\n', stderr); - }); + BITSET_FOR_EACH (iter, FDERIVES (i), r, 0) + { + fprintf (stderr, "\t\t%3d ", r); + rule_rhs_print (&rules[r], stderr); + } } fprintf (stderr, "\n\n"); } @@ -121,25 +125,25 @@ print_fderives (void) static void set_firsts (void) { - symbol_number_t 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) + if (trace_flag & trace_sets) bitsetv_matrix_dump (stderr, "RTC: Firsts Input", firsts); bitsetv_reflexive_transitive_closure (firsts); - if (trace_flag) + if (trace_flag & trace_sets) bitsetv_matrix_dump (stderr, "RTC: Firsts Output", firsts); - if (trace_flag) + if (trace_flag & trace_sets) print_firsts (); } @@ -156,20 +160,20 @@ set_firsts (void) static void set_fderives (void) { - symbol_number_t i, j; - rule_number_t 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); @@ -178,11 +182,11 @@ set_fderives (void) 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 (); } @@ -190,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. */ - rule_number_t ruleno; + rule_number ruleno; + + bitset_iterator iter; - if (trace_flag) + if (trace_flag & trace_sets) print_closure ("input", core, n); bitset_zero (ruleset); @@ -209,18 +215,18 @@ closure (item_number_t *core, int n) nritemset = 0; c = 0; - BITSET_EXECUTE (ruleset, 0, 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) { @@ -229,7 +235,7 @@ closure (item_number_t *core, int n) c++; } - if (trace_flag) + if (trace_flag & trace_sets) print_closure ("output", itemset, nritemset); } @@ -237,7 +243,7 @@ closure (item_number_t *core, int n) void free_closure (void) { - XFREE (itemset); + free (itemset); bitset_free (ruleset); bitsetv_free (fderives); }