Point to an official beta.

[bison.git] / src / derives.c

diff --git a/src/derives.c b/src/derives.c
index 6002b88f930544088c82defc5a46b3afc6a857bc..d3443602c4107829920f6439f164b7442be736bf 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,68 +1,83 @@
 /* Match rules with nonterminals for bison,
 /* Match rules with nonterminals for bison,

-   Copyright (C) 1984, 1989 Free Software Foundation, Inc.
+   Copyright 1984, 1989, 2000, 2001  Free Software Foundation, Inc.

 
 

-This file is part of Bison, the GNU Compiler Compiler.
+   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.
+   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.

 
 

-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.
+   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.

 
 

-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.  */
+   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.  */

 
 
 
 

-/* 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 <stdio.h>

 #include "system.h"
 #include "system.h"

-#include "alloc.h"
+#include "getargs.h"
+#include "symtab.h"

 #include "types.h"
 #include "types.h"

+#include "reader.h"

 #include "gram.h"
 #include "gram.h"

+#include "derives.h"
+
+short **derives = NULL;
+
+static void
+print_derives (void)
+{
+  int i;
+
+  fputs ("DERIVES\n", stderr);
+
+  for (i = ntokens; i < nsyms; i++)
+    {
+      short *sp;
+      fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
+      for (sp = derives[i]; *sp > 0; 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);
+       }
+    }

 
 

-void set_derives PARAMS((void));
-void free_derives PARAMS((void));
+  fputs ("\n\n", stderr);
+}

 
 

-short **derives;

 
 void
 set_derives (void)
 {
 
 void
 set_derives (void)
 {

-  register int i;
-  register int lhs;
-  register shorts *p;
-  register short *q;
-  register shorts **dset;
-  register shorts *delts;
+  int i;
+  shorts *p;
+  short *q;
+  shorts **dset;
+  shorts *delts;

 
 

-  dset = NEW2(nvars, shorts *) - ntokens;
-  delts = NEW2(nrules + 1, shorts);
+  dset = XCALLOC (shorts *, nvars) - ntokens;
+  delts = XCALLOC (shorts, nrules + 1);

 
   p = delts;
   for (i = nrules; i > 0; i--)
     {
 
   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 = NEW2(nvars, short *) - ntokens;
-  q = NEW2(nvars + nrules, short);
+  derives = XCALLOC (short *, nvars) - ntokens;
+  q = XCALLOC (short, nvars + nrules);

 
   for (i = ntokens; i < nsyms; i++)
     {
 
   for (i = ntokens; i < nsyms; i++)
     {


@@ -76,46 +91,16 @@ set_derives (void)
       *q++ = -1;
     }
 
       *q++ = -1;
     }
 

-#ifdef DEBUG
-  print_derives();
-#endif
+  if (trace_flag)
+    print_derives ();

 
 

-  FREE(dset + ntokens);
-  FREE(delts);
+  XFREE (dset + ntokens);
+  XFREE (delts);

 }
 
 void
 free_derives (void)
 {
 }
 
 void
 free_derives (void)
 {

-  FREE(derives[ntokens]);
-  FREE(derives + ntokens);
+  XFREE (derives[ntokens]);
+  XFREE (derives + ntokens);

 }
 }

-
-
-
-#ifdef DEBUG
-
-void
-print_derives (void)
-{
-  register int i;
-  register short *sp;
-
-  extern char **tags;
-
-  printf(_("\n\n\nDERIVES\n\n"));
-
-  for (i = ntokens; i < nsyms; i++)
-    {
-      printf(_("%s derives"), tags[i]);
-      for (sp = derives[i]; *sp > 0; sp++)
-       {
-         printf("  %d", *sp);
-       }
-      putchar('\n');
-    }
-
-  putchar('\n');
-}
-
-#endif