Re: bison uses XFREE...

[Paul Eggert]

Jim Meyering <address@hidden> writes:

> Yesterday, I ran bison's bootstrap script with the latest from CVS,
> then configure && make, and got lots of compiler or linker warnings about
> XFREE not being defined.

Sorry about that.  I fixed it as follows:

2004-11-22  Paul Eggert  <address@hidden>

        * src/LR0.c, src/closure.c, src/derives.c, src/gram.c,
        src/lalr.c, src/nullable.c, src/relation.c, src/scan-skel.l,
        src/system.h, src/tables.c: XFREE -> free, to accommodate
        recent change to gnulib xalloc.h.

Index: src/LR0.c
===================================================================
RCS file: /cvsroot/bison/bison/src/LR0.c,v
retrieving revision 1.88
diff -p -u -r1.88 LR0.c
--- src/LR0.c   31 Mar 2004 00:37:20 -0000      1.88
+++ src/LR0.c   22 Nov 2004 21:03:15 -0000
@@ -158,7 +158,7 @@ free_storage (void)
   free (shiftset);
   free (kernel_base);
   free (kernel_size);
-  XFREE (kernel_items);
+  free (kernel_items);
   state_hash_free ();
 }
 
Index: src/closure.c
===================================================================
RCS file: /cvsroot/bison/bison/src/closure.c,v
retrieving revision 1.67
diff -p -u -r1.67 closure.c
--- src/closure.c       13 Dec 2002 08:19:42 -0000      1.67
+++ src/closure.c       22 Nov 2004 21:03:15 -0000
@@ -241,7 +241,7 @@ closure (item_number *core, int n)
 void
 free_closure (void)
 {
-  XFREE (itemset);
+  free (itemset);
   bitset_free (ruleset);
   bitsetv_free (fderives);
 }
Index: src/conflicts.c
===================================================================
RCS file: /cvsroot/bison/bison/src/conflicts.c,v
retrieving revision 1.108
diff -p -u -r1.108 conflicts.c
--- src/conflicts.c     21 Jun 2004 20:20:30 -0000      1.108
+++ src/conflicts.c     22 Nov 2004 21:03:15 -0000
@@ -488,9 +488,9 @@ conflicts_print (void)
       expected_rr_conflicts = -1;
     }
 
-  src_ok = 
+  src_ok =
     src_total == (expected_sr_conflicts == -1 ? 0 : expected_sr_conflicts);
-  rrc_ok = 
+  rrc_ok =
     rrc_total == (expected_rr_conflicts == -1 ? 0 : expected_rr_conflicts);
 
   /* If there are as many RR conflicts and SR conflicts as
@@ -522,7 +522,7 @@ conflicts_print (void)
 void
 conflicts_free (void)
 {
-  XFREE (conflicts);
+  free (conflicts);
   bitset_free (shift_set);
   bitset_free (look_ahead_set);
   obstack_free (&solved_conflicts_obstack, NULL);
Index: src/derives.c
===================================================================
RCS file: /cvsroot/bison/bison/src/derives.c,v
retrieving revision 1.41
diff -p -u -r1.41 derives.c
--- src/derives.c       3 Feb 2003 15:35:56 -0000       1.41
+++ src/derives.c       22 Nov 2004 21:03:15 -0000
@@ -116,6 +116,6 @@ derives_compute (void)
 void
 derives_free (void)
 {
-  XFREE (derives[0]);
-  XFREE (derives);
+  free (derives[0]);
+  free (derives);
 }
Index: src/gram.c
===================================================================
RCS file: /cvsroot/bison/bison/src/gram.c,v
retrieving revision 1.52
diff -p -u -r1.52 gram.c
--- src/gram.c  29 Apr 2003 12:57:35 -0000      1.52
+++ src/gram.c  22 Nov 2004 21:03:15 -0000
@@ -326,9 +326,9 @@ grammar_rules_never_reduced_report (cons
 void
 grammar_free (void)
 {
-  XFREE (ritem);
+  free (ritem);
   free (rules);
-  XFREE (token_translations);
+  free (token_translations);
   /* Free the symbol table data structure.  */
   symbols_free ();
   free_merger_functions ();
Index: src/lalr.c
===================================================================
RCS file: /cvsroot/bison/bison/src/lalr.c,v
retrieving revision 1.99
diff -p -u -r1.99 lalr.c
--- src/lalr.c  22 Oct 2004 23:08:33 -0000      1.99
+++ src/lalr.c  22 Nov 2004 21:03:15 -0000
@@ -128,7 +128,7 @@ set_goto_map (void)
        }
     }
 
-  XFREE (temp_map);
+  free (temp_map);
 }
 
 
@@ -203,10 +203,10 @@ initialize_F (void)
   relation_digraph (reads, ngotos, &F);
 
   for (i = 0; i < ngotos; i++)
-    XFREE (reads[i]);
+    free (reads[i]);
 
-  XFREE (reads);
-  XFREE (edge);
+  free (reads);
+  free (edge);
 }
 
 
@@ -283,8 +283,8 @@ build_relations (void)
        }
     }
 
-  XFREE (edge);
-  XFREE (states1);
+  free (edge);
+  free (states1);
 
   relation_transpose (&includes, ngotos);
 }
@@ -299,9 +299,9 @@ compute_FOLLOWS (void)
   relation_digraph (includes, ngotos, &F);
 
   for (i = 0; i < ngotos; i++)
-    XFREE (includes[i]);
+    free (includes[i]);
 
-  XFREE (includes);
+  free (includes);
 }
 
 
@@ -319,7 +319,7 @@ compute_look_ahead_tokens (void)
   for (i = 0; i < nLA; i++)
     LIST_FREE (goto_list, lookback[i]);
 
-  XFREE (lookback);
+  free (lookback);
   bitsetv_free (F);
 }
 
Index: src/nullable.c
===================================================================
RCS file: /cvsroot/bison/bison/src/nullable.c,v
retrieving revision 1.42
diff -p -u -r1.42 nullable.c
--- src/nullable.c      31 Mar 2004 00:37:21 -0000      1.42
+++ src/nullable.c      22 Nov 2004 21:03:15 -0000
@@ -126,10 +126,10 @@ nullable_compute (void)
            }
       }
 
-  XFREE (squeue);
-  XFREE (rcount);
-  XFREE (rsets);
-  XFREE (relts);
+  free (squeue);
+  free (rcount);
+  free (rsets);
+  free (relts);
 
   if (trace_flag & trace_sets)
     nullable_print (stderr);
@@ -139,5 +139,5 @@ nullable_compute (void)
 void
 nullable_free (void)
 {
-  XFREE (nullable);
+  free (nullable);
 }
Index: src/relation.c
===================================================================
RCS file: /cvsroot/bison/bison/src/relation.c,v
retrieving revision 1.8
diff -p -u -r1.8 relation.c
--- src/relation.c      22 Oct 2004 23:10:07 -0000      1.8
+++ src/relation.c      22 Nov 2004 21:03:15 -0000
@@ -112,8 +112,8 @@ relation_digraph (relation r, size_t siz
     if (INDEX[i] == 0 && R[i])
       traverse (i);
 
-  XFREE (INDEX);
-  XFREE (VERTICES);
+  free (INDEX);
+  free (VERTICES);
 
   *function = F;
 }
@@ -170,7 +170,7 @@ relation_transpose (relation *R_arg, int
 
   /* Free the input: it is replaced with the result. */
   for (i = 0; i < n; i++)
-    XFREE ((*R_arg)[i]);
+    free ((*R_arg)[i]);
   free (*R_arg);
 
   if (trace_flag & trace_sets)
Index: src/scan-skel.l
===================================================================
RCS file: /cvsroot/bison/bison/src/scan-skel.l,v
retrieving revision 1.25
diff -p -u -r1.25 scan-skel.l
--- src/scan-skel.l     20 Sep 2004 09:32:55 -0000      1.25
+++ src/scan-skel.l     22 Nov 2004 21:03:15 -0000
@@ -58,7 +58,7 @@ int skel_lex (void);
        fatal ("invalid token in skeleton: %s", yytext);
     }
 
-  XFREE (outname);
+  free (outname);
   outname = xstrdup (filename);
   xfclose (yyout);
   yyout = xfopen (outname, "w");
Index: src/system.h
===================================================================
RCS file: /cvsroot/bison/bison/src/system.h,v
retrieving revision 1.63
diff -p -u -r1.63 system.h
--- src/system.h        28 Apr 2004 20:00:56 -0000      1.63
+++ src/system.h        22 Nov 2004 21:03:15 -0000
@@ -205,7 +205,7 @@ do {                                                \
   for (_node = List; _node; _node = _next)     \
     {                                          \
       _next = _node->next;                     \
-      XFREE (_node);                           \
+      free (_node);                            \
     }                                          \
 } while (0)
 
Index: src/tables.c
===================================================================
RCS file: /cvsroot/bison/bison/src/tables.c,v
retrieving revision 1.21
diff -p -u -r1.21 tables.c
--- src/tables.c        21 Jun 2004 20:20:31 -0000      1.21
+++ src/tables.c        22 Nov 2004 21:03:15 -0000
@@ -835,7 +835,7 @@ tables_generate (void)
     {
       free (froms[i]);
       free (tos[i]);
-      XFREE (conflict_tos[i]);
+      free (conflict_tos[i]);
     }
 
   free (froms);