X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/95612cfa608188fc323ed3f8560cc6aea953ff32..bb7c2bc6236c317205e0dc3323633f1d3cee2c49:/src/reader.h

diff --git a/src/reader.h b/src/reader.h
index cca624ac..7e7cb5f2 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,5 +1,5 @@
 /* Input parser for bison
-   Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -21,66 +21,61 @@
 #ifndef READER_H_
 # define READER_H_
 
+# include "location.h"
 # include "symlist.h"
+
 # 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;
+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;
-void gram_error (location_t *loc, const char *msg);
-int gram_parse (void *control);
+int gram_parse (void);
 
 /* The sort of braced code we are in.  */
-typedef enum braced_code_e
+typedef enum
   {
     action_braced_code,
     destructor_braced_code,
     printer_braced_code
-  } braced_code_t;
+  } braced_code;
 /* 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;
+extern braced_code current_braced_code;
 
 
 /* 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_set (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 *s, location loc);
+void prologue_augment (const char *prologue, location loc);
+void epilogue_augment (const char *epilogue, location loc);
+void grammar_symbol_append (symbol *s, 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_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);