Fix bug such that the first pushed token's value and location are

[bison.git] / src / symlist.h

diff --git a/src/symlist.h b/src/symlist.h
index d08b158a62b9c6c4d3453c191a5088c633e54ab5..8bb7e8970f103462b408b45b65f5307c75c5bad9 100644 (file)
--- a/src/symlist.h
+++ b/src/symlist.h
@@ -22,7 +22,6 @@
 #ifndef SYMLIST_H_
 # define SYMLIST_H_
 
 #ifndef SYMLIST_H_
 # define SYMLIST_H_
 

-# include "scan-code.h"

 # include "location.h"
 # include "symtab.h"
 
 # include "location.h"
 # include "symtab.h"
 


@@ -31,21 +30,16 @@ typedef struct symbol_list
 {
   /**
    * Whether this node contains a symbol, a semantic type, a \c <*>, or a
 {
   /**
    * Whether this node contains a symbol, a semantic type, a \c <*>, or a

-   * \c <!>.
+   * \c <>.

    */
   enum {
     SYMLIST_SYMBOL, SYMLIST_TYPE,
     SYMLIST_DEFAULT_TAGGED, SYMLIST_DEFAULT_TAGLESS
   } content_type;
   union {
    */
   enum {
     SYMLIST_SYMBOL, SYMLIST_TYPE,
     SYMLIST_DEFAULT_TAGGED, SYMLIST_DEFAULT_TAGLESS
   } content_type;
   union {

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

     symbol *sym;
     symbol *sym;

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

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


@@ -61,9 +55,12 @@ 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, but action properties for
-   * each RHS are also stored here.  */
-  code_props action_props;
+  /* 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;

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


@@ -84,7 +81,7 @@ 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_tagged_new (location loc);

-/** Create a list containing a \c <!> at \c loc.  */
+/** Create a list containing a \c <> at \c loc.  */

 symbol_list *symbol_list_default_tagless_new (location loc);
 
 /** Print this list.
 symbol_list *symbol_list_default_tagless_new (location loc);
 
 /** Print this list.


@@ -109,12 +106,15 @@ 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);
 

+/** The item \c n in symbol list \c l is \c used.  */
+void symbol_list_n_used_set (symbol_list *l, int n, bool used);
+

 /** Set the \c \%destructor for \c node as \c destructor at \c loc.  */
 /** Set the \c \%destructor for \c node as \c destructor at \c loc.  */

-void symbol_list_destructor_set (symbol_list *node, const char *code,
+void symbol_list_destructor_set (symbol_list *node, const char *destructor,

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

                               location loc);
 
 #endif /* !SYMLIST_H_ */
                               location loc);
 
 #endif /* !SYMLIST_H_ */