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

[bison.git] / src / symlist.h

diff --git a/src/symlist.h b/src/symlist.h
index 796edee0e4390e6f791507eb89c1c250e756bccc..ab9a4b5eb0394819a99a75f234ff502d1a2f8069 100644 (file)
--- a/src/symlist.h
+++ b/src/symlist.h
@@ -23,6 +23,7 @@
 # define SYMLIST_H_
 
 # include "location.h"
 # define SYMLIST_H_
 
 # include "location.h"

+# include "scan-code.h"

 # include "symtab.h"
 
 /* A list of symbols, used during the parsing to store the rules.  */
 # include "symtab.h"
 
 /* A list of symbols, used during the parsing to store the rules.  */


@@ -37,9 +38,14 @@ typedef struct symbol_list
     SYMLIST_DEFAULT_TAGGED, SYMLIST_DEFAULT_TAGLESS
   } content_type;
   union {
     SYMLIST_DEFAULT_TAGGED, SYMLIST_DEFAULT_TAGLESS
   } content_type;
   union {

-    /** The symbol or \c NULL iff <tt>node_type = SYMLIST_SYMBOL</tt>.  */
+    /**
+     * The symbol or \c NULL iff
+     * <tt>symbol_list::content_type = SYMLIST_SYMBOL</tt>.
+     */

     symbol *sym;
     symbol *sym;

-    /** The semantic type iff <tt>node_type = SYMLIST_TYPE</tt>.  */
+    /**
+     * The semantic type iff <tt>symbol_list::content_type = SYMLIST_TYPE</tt>.
+     */

     uniqstr type_name;
   } content;
   location location;
     uniqstr type_name;
   } content;
   location location;


@@ -55,12 +61,9 @@ typedef struct symbol_list
   struct symbol_list *midrule_parent_rule;
   int midrule_parent_rhs_index;
 
   struct symbol_list *midrule_parent_rule;
   int midrule_parent_rhs_index;
 

-  /* The action is attached to the LHS of a rule. */
-  const char *action;
-  location action_location;
-
-  /* Whether this symbol's value is used in the current action.  */
-  bool used;
+  /* The action is attached to the LHS of a rule, but action properties for
+   * each RHS are also stored here.  */
+  code_props action_props;

 
   /* Precedence/associativity.  */
   symbol *ruleprec;
 
   /* Precedence/associativity.  */
   symbol *ruleprec;


@@ -106,12 +109,12 @@ symbol_list *symbol_list_n_get (symbol_list *l, int n);
    symbol N in rule RULE.  */
 uniqstr symbol_list_n_type_name_get (symbol_list *l, location loc, int n);
 
    symbol N in rule RULE.  */
 uniqstr symbol_list_n_type_name_get (symbol_list *l, location loc, int n);
 

-/** Set the \c \%destructor for \c node as \c destructor at \c loc.  */
-void symbol_list_destructor_set (symbol_list *node, const char *destructor,
+/** 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);
 
                                  location loc);
 

-/** Set the \c \%printer for \c node as \c printer at \c loc.  */
-void symbol_list_printer_set (symbol_list *node, const char *printer,
+/** 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);
 
 #endif /* !SYMLIST_H_ */
                               location loc);
 
 #endif /* !SYMLIST_H_ */