Fix some memory leaks.

[bison.git] / src / symlist.c

diff --git a/src/symlist.c b/src/symlist.c
index 6c6b57daa4c289bcd2c252059c05862d73bb7987..1ffad2b62109f9e776ea2be1b21603977da6f939 100644 (file)
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -35,7 +35,7 @@ symbol_list_sym_new (symbol *sym, location loc)
 
   res->content_type = SYMLIST_SYMBOL;
   res->content.sym = sym;
-  res->location = loc;
+  res->location = res->sym_loc = loc;
 
   res->midrule = NULL;
   res->midrule_parent_rule = NULL;
@@ -47,6 +47,8 @@ symbol_list_sym_new (symbol *sym, location loc)
   res->dprec = 0;
   res->merger = 0;
 
+  res->named_ref = NULL;
+
   res->next = NULL;
 
   return res;
@@ -64,7 +66,8 @@ symbol_list_type_new (uniqstr type_name, location loc)
 
   res->content_type = SYMLIST_TYPE;
   res->content.type_name = type_name;
-  res->location = loc;
+  res->location = res->sym_loc = loc;
+  res->named_ref = NULL;
   res->next = NULL;
 
   return res;
@@ -81,7 +84,8 @@ symbol_list_default_tagged_new (location loc)
   symbol_list *res = xmalloc (sizeof *res);
 
   res->content_type = SYMLIST_DEFAULT_TAGGED;
-  res->location = loc;
+  res->location = res->sym_loc = loc;
+  res->named_ref = NULL;
   res->next = NULL;
 
   return res;
@@ -98,7 +102,8 @@ symbol_list_default_tagless_new (location loc)
   symbol_list *res = xmalloc (sizeof *res);
 
   res->content_type = SYMLIST_DEFAULT_TAGLESS;
-  res->location = loc;
+  res->location = res->sym_loc = loc;
+  res->named_ref = NULL;
   res->next = NULL;
 
   return res;
@@ -141,7 +146,14 @@ symbol_list_prepend (symbol_list *list, symbol_list *node)
 void
 symbol_list_free (symbol_list *list)
 {
-  LIST_FREE (symbol_list, list);
+  symbol_list *node, *next;
+  for (node = list; node; node = next)
+    {
+      next = node->next;
+      if (node->named_ref)
+        named_ref_free (node->named_ref);
+      free (node);
+    }
 }
 
 
@@ -203,6 +215,12 @@ symbol_list_n_type_name_get (symbol_list *l, location loc, int n)
   return l->content.sym->type_name;
 }
 
+bool
+symbol_list_null (symbol_list *node)
+{
+  return !node ||
+    (node->content_type == SYMLIST_SYMBOL && !(node->content.sym));
+}
 
 void
 symbol_list_destructor_set (symbol_list *node, char const *code, location loc)