* src/derives.c (print_derives): Fix and enrich.

[bison.git] / src / derives.c

diff --git a/src/derives.c b/src/derives.c
index 7a95050c4563855892ecb45118cb87c35c42309d..f0c41165a8bca1eadae1775612cf7892238dce8a 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,54 +1,81 @@
 /* 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, 675 Mass Ave, Cambridge, MA 02139, 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.  */
+/* 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 "types.h"
 #include "types.h"

+#include "reader.h"

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

-
+#include "derives.h"

 
 short **derives;
 
 
 short **derives;
 

+
+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", tags[i]);
+      for (sp = derives[i]; *sp > 0; sp++)
+       {
+         short *rhsp;
+         fprintf (stderr, "\t\t%d:", *sp);
+         for (rhsp = ritem + rule_table[*sp].rhs; *rhsp > 0; ++rhsp)
+           fprintf (stderr, " %s", tags[*rhsp]);
+         fputc ('\n', stderr);
+       }
+    }
+
+  fputs ("\n\n", stderr);
+}
+
+

 void
 void

-set_derives()
+set_derives (void)

 {
 {

-  register int i;
-  register int lhs;
-  register shorts *p;
-  register short *q;
-  register shorts **dset;
-  register shorts *delts;
+  int i;
+  int lhs;
+  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];
+      lhs = rule_table[i].lhs;

       if (lhs >= 0)
        {
          p->next = dset[lhs];
       if (lhs >= 0)
        {
          p->next = dset[lhs];


@@ -58,8 +85,8 @@ set_derives()
        }
     }
 
        }
     }
 

-  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++)
     {


@@ -73,46 +100,16 @@ set_derives()
       *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
 }
 
 void

-free_derives()
+free_derives (void)

 {
 {

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

 }
 }

-
-
-
-#ifdef DEBUG
-
-print_derives()
-{
-  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
-