Sync.

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index 7e7cb5f2adebaf90d7acfe82d27d3598507892d9..d7d53015e6fa0e67e5fd0bf9324cc5c7e937a0ac 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 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,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_


@@ -37,35 +38,25 @@ typedef struct merger_list
 extern FILE *gram_in;
 extern int gram__flex_debug;
 extern boundary scanner_cursor;
 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 *val, location *loc)
+# define YY_DECL int gram_lex (YYSTYPE *val, location *loc)

 YY_DECL;
 
 
 /* From the parser.  */
 extern int gram_debug;
 int gram_parse (void);
 YY_DECL;
 
 
 /* From the parser.  */
 extern int gram_debug;
 int gram_parse (void);

-
-/* The sort of braced code we are in.  */
-typedef enum
-  {
-    action_braced_code,
-    destructor_braced_code,
-    printer_braced_code
-  } 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 current_braced_code;
+char const *token_name (int);

 
 
 /* From reader.c. */
 
 
 /* From reader.c. */

-void grammar_start_symbol_set (symbol *s, location loc);
+void grammar_start_symbol_set (symbol *sym, location loc);

 void prologue_augment (const char *prologue, 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_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_rule_begin (symbol *lhs, location loc);
 void grammar_rule_end (location loc);
 void grammar_midrule_action (void);


@@ -81,6 +72,7 @@ void free_merger_functions (void);
 
 extern merger_list *merge_functions;
 
 
 extern merger_list *merge_functions;
 

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

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