* src/getargs.c (statistics_flag): Replace with...

[bison.git] / src / nullable.c

diff --git a/src/nullable.c b/src/nullable.c
index 8733bc028c555781053a20774ecce087a7c68b23..eedc5a33ac8af5d451b8dda0a675d9f2ba311d9d 100644 (file)
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -1,5 +1,5 @@
 /* Part of the bison parser generator,
-   Copyright (C) 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.
 
@@ -24,9 +24,9 @@
    do so.  */
 
 #include "system.h"
+#include "getargs.h"
 #include "types.h"
 #include "gram.h"
-#include "alloc.h"
 #include "nullable.h"
 
 char *nullable = NULL;
@@ -48,21 +48,20 @@ set_nullable (void)
   char any_tokens;
   short *r1;
 
-#ifdef TRACE
-  fprintf (stderr, _("Entering set_nullable"));
-#endif
+  if (trace_flag)
+    fprintf (stderr, "Entering set_nullable");
 
-  nullable = NEW2 (nvars, char) - ntokens;
+  nullable = XCALLOC (char, nvars) - ntokens;
 
-  squeue = NEW2 (nvars, short);
+  squeue = XCALLOC (short, nvars);
   s1 = s2 = squeue;
 
-  rcount = NEW2 (nrules + 1, short);
-  rsets = NEW2 (nvars, shorts *) - ntokens;
+  rcount = XCALLOC (short, nrules + 1);
+  rsets = XCALLOC (shorts *, nvars) - ntokens;
   /* This is said to be more elements than we actually use.
      Supposedly nitems - nrules is enough.
      But why take the risk?  */
-  relts = NEW2 (nitems + nvars + 1, shorts);
+  relts = XCALLOC (shorts, nitems + nvars + 1);
   p = relts;
 
   r = ritem;
@@ -70,7 +69,7 @@ set_nullable (void)
     {
       if (*r < 0)
        {
-         symbol = rlhs[-(*r++)];
+         symbol = rule_table[-(*r++)].lhs;
          if (symbol >= 0 && !nullable[symbol])
            {
              nullable[symbol] = 1;
@@ -112,7 +111,7 @@ set_nullable (void)
          p = p->next;
          if (--rcount[ruleno] == 0)
            {
-             symbol = rlhs[ruleno];
+             symbol = rule_table[ruleno].lhs;
              if (symbol >= 0 && !nullable[symbol])
                {
                  nullable[symbol] = 1;
@@ -122,15 +121,15 @@ set_nullable (void)
        }
     }
 
-  FREE (squeue);
-  FREE (rcount);
-  FREE (rsets + ntokens);
-  FREE (relts);
+  XFREE (squeue);
+  XFREE (rcount);
+  XFREE (rsets + ntokens);
+  XFREE (relts);
 }
 
 
 void
 free_nullable (void)
 {
-  FREE (nullable + ntokens);
+  XFREE (nullable + ntokens);
 }