tests: minor refactoring

[bison.git] / src / symlist.h

diff --git a/src/symlist.h b/src/symlist.h
index ab9a4b5eb0394819a99a75f234ff502d1a2f8069..137a7a324c2912a15378308832fe4d8262a66414 100644 (file)
--- a/src/symlist.h
+++ b/src/symlist.h
@@ -1,23 +1,22 @@
 /* Lists of symbols for Bison
 
 /* Lists of symbols for Bison
 

-   Copyright (C) 2002, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2007, 2009-2013 Free Software Foundation,
+   Inc.

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

-   Bison is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #ifndef SYMLIST_H_
 # define SYMLIST_H_
 
 #ifndef SYMLIST_H_
 # define SYMLIST_H_


@@ -25,6 +24,7 @@
 # include "location.h"
 # include "scan-code.h"
 # include "symtab.h"
 # include "location.h"
 # include "scan-code.h"
 # include "symtab.h"

+# include "named-ref.h"

 
 /* A list of symbols, used during the parsing to store the rules.  */
 typedef struct symbol_list
 
 /* A list of symbols, used during the parsing to store the rules.  */
 typedef struct symbol_list


@@ -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,10 +46,13 @@ 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;
 

+  /* Proper location of the symbol, not all the rule */
+  location sym_loc;
+

   /* If this symbol is the generated lhs for a midrule but this is the rule in
      whose rhs it appears, MIDRULE = a pointer to that midrule.  */
   struct symbol_list *midrule;
   /* If this symbol is the generated lhs for a midrule but this is the rule in
      whose rhs it appears, MIDRULE = a pointer to that midrule.  */
   struct symbol_list *midrule;


@@ -71,6 +74,9 @@ typedef struct symbol_list
   int merger;
   location merger_declaration_location;
 
   int merger;
   location merger_declaration_location;
 

+  /* Named reference. */
+  named_ref *named_ref;
+

   /* The list.  */
   struct symbol_list *next;
 } symbol_list;
   /* The list.  */
   struct symbol_list *next;
 } symbol_list;


@@ -82,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 =


@@ -109,12 +110,11 @@ 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 code at \c loc.  */
-void symbol_list_destructor_set (symbol_list *node, char const *code,
-                                 location loc);
+/* Check whether the node is a border element of a rule. */
+bool symbol_list_null (symbol_list *node);

 
 

-/** 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 cprops.  */
+void symbol_list_code_props_set (symbol_list *node, code_props_type kind,
+                                 code_props const *cprops);

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