2007-01-30 Paolo Bonzini <bonzini@gnu.org>

[bison.git] / src / symlist.c

diff --git a/src/symlist.c b/src/symlist.c
index 245196b27fbf9477f27e66ab649df7893973f4b2..299bfcbefbc63e933035305c68460996759f4995 100644 (file)
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,6 +1,6 @@
 /* Lists of symbols for Bison
 
 /* Lists of symbols for Bison
 

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

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


@@ -43,8 +43,7 @@ symbol_list_sym_new (symbol *sym, location loc)
   res->midrule_parent_rule = NULL;
   res->midrule_parent_rhs_index = 0;
 
   res->midrule_parent_rule = NULL;
   res->midrule_parent_rhs_index = 0;
 

-  res->action = NULL;
-  res->used = false;
+  code_props_none_init (&res->action_props);

 
   res->ruleprec = NULL;
   res->dprec = 0;
 
   res->ruleprec = NULL;
   res->dprec = 0;


@@ -91,9 +90,9 @@ symbol_list_default_tagged_new (location loc)
 }
 
 
 }
 
 

-/*----------------------------------------.
-| Create a list containing a <!> at LOC.  |
-`----------------------------------------*/
+/*---------------------------------------.
+| Create a list containing a <> at LOC.  |
+`---------------------------------------*/

 
 symbol_list *
 symbol_list_default_tagless_new (location loc)
 
 symbol_list *
 symbol_list_default_tagless_new (location loc)


@@ -118,7 +117,7 @@ symbol_list_syms_print (const symbol_list *l, FILE *f)
   for (/* Nothing. */; l && l->content.sym; l = l->next)
     {
       symbol_print (l->content.sym, f);
   for (/* Nothing. */; l && l->content.sym; l = l->next)
     {
       symbol_print (l->content.sym, f);

-      fprintf (stderr, l->used ? " used" : " unused");
+      fprintf (stderr, l->action_props.is_value_used ? " used" : " unused");

       if (l && l->content.sym)
        fprintf (f, ", ");
     }
       if (l && l->content.sym)
        fprintf (f, ", ");
     }


@@ -207,57 +206,50 @@ symbol_list_n_type_name_get (symbol_list *l, location loc, int n)
 }
 
 
 }
 
 

-/*--------------------------------------.
-| The item N in symbol list L is USED.  |
-`--------------------------------------*/
-
-void
-symbol_list_n_used_set (symbol_list *l, int n, bool used)
-{
-  l = symbol_list_n_get (l, n);
-  if (l)
-    l->used = used;
-}
-

 void
 void

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

 {
 {

+  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, loc);
+        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, loc);
+          semantic_type_get (node->content.type_name), &destructor);

         break;
       case SYMLIST_DEFAULT_TAGGED:
         break;
       case SYMLIST_DEFAULT_TAGGED:

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

         break;
       case SYMLIST_DEFAULT_TAGLESS:
         break;
       case SYMLIST_DEFAULT_TAGLESS:

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

         break;
     }
 }
 
 void
         break;
     }
 }
 
 void

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

 {
 {

+  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, loc);
+        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, loc);
+          semantic_type_get (node->content.type_name), &printer);

         break;
       case SYMLIST_DEFAULT_TAGGED:
         break;
       case SYMLIST_DEFAULT_TAGGED:

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

         break;
       case SYMLIST_DEFAULT_TAGLESS:
         break;
       case SYMLIST_DEFAULT_TAGLESS:

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

         break;
     }
 }
         break;
     }
 }