X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/401b73afdf9694e0d9380968ebfd21d837045a2c..a17187e56386747a9b4d9633c3d116c2087f2b8b:/src/closure.c diff --git a/src/closure.c b/src/closure.c index 180e1dfc..929aa777 100644 --- a/src/closure.c +++ b/src/closure.c @@ -1,7 +1,7 @@ /* Closures for Bison - Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2007, 2009 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2012 Free + Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -24,7 +24,6 @@ #include #include #include -#include #include "closure.h" #include "derives.h" @@ -62,7 +61,7 @@ print_closure (char const *title, item_number *array, size_t size) item_number *rp; fprintf (stderr, " %2d: .", array[i]); for (rp = &ritem[array[i]]; *rp >= 0; ++rp) - fprintf (stderr, " %s", symbols[*rp]->tag); + fprintf (stderr, " %s", symbols[*rp]->tag); fprintf (stderr, " (rule %d)\n", -*rp - 1); } fputs ("\n\n", stderr); @@ -80,10 +79,10 @@ print_firsts (void) 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, "\t\t%s\n", + symbols[j + ntokens]->tag); + } } fprintf (stderr, "\n\n"); } @@ -101,10 +100,10 @@ print_fderives (void) 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, "\t\t%3d ", r); + rule_rhs_print (&rules[r], stderr); + } } fprintf (stderr, "\n\n"); } @@ -130,9 +129,9 @@ set_firsts (void) for (i = ntokens; i < nsyms; i++) for (j = 0; derives[i - ntokens][j]; ++j) { - item_number sym = derives[i - ntokens][j]->rhs[0]; - if (ISVAR (sym)) - bitset_set (FIRSTS (i), sym - ntokens); + item_number sym = derives[i - ntokens][j]->rhs[0]; + if (ISVAR (sym)) + bitset_set (FIRSTS (i), sym - ntokens); } if (trace_flag & trace_sets) @@ -168,8 +167,8 @@ set_fderives (void) for (i = ntokens; i < nsyms; ++i) for (j = ntokens; j < nsyms; ++j) if (bitset_test (FIRSTS (i), j - ntokens)) - for (k = 0; derives[j - ntokens][k]; ++k) - bitset_set (FDERIVES (i), derives[j - ntokens][k]->number); + for (k = 0; derives[j - ntokens][k]; ++k) + bitset_set (FDERIVES (i), derives[j - ntokens][k]->number); if (trace_flag & trace_sets) print_fderives (); @@ -219,11 +218,11 @@ closure (item_number *core, size_t n) { item_number itemno = rules[ruleno].rhs - ritem; while (c < n && core[c] < itemno) - { - itemset[nitemset] = core[c]; - nitemset++; - c++; - } + { + itemset[nitemset] = core[c]; + nitemset++; + c++; + } itemset[nitemset] = itemno; nitemset++; };