Rearrange initialization of the parser state variables so that the

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index 56c4f5c392a73681ff3f996557cdeaaab3efc9c9..43985965c4c41e893889c9731d04775e57d0969b 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,6 +1,7 @@
 /* Input parser for Bison
 
-   Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -16,8 +17,8 @@
 
    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_
@@ -32,46 +33,38 @@ typedef struct merger_list
   struct merger_list* next;
   uniqstr name;
   uniqstr type;
+  location type_declaration_location;
 } 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 *val, location *loc)
-YY_DECL;
-
-
 /* From the parser.  */
 extern int gram_debug;
 int gram_parse (void);
-char const *token_name (int);
+char const *token_name (int type);
 
 
 /* From reader.c. */
 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 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);
-extern symbol_list *current_rule;
 void reader (void);
 void free_merger_functions (void);
 
 extern merger_list *merge_functions;
 
-extern int typed;
+/* 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_ */