XFREE -> free

diff --git a/ChangeLog b/ChangeLog
index 9298e15a5891c66ebf0fc30b3676a6b62f6b322a..d3f162051797e9c999e90941a89560db8e829ddb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * 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.
+

 2004-11-17  Akim Demaille  <akim@epita.fr>
 
        * data/lalr1.cc (symprint_): Use cdebug_ to avoid warnings.
 2004-11-17  Akim Demaille  <akim@epita.fr>
 
        * data/lalr1.cc (symprint_): Use cdebug_ to avoid warnings.

diff --git a/src/LR0.c b/src/LR0.c
index 2a75193e8135cf9c2dab01ea5a5eb3e835ff591f..c2a491e8b02bf169ea27c62e47bb913eacbb72be 100644 (file)
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -158,7 +158,7 @@ free_storage (void)
   free (shiftset);
   free (kernel_base);
   free (kernel_size);
   free (shiftset);
   free (kernel_base);
   free (kernel_size);

-  XFREE (kernel_items);
+  free (kernel_items);

   state_hash_free ();
 }
 
   state_hash_free ();
 }
 

diff --git a/src/closure.c b/src/closure.c
index 228056f7bb46c501b4212607cc73494e116a965d..0b06e99ce95c9026bd0525c001a0aceae085f456 100644 (file)
--- a/src/closure.c
+++ b/src/closure.c
@@ -241,7 +241,7 @@ closure (item_number *core, int n)
 void
 free_closure (void)
 {
 void
 free_closure (void)
 {

-  XFREE (itemset);
+  free (itemset);

   bitset_free (ruleset);
   bitsetv_free (fderives);
 }
   bitset_free (ruleset);
   bitsetv_free (fderives);
 }

diff --git a/src/conflicts.c b/src/conflicts.c
index 73ad45e98d63052251e2483d59827ea686e74534..bf5d64350c895df679675720758682ad45772ef6 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -488,9 +488,9 @@ conflicts_print (void)
       expected_rr_conflicts = -1;
     }
 
       expected_rr_conflicts = -1;
     }
 

-  src_ok = 
+  src_ok =

     src_total == (expected_sr_conflicts == -1 ? 0 : expected_sr_conflicts);
     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
     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)
 {
 void
 conflicts_free (void)
 {

-  XFREE (conflicts);
+  free (conflicts);

   bitset_free (shift_set);
   bitset_free (look_ahead_set);
   obstack_free (&solved_conflicts_obstack, NULL);
   bitset_free (shift_set);
   bitset_free (look_ahead_set);
   obstack_free (&solved_conflicts_obstack, NULL);

diff --git a/src/derives.c b/src/derives.c
index 7e20fe5a29f0d7153c7b67c4b2205be143955a31..14e7817a1328a403fa43e0ac0ba5aa403a74ee71 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -116,6 +116,6 @@ derives_compute (void)
 void
 derives_free (void)
 {
 void
 derives_free (void)
 {

-  XFREE (derives[0]);
-  XFREE (derives);
+  free (derives[0]);
+  free (derives);

 }
 }

diff --git a/src/gram.c b/src/gram.c
index 223b736d47dc0d49f12293ce90583710986c28cf..c99cb9d874bd85efd195a6925e7670feda21937e 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -326,9 +326,9 @@ grammar_rules_never_reduced_report (const char *message)
 void
 grammar_free (void)
 {
 void
 grammar_free (void)
 {

-  XFREE (ritem);
+  free (ritem);

   free (rules);
   free (rules);

-  XFREE (token_translations);
+  free (token_translations);

   /* Free the symbol table data structure.  */
   symbols_free ();
   free_merger_functions ();
   /* Free the symbol table data structure.  */
   symbols_free ();
   free_merger_functions ();

diff --git a/src/lalr.c b/src/lalr.c
index 313bbbdabfe073fe6df27d53210fa2f079ff5eff..77f469ddfa4953ce327489842f469f39e61d78ce 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -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++)
   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);
 }
 
   relation_transpose (&includes, ngotos);
 }


@@ -299,9 +299,9 @@ compute_FOLLOWS (void)
   relation_digraph (includes, ngotos, &F);
 
   for (i = 0; i < ngotos; i++)
   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]);
 
   for (i = 0; i < nLA; i++)
     LIST_FREE (goto_list, lookback[i]);
 

-  XFREE (lookback);
+  free (lookback);

   bitsetv_free (F);
 }
 
   bitsetv_free (F);
 }
 

diff --git a/src/nullable.c b/src/nullable.c
index d65c4f2b43d06cdc33b1f35df151f3e066b03a1c..497ec0ad0ad171a5bb03f486dc56efa25032e45f 100644 (file)
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -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);
 
   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);

 }
 }

diff --git a/src/relation.c b/src/relation.c
index 38b1e8255d30476e4019b7e913881dd3446696c6..92d090ef1e49ce27c4e9362e4c7fff2e732517f8 100644 (file)
--- a/src/relation.c
+++ b/src/relation.c
@@ -112,8 +112,8 @@ relation_digraph (relation r, size_t size, bitsetv *function)
     if (INDEX[i] == 0 && R[i])
       traverse (i);
 
     if (INDEX[i] == 0 && R[i])
       traverse (i);
 

-  XFREE (INDEX);
-  XFREE (VERTICES);
+  free (INDEX);
+  free (VERTICES);

 
   *function = F;
 }
 
   *function = F;
 }


@@ -170,7 +170,7 @@ relation_transpose (relation *R_arg, int n)
 
   /* Free the input: it is replaced with the result. */
   for (i = 0; i < n; i++)
 
   /* 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)
   free (*R_arg);
 
   if (trace_flag & trace_sets)

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 47b696da1aa5730b2675042af606d3f63eddcfef..73b1e85d18349e7e875b109d7ed67c2326b602dc 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -58,7 +58,7 @@ int skel_lex (void);
        fatal ("invalid token in skeleton: %s", yytext);
     }
 
        fatal ("invalid token in skeleton: %s", yytext);
     }
 

-  XFREE (outname);
+  free (outname);

   outname = xstrdup (filename);
   xfclose (yyout);
   yyout = xfopen (outname, "w");
   outname = xstrdup (filename);
   xfclose (yyout);
   yyout = xfopen (outname, "w");

diff --git a/src/system.h b/src/system.h
index 62640c5cc9280b693556b18cc31e2588139e14cd..10abfef590786f47bde47b9f380d2aa645d1c3ca 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -205,7 +205,7 @@ do {                                                \
   for (_node = List; _node; _node = _next)     \
     {                                          \
       _next = _node->next;                     \
   for (_node = List; _node; _node = _next)     \
     {                                          \
       _next = _node->next;                     \

-      XFREE (_node);                           \
+      free (_node);                            \

     }                                          \
 } while (0)
 
     }                                          \
 } while (0)
 

diff --git a/src/tables.c b/src/tables.c
index 50dd4535161e200fea1ad87fdb84b17eac8f78d5..d39e2d8a49faa7f2134263fefbe8f129a7681e9c 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -835,7 +835,7 @@ tables_generate (void)
     {
       free (froms[i]);
       free (tos[i]);
     {
       free (froms[i]);
       free (tos[i]);

-      XFREE (conflict_tos[i]);
+      free (conflict_tos[i]);

     }
 
   free (froms);
     }
 
   free (froms);