* bootstrap: Undo changes to gnulib files that autoreconf made.

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index d10a7900a40604b7eae69201a9644828e745165c..3e8a7bd4b4306e389a727a07f0fb6cb0c464c0ab 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 Free Software Foundation, Inc.
+   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.
 


@@ -16,8 +16,8 @@
 
    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_


@@ -43,6 +43,11 @@ void scanner_initialize (void);
 void scanner_free (void);
 void scanner_last_string_free (void);
 
 void scanner_free (void);
 void scanner_last_string_free (void);
 

+/* 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;
 
 # define YY_DECL int gram_lex (YYSTYPE *val, location *loc)
 YY_DECL;
 


@@ -56,15 +61,11 @@ char const *token_name (int);
 /* From reader.c. */
 void grammar_start_symbol_set (symbol *sym, location loc);
 void prologue_augment (const char *prologue, location loc);
 /* 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 grammar_midrule_action (void);
+void grammar_current_rule_begin (symbol *lhs, location loc);
+void grammar_current_rule_end (location loc);

 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_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 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;


@@ -73,6 +74,10 @@ void free_merger_functions (void);
 
 extern merger_list *merge_functions;
 
 
 extern merger_list *merge_functions;
 

+/* Was %union seen?  */

 extern bool typed;
 
 extern bool typed;
 

+/* Should rules have a default precedence?  */
+extern bool default_prec;
+

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