Don't apply the default %destructor or %printer to the error token,

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index e2443fd2985554f301db630a727bde7c1b8bc485..43985965c4c41e893889c9731d04775e57d0969b 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,5 +1,7 @@
-/* Input parser for bison
-   Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.
+/* Input parser for Bison
+
+   Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -15,66 +17,54 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifndef READER_H_
 # define READER_H_
 
+# include "location.h"
 # include "symlist.h"
+
 # include "parse-gram.h"
 
-typedef struct gram_control_s
+typedef struct merger_list
 {
-  int errcode;
-} gram_control_t;
-
-/* From the scanner.  */
-extern FILE *gram_in;
-extern int gram__flex_debug;
-void scanner_last_string_free PARAMS ((void));
-void scanner_initialize PARAMS ((void));
-void scanner_free PARAMS ((void));
-
-# define YY_DECL \
-  int gram_lex (yystype *yylval, location_t *yylloc, \
-               gram_control_t *yycontrol)
-YY_DECL;
-
+  struct merger_list* next;
+  uniqstr name;
+  uniqstr type;
+  location type_declaration_location;
+} merger_list;
 
 /* From the parser.  */
 extern int gram_debug;
-void gram_error (gram_control_t *control,
-                location_t *loc, const char *msg);
-int gram_parse (void *control);
-
-/* The sort of braced code we are in.  */
-typedef enum braced_code_e
-  {
-    action_braced_code,
-    destructor_braced_code,
-    printer_braced_code
-  } braced_code_t;
-/* FIXME: This is really a dirty hack which demonstrates that we
-   should probably not try to parse the actions now.  */
-extern braced_code_t current_braced_code;
+int gram_parse (void);
+char const *token_name (int type);
 
 
 /* From reader.c. */
-void grammar_start_symbol_set PARAMS ((symbol_t *s, location_t l));
-void prologue_augment PARAMS ((const char *prologue, location_t location));
-void epilogue_set PARAMS ((const char *epilogue, location_t location));
-void grammar_symbol_append PARAMS ((symbol_t *s, location_t l));
-void grammar_rule_begin PARAMS ((symbol_t *lhs, location_t l));
-void grammar_rule_end PARAMS ((location_t l));
-void grammar_midrule_action PARAMS ((void));
-void grammar_current_rule_prec_set PARAMS ((symbol_t *precsym));
-void grammar_current_rule_symbol_append PARAMS ((symbol_t *symbol,
-                                                location_t l));
-void grammar_current_rule_action_append PARAMS ((const char *action,
-                                                location_t l));
-extern symbol_list_t *current_rule;
-void reader PARAMS ((void));
-extern int typed;
+void grammar_start_symbol_set (symbol *sym, location loc);
+void prologue_augment (const char *prologue, location loc, bool post);
+void grammar_current_rule_begin (symbol *lhs, location loc);
+void grammar_current_rule_end (location loc);
+void grammar_midrule_action (void);
+void grammar_current_rule_prec_set (symbol *precsym, location loc);
+void grammar_current_rule_dprec_set (int dprec, location loc);
+void grammar_current_rule_merge_set (uniqstr name, location loc);
+void grammar_current_rule_symbol_append (symbol *sym, location loc);
+void grammar_current_rule_action_append (const char *action, location loc);
+void reader (void);
+void free_merger_functions (void);
+
+extern merger_list *merge_functions;
+
+/* Was %union seen?  */
+extern bool union_seen;
+
+/* Was a tag seen?  */
+extern bool tag_seen;
+
+/* Should rules have a default precedence?  */
+extern bool default_prec;
 
 #endif /* !READER_H_ */