Merge remote-tracking branch 'origin/maint'

[bison.git] / src / symlist.h

diff --git a/src/symlist.h b/src/symlist.h
index 0bd4f3b09f5b62cfe164e7e6e1b0491e34a1bfa3..03ffebef16572034acc847f03c7a5e78e9c98fe2 100644 (file)
--- a/src/symlist.h
+++ b/src/symlist.h
@@ -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,9 +113,8 @@ 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 or \c \%printer for \c node as \c code at
-    \c loc.  */
+/** Set the \c \%destructor or \c \%printer for \c node as \c cprops.  */

 void symbol_list_code_props_set (symbol_list *node, code_props_type kind,
 void symbol_list_code_props_set (symbol_list *node, code_props_type kind,

-                                 location loc, char const *code);
+                                 code_props const *cprops);

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