Port to SunOS 4.1.4, which lacks strtoul and strerror.

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index a32e84f55aa9400fb96890d65fb38ec3bf61af7c..c47a16ebfc64f0edeabdd2cdfa64982f7fffd1c6 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, 2005 Free Software Foundation, Inc.

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


@@ -15,78 +16,68 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
 
    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_
 
 
 #ifndef READER_H_
 # define READER_H_
 

+# include "location.h"

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

+

 # include "parse-gram.h"
 
 typedef struct merger_list
 {
   struct merger_list* next;
 # include "parse-gram.h"
 
 typedef struct merger_list
 {
   struct merger_list* next;

-  struniq_t name;
-  struniq_t type;
-}
-merger_list;
-
-typedef struct gram_control_s
-{
-  int errcode;
-} gram_control_t;
+  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;

+extern boundary scanner_cursor;
+extern int max_left_semantic_context;

 void scanner_initialize (void);
 void scanner_free (void);
 void scanner_last_string_free (void);
 
 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)
+/* These are declared by the scanner, but not used.  We put them here
+   to pacify "make syntax-check".  */
+extern FILE *gram_out;
+extern int gram_lineno;
+
+# 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 (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 (symbol_t *s, location_t l);
-void prologue_augment (const char *prologue, location_t location);
-void epilogue_augment (const char *epilogue, location_t location);
-void grammar_symbol_append (symbol_t *s, location_t l);
-void grammar_rule_begin (symbol_t *lhs, location_t l);
-void grammar_rule_end (location_t l);
+void grammar_start_symbol_set (symbol *sym, location loc);
+void prologue_augment (const char *prologue, 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_midrule_action (void);

-void grammar_current_rule_prec_set (symbol_t *precsym, location_t l);
-void grammar_current_rule_dprec_set (int dprec, location_t l);
-void grammar_current_rule_merge_set (struniq_t name, location_t l);
+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_t *symbol, location_t l);
-void grammar_current_rule_action_append (const char *action, location_t l);
-extern symbol_list_t *current_rule;
+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;
 
 void reader (void);
 void free_merger_functions (void);
 
 extern merger_list *merge_functions;
 

-extern int typed;
+extern bool typed;
+extern bool default_prec;

 
 #endif /* !READER_H_ */
 
 #endif /* !READER_H_ */