Use ASCII for Sebastien Fricker's name.

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index d49f8f67bce4c650d4a86b22286e84cd445d6816..0e0b4e8be20a9077f0f065a70ac3c05c41b78384 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,6 +1,6 @@
 /* Input parser for Bison
 
 /* Input parser for Bison
 

-   Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006 Free Software
+   Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007 Free Software

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


@@ -33,6 +33,7 @@ typedef struct merger_list
   struct merger_list* next;
   uniqstr name;
   uniqstr type;
   struct merger_list* next;
   uniqstr name;
   uniqstr type;

+  location type_declaration_location;

 } merger_list;
 
 /* From the parser.  */
 } merger_list;
 
 /* From the parser.  */


@@ -43,7 +44,6 @@ char const *token_name (int type);
 
 /* From reader.c. */
 void grammar_start_symbol_set (symbol *sym, location loc);
 
 /* From reader.c. */
 void grammar_start_symbol_set (symbol *sym, location loc);

-void prologue_augment (const char *prologue, location loc);

 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_begin (symbol *lhs, location loc);
 void grammar_current_rule_end (location loc);
 void grammar_midrule_action (void);


@@ -52,16 +52,16 @@ 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 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;
 
 void reader (void);
 void free_merger_functions (void);
 
 extern merger_list *merge_functions;
 

-/* Was %union, %before-definitions, or %after-definitions seen?  */
-extern bool typed;
-extern bool before_definitions;
-extern bool after_definitions;
+/* 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;
 
 /* Should rules have a default precedence?  */
 extern bool default_prec;