Merge remote-tracking branch 'origin/maint'

[bison.git] / src / symlist.h

diff --git a/src/symlist.h b/src/symlist.h
index e02c9e4f72d9cd147456a124d7cbce70975985bf..3b03713b3fd368c779fce5386f5699f6dd92d899 100644 (file)
--- a/src/symlist.h
+++ b/src/symlist.h
@@ -1,6 +1,7 @@
 /* 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.
 
@@ -45,7 +46,7 @@ typedef struct symbol_list
     /**
      * The semantic type iff <tt>symbol_list::content_type = SYMLIST_TYPE</tt>.
      */
-    uniqstr type_name;
+    semantic_type *sem_type;
   } content;
   location location;
 
@@ -117,12 +118,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);
 
-/** 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_ */