X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/aa7815f5c6e8e07a85e47df9cd7b579468969efb..e91ff6ce3d2653b41265591dafd4bdb32ae114c2:/src/derives.c diff --git a/src/derives.c b/src/derives.c index 49b4edff..d3443602 100644 --- a/src/derives.c +++ b/src/derives.c @@ -1,5 +1,5 @@ /* Match rules with nonterminals for bison, - Copyright 1984, 1989, 2000 Free Software Foundation, Inc. + Copyright 1984, 1989, 2000, 2001 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -19,51 +19,45 @@ Boston, MA 02111-1307, USA. */ -/* set_derives finds, for each variable (nonterminal), which rules can - derive it. It sets up the value of derives so that derives[i - - ntokens] points to a vector of rule numbers, terminated with -1. - */ - #include "system.h" -#include "xalloc.h" +#include "getargs.h" +#include "symtab.h" #include "types.h" +#include "reader.h" #include "gram.h" #include "derives.h" -short **derives; - -#if DEBUG +short **derives = NULL; static void print_derives (void) { int i; - short *sp; - fputs ("\n\n\n", stdout); - printf (_("DERIVES")); - fputs ("\n\n", stdout); + fputs ("DERIVES\n", stderr); for (i = ntokens; i < nsyms; i++) { - printf (_("%s derives"), tags[i]); + short *sp; + fprintf (stderr, "\t%s derives\n", symbols[i]->tag); for (sp = derives[i]; *sp > 0; sp++) { - printf (" %d", *sp); + item_number_t *rhsp; + fprintf (stderr, "\t\t%d:", *sp); + for (rhsp = rules[*sp].rhs; *rhsp >= 0; ++rhsp) + fprintf (stderr, " %s", symbols[*rhsp]->tag); + fprintf (stderr, " (rule %d)\n", -*rhsp - 1); } - putchar ('\n'); } - putchar ('\n'); + fputs ("\n\n", stderr); } -#endif void set_derives (void) { int i; - int lhs; shorts *p; short *q; shorts **dset; @@ -75,14 +69,11 @@ set_derives (void) p = delts; for (i = nrules; i > 0; i--) { - lhs = rlhs[i]; - if (lhs >= 0) - { - p->next = dset[lhs]; - p->value = i; - dset[lhs] = p; - p++; - } + token_number_t lhs = rules[i].lhs->number; + p->next = dset[lhs]; + p->value = i; + dset[lhs] = p; + p++; } derives = XCALLOC (short *, nvars) - ntokens; @@ -100,9 +91,8 @@ set_derives (void) *q++ = -1; } -#if DEBUG - print_derives (); -#endif + if (trace_flag) + print_derives (); XFREE (dset + ntokens); XFREE (delts);