Sync.

[bison.git] / src / nullable.c

diff --git a/src/nullable.c b/src/nullable.c
index cf6cfd68c0831b370c7693e3ddca1c1057ae1ab6..e73344f8283f1552474879eca64a112fd0328e66 100644 (file)
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -1,7 +1,7 @@
 /* Calculate which nonterminals can expand into the null string for Bison.
 
 /* Calculate which nonterminals can expand into the null string for Bison.
 

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

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
 
    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.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

 
 
 /* Set up NULLABLE, a vector saying which nonterminals can expand into
 
 
 /* Set up NULLABLE, a vector saying which nonterminals can expand into


@@ -61,16 +61,16 @@ nullable_compute (void)
   symbol_number *s2;
   rule_list *p;
 
   symbol_number *s2;
   rule_list *p;
 

-  symbol_number *squeue = CALLOC (squeue, nvars);
-  short *rcount = CALLOC (rcount, nrules);
+  symbol_number *squeue = xnmalloc (nvars, sizeof *squeue);
+  size_t *rcount = xcalloc (nrules, sizeof *rcount);

   /* RITEM contains all the rules, including useless productions.
      Hence we must allocate room for useless nonterminals too.  */
   /* RITEM contains all the rules, including useless productions.
      Hence we must allocate room for useless nonterminals too.  */

-  rule_list **rsets = CALLOC (rsets, nvars);
+  rule_list **rsets = xcalloc (nvars, sizeof *rsets);

   /* This is said to be more elements than we actually use.
      Supposedly NRITEMS - NRULES is enough.  But why take the risk?  */
   /* This is said to be more elements than we actually use.
      Supposedly NRITEMS - NRULES is enough.  But why take the risk?  */

-  rule_list *relts = CALLOC (relts, nritems + nvars + 1);
+  rule_list *relts = xnmalloc (nritems + nvars + 1, sizeof *relts);

 
 

-  CALLOC (nullable, nvars);
+  nullable = xcalloc (nvars, sizeof *nullable);

 
   s1 = s2 = squeue;
   p = relts;
 
   s1 = s2 = squeue;
   p = relts;


@@ -83,10 +83,10 @@ nullable_compute (void)
          {
            /* This rule has a non empty RHS. */
            item_number *rp = NULL;
          {
            /* This rule has a non empty RHS. */
            item_number *rp = NULL;

-           int any_tokens = 0;
+           bool any_tokens = false;

            for (rp = rules_ruleno->rhs; *rp >= 0; ++rp)
              if (ISTOKEN (*rp))
            for (rp = rules_ruleno->rhs; *rp >= 0; ++rp)
              if (ISTOKEN (*rp))

-               any_tokens = 1;
+               any_tokens = true;

 
            /* This rule has only nonterminals: schedule it for the second
               pass.  */
 
            /* This rule has only nonterminals: schedule it for the second
               pass.  */


@@ -108,7 +108,7 @@ nullable_compute (void)
            if (rules_ruleno->useful
                && ! nullable[rules_ruleno->lhs->number - ntokens])
              {
            if (rules_ruleno->useful
                && ! nullable[rules_ruleno->lhs->number - ntokens])
              {

-               nullable[rules_ruleno->lhs->number - ntokens] = 1;
+               nullable[rules_ruleno->lhs->number - ntokens] = true;

                *s2++ = rules_ruleno->lhs->number;
              }
          }
                *s2++ = rules_ruleno->lhs->number;
              }
          }


@@ -121,15 +121,15 @@ nullable_compute (void)
        if (--rcount[r->number] == 0)
          if (r->useful && ! nullable[r->lhs->number - ntokens])
            {
        if (--rcount[r->number] == 0)
          if (r->useful && ! nullable[r->lhs->number - ntokens])
            {

-             nullable[r->lhs->number - ntokens] = 1;
+             nullable[r->lhs->number - ntokens] = true;

              *s2++ = r->lhs->number;
            }
       }
 
              *s2++ = r->lhs->number;
            }
       }
 

-  XFREE (squeue);
-  XFREE (rcount);
-  XFREE (rsets);
-  XFREE (relts);
+  free (squeue);
+  free (rcount);
+  free (rsets);
+  free (relts);

 
   if (trace_flag & trace_sets)
     nullable_print (stderr);
 
   if (trace_flag & trace_sets)
     nullable_print (stderr);


@@ -139,5 +139,5 @@ nullable_compute (void)
 void
 nullable_free (void)
 {
 void
 nullable_free (void)
 {

-  XFREE (nullable);
+  free (nullable);

 }
 }