X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/6ce2d93a9b49afbc196e764923d539bc0caa1120..0fe9720964da510a2b359af390a3053aace65f9f:/src/closure.c?ds=inline diff --git a/src/closure.c b/src/closure.c index a6cc784a..4719c419 100644 --- a/src/closure.c +++ b/src/closure.c @@ -1,24 +1,22 @@ /* Closures for Bison - Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2007 Free + 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. - Bison is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Bison is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. 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., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include #include "system.h" @@ -26,7 +24,6 @@ #include #include #include -#include #include "closure.h" #include "derives.h" @@ -47,7 +44,7 @@ static bitsetv firsts = NULL; /* Retrieve the FDERIVES/FIRSTS sets of the nonterminals numbered Var. */ #define FDERIVES(Var) fderives[(Var) - ntokens] -#define FIRSTS(Var) firsts[(Var) - ntokens] +#define FIRSTS(Var) firsts[(Var) - ntokens] /*-----------------. @@ -64,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,12 +77,9 @@ print_firsts (void) for (i = ntokens; i < nsyms; i++) { bitset_iterator iter; - fprintf (stderr, "\t%s firsts\n", symbols[i]->tag); + fprintf (stderr, " %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, " %s\n", symbols[j + ntokens]->tag); } fprintf (stderr, "\n\n"); } @@ -101,12 +95,13 @@ print_fderives (void) for (i = ntokens; i < nsyms; i++) { bitset_iterator iter; - fprintf (stderr, "\t%s derives\n", symbols[i]->tag); + fprintf (stderr, " %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, " %3d ", r); + rule_rhs_print (&rules[r], stderr); + fprintf (stderr, "\n"); + } } fprintf (stderr, "\n\n"); } @@ -132,9 +127,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) @@ -170,8 +165,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 (); @@ -221,11 +216,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++; };