Sync.

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index d35dd0518f8beaa80525e57ce0a8c5122ad3b647..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,69 +16,63 @@
 
    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_
 
 # include "location.h"
 
 #ifndef READER_H_
 # define READER_H_
 
 # include "location.h"

-
-typedef struct symbol_list
-{
-  struct symbol_list *next;
-  symbol_t *sym;
-  int line;
-
-  /* The action is attached to the LHS of a rule. */
-  const char *action;
-  int action_line;
-
-  symbol_t *ruleprec;
-} symbol_list;
+# include "symlist.h"

 
 # include "parse-gram.h"
 
 
 # include "parse-gram.h"
 

-typedef struct gram_control_s
+typedef struct merger_list

 {
 {

-  int errcode;
-} gram_control_t;
+  struct merger_list* next;
+  uniqstr name;
+  uniqstr type;
+} merger_list;

 
 /* From the scanner.  */
 extern FILE *gram_in;
 extern int gram__flex_debug;
 
 /* From the scanner.  */
 extern FILE *gram_in;
 extern int gram__flex_debug;

-void scanner_last_string_free PARAMS ((void));
-void scanner_initialize PARAMS ((void));
-void scanner_free PARAMS ((void));
+extern boundary scanner_cursor;
+extern int max_left_semantic_context;
+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;
 YY_DECL;
 
 
 /* From the parser.  */
 extern int gram_debug;

-void gram_error (gram_control_t *control,
-                location_t *loc, const char *msg);
-int gram_parse (void *control);
+int gram_parse (void);
+char const *token_name (int);

 
 

-char *get_type_name PARAMS ((int n, symbol_list *rule));
-extern int typed;

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

-void grammar_start_symbol_set PARAMS ((symbol_t *s));
-void prologue_augment PARAMS ((const char *prologue, location_t location));
-void epilogue_set PARAMS ((const char *epilogue, location_t location));
-void grammar_symbol_append PARAMS ((symbol_t *s));
-void grammar_rule_begin PARAMS ((symbol_t *lhs));
-void grammar_rule_end PARAMS ((void));
-void grammar_midrule_action PARAMS ((void));
-void grammar_current_rule_prec_set PARAMS ((symbol_t *precsym));
-void grammar_current_rule_symbol_append PARAMS ((symbol_t *symbol));
-void grammar_current_rule_action_append PARAMS ((const char *action,
-                                                int line));
+void grammar_start_symbol_set (symbol *sym, location loc);
+void prologue_augment (const char *prologue, 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_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;
 extern symbol_list *current_rule;

-void reader PARAMS ((void));
+void reader (void);
+void free_merger_functions (void);
+
+extern merger_list *merge_functions;
+
+extern bool typed;
+extern bool default_prec;

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