simplify the handling of <> and <*>'s code_props.

[bison.git] / src / symlist.h

diff --git a/src/symlist.h b/src/symlist.h
index 3d439e856a8449a894282e5225c20f6fe6a7f1ec..dd63408339b791d5d8a6890f584d9408889bd004 100644 (file)
--- a/src/symlist.h
+++ b/src/symlist.h
@@ -1,6 +1,6 @@
 /* Lists of symbols for Bison
 
 /* Lists of symbols for Bison
 

-   Copyright (C) 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Copyright (C) 2002, 2005-2007, 2009-2012 Free Software Foundation,

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


@@ -34,8 +34,8 @@ typedef struct symbol_list
    * \c <>.
    */
   enum {
    * \c <>.
    */
   enum {

-    SYMLIST_SYMBOL, SYMLIST_TYPE,
-    SYMLIST_DEFAULT_TAGGED, SYMLIST_DEFAULT_TAGLESS
+    SYMLIST_SYMBOL,
+    SYMLIST_TYPE

   } content_type;
   union {
     /**
   } content_type;
   union {
     /**


@@ -46,7 +46,7 @@ typedef struct symbol_list
     /**
      * The semantic type iff <tt>symbol_list::content_type = SYMLIST_TYPE</tt>.
      */
     /**
      * The semantic type iff <tt>symbol_list::content_type = SYMLIST_TYPE</tt>.
      */

-    uniqstr type_name;
+    semantic_type *sem_type;

   } content;
   location location;
 
   } content;
   location location;
 


@@ -88,11 +88,6 @@ symbol_list *symbol_list_sym_new (symbol *sym, location loc);
 /** Create a list containing \c type_name at \c loc.  */
 symbol_list *symbol_list_type_new (uniqstr type_name, location loc);
 
 /** Create a list containing \c type_name at \c loc.  */
 symbol_list *symbol_list_type_new (uniqstr type_name, location loc);
 

-/** Create a list containing a \c <*> at \c loc.  */
-symbol_list *symbol_list_default_tagged_new (location loc);
-/** Create a list containing a \c <> at \c loc.  */
-symbol_list *symbol_list_default_tagless_new (location loc);
-

 /** Print this list.
 
   \pre For every node \c n in the list, <tt>n->content_type =
 /** Print this list.
 
   \pre For every node \c n in the list, <tt>n->content_type =


@@ -118,12 +113,9 @@ uniqstr symbol_list_n_type_name_get (symbol_list *l, location loc, int n);
 /* Check whether the node is a border element of a rule. */
 bool symbol_list_null (symbol_list *node);
 
 /* Check whether the node is a border element of a rule. */
 bool symbol_list_null (symbol_list *node);
 

-/** Set the \c \%destructor for \c node as \c code at \c loc.  */
-void symbol_list_destructor_set (symbol_list *node, char const *code,
-                                 location loc);
-
-/** Set the \c \%printer for \c node as \c code at \c loc.  */
-void symbol_list_printer_set (symbol_list *node, char const *code,
-                              location loc);
+/** Set the \c \%destructor or \c \%printer for \c node as \c code at
+    \c loc.  */
+void symbol_list_code_props_set (symbol_list *node, code_props_type kind,
+                                 location loc, char const *code);

 
 #endif /* !SYMLIST_H_ */
 
 #endif /* !SYMLIST_H_ */