lalr1.cc: check (and fix) %initial-action exception safety

[bison.git] / src / symlist.c

diff --git a/src/symlist.c b/src/symlist.c
index 6c6b57daa4c289bcd2c252059c05862d73bb7987..69ac8a1b574c9684cd49157ab9a25184839dbeeb 100644 (file)
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,6 +1,7 @@
 /* Lists of symbols for Bison
 
 /* Lists of symbols for Bison
 

-   Copyright (C) 2002, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2007, 2009-2012 Free Software Foundation,
+   Inc.

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


@@ -35,7 +36,7 @@ symbol_list_sym_new (symbol *sym, location loc)
 
   res->content_type = SYMLIST_SYMBOL;
   res->content.sym = sym;
 
   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;
 
   res->midrule = NULL;
   res->midrule_parent_rule = NULL;


@@ -47,6 +48,8 @@ symbol_list_sym_new (symbol *sym, location loc)
   res->dprec = 0;
   res->merger = 0;
 
   res->dprec = 0;
   res->merger = 0;
 

+  res->named_ref = NULL;
+

   res->next = NULL;
 
   return res;
   res->next = NULL;
 
   return res;


@@ -64,7 +67,8 @@ symbol_list_type_new (uniqstr type_name, location loc)
 
   res->content_type = SYMLIST_TYPE;
   res->content.type_name = type_name;
 
   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;
   res->next = NULL;
 
   return res;


@@ -81,7 +85,8 @@ symbol_list_default_tagged_new (location loc)
   symbol_list *res = xmalloc (sizeof *res);
 
   res->content_type = SYMLIST_DEFAULT_TAGGED;
   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;
   res->next = NULL;
 
   return res;


@@ -98,7 +103,8 @@ symbol_list_default_tagless_new (location loc)
   symbol_list *res = xmalloc (sizeof *res);
 
   res->content_type = SYMLIST_DEFAULT_TAGLESS;
   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;
   res->next = NULL;
 
   return res;


@@ -141,7 +147,13 @@ symbol_list_prepend (symbol_list *list, symbol_list *node)
 void
 symbol_list_free (symbol_list *list)
 {
 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;
+      named_ref_free (node->named_ref);
+      free (node);
+    }

 }
 
 
 }
 
 


@@ -203,51 +215,51 @@ symbol_list_n_type_name_get (symbol_list *l, location loc, int n)
   return l->content.sym->type_name;
 }
 
   return l->content.sym->type_name;
 }
 

+bool
+symbol_list_null (symbol_list *node)
+{
+  return !node ||
+    (node->content_type == SYMLIST_SYMBOL && !(node->content.sym));
+}

 
 void
 
 void

-symbol_list_destructor_set (symbol_list *node, char const *code, location loc)
+symbol_list_destructor_set (symbol_list *node, code_props const *destructor)

 {
 {

-  code_props destructor;
-  code_props_symbol_action_init (&destructor, code, loc);
-  code_props_translate_code (&destructor);

   switch (node->content_type)
     {
       case SYMLIST_SYMBOL:
   switch (node->content_type)
     {
       case SYMLIST_SYMBOL:

-        symbol_destructor_set (node->content.sym, &destructor);
+        symbol_destructor_set (node->content.sym, destructor);

         break;
       case SYMLIST_TYPE:
         semantic_type_destructor_set (
         break;
       case SYMLIST_TYPE:
         semantic_type_destructor_set (

-          semantic_type_get (node->content.type_name), &destructor);
+          semantic_type_get (node->content.type_name), destructor);

         break;
       case SYMLIST_DEFAULT_TAGGED:
         break;
       case SYMLIST_DEFAULT_TAGGED:

-        default_tagged_destructor_set (&destructor);
+        default_tagged_destructor_set (destructor);

         break;
       case SYMLIST_DEFAULT_TAGLESS:
         break;
       case SYMLIST_DEFAULT_TAGLESS:

-        default_tagless_destructor_set (&destructor);
+        default_tagless_destructor_set (destructor);

         break;
     }
 }
 
 void
         break;
     }
 }
 
 void

-symbol_list_printer_set (symbol_list *node, char const *code, location loc)
+symbol_list_printer_set (symbol_list *node, code_props const *printer)

 {
 {

-  code_props printer;
-  code_props_symbol_action_init (&printer, code, loc);
-  code_props_translate_code (&printer);

   switch (node->content_type)
     {
       case SYMLIST_SYMBOL:
   switch (node->content_type)
     {
       case SYMLIST_SYMBOL:

-        symbol_printer_set (node->content.sym, &printer);
+        symbol_printer_set (node->content.sym, printer);

         break;
       case SYMLIST_TYPE:
         semantic_type_printer_set (
         break;
       case SYMLIST_TYPE:
         semantic_type_printer_set (

-          semantic_type_get (node->content.type_name), &printer);
+          semantic_type_get (node->content.type_name), printer);

         break;
       case SYMLIST_DEFAULT_TAGGED:
         break;
       case SYMLIST_DEFAULT_TAGGED:

-        default_tagged_printer_set (&printer);
+        default_tagged_printer_set (printer);

         break;
       case SYMLIST_DEFAULT_TAGLESS:
         break;
       case SYMLIST_DEFAULT_TAGLESS:

-        default_tagless_printer_set (&printer);
+        default_tagless_printer_set (printer);

         break;
     }
 }
         break;
     }
 }