* lib/bitset.h (__INT_TO_PTR): Define to a value that presumes C89.

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index 38e988229307b110c7936c22dda187268b6755dd..56c4f5c392a73681ff3f996557cdeaaab3efc9c9 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,5 +1,6 @@
-/* Input parser for bison
-   Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.
+/* Input parser for Bison
+
+   Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.

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


@@ -21,61 +22,56 @@
 #ifndef READER_H_
 # define READER_H_
 
 #ifndef READER_H_
 # define READER_H_
 

+# include "location.h"

 # include "symlist.h"
 # include "symlist.h"

+

 # include "parse-gram.h"
 
 # include "parse-gram.h"
 

-typedef struct gram_control_s
+typedef struct merger_list

 {
 {

-  int errcode;
-} gram_control_t;
+  struct merger_list* next;
+  uniqstr name;
+  uniqstr type;
+} merger_list;

 
 /* From the scanner.  */
 extern FILE *gram_in;
 extern int gram__flex_debug;
 
 /* 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));
+extern boundary scanner_cursor;
+void scanner_initialize (void);
+void scanner_free (void);
+void scanner_last_string_free (void);

 
 

-# define YY_DECL \
-  int gram_lex (yystype *yylval, location_t *yylloc, \
-               gram_control_t *yycontrol)
+# define YY_DECL int gram_lex (YYSTYPE *val, location *loc)

 YY_DECL;
 
 
 /* From the parser.  */
 extern int gram_debug;
 YY_DECL;
 
 
 /* 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);

 
 
 /* From reader.c. */
 
 
 /* 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,
-                                           location_t l));
-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));
+void grammar_start_symbol_set (symbol *sym, location loc);
+void prologue_augment (const char *prologue, location loc);
+void epilogue_augment (const char *epilogue, location loc);
+void grammar_symbol_append (symbol *sym, location loc);
+void grammar_rule_begin (symbol *lhs, location loc);
+void grammar_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);
+extern symbol_list *current_rule;
+void reader (void);
+void free_merger_functions (void);
+
+extern merger_list *merge_functions;
+

 extern int typed;
 
 #endif /* !READER_H_ */
 extern int typed;
 
 #endif /* !READER_H_ */