Merge remote-tracking branch 'origin/maint'

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index c241344f72a9234fd624cc101283b88fdaf9aa74..2a78f30ab863e2b95b9060824d31f36fc3825d44 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,91 +1,71 @@
-/* Input parser for bison
-   Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.
+/* Input parser for Bison
+
+   Copyright (C) 2000-2003, 2005-2007, 2009-2012 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
-   Bison is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef READER_H_
 # define READER_H_
 
+# include "location.h"
 # include "symlist.h"
+# include "named-ref.h"
+
 # include "parse-gram.h"
 
 typedef struct merger_list
 {
   struct merger_list* next;
-  const char* name;
-  const char* type;
-}
-merger_list;
-
-typedef struct gram_control_s
-{
-  int errcode;
-} gram_control_t;
-
-/* From the scanner.  */
-extern FILE *gram_in;
-extern int gram__flex_debug;
-void scanner_initialize (void);
-void scanner_free (void);
-
-# define YY_DECL \
-  int gram_lex (yystype *yylval, location_t *yylloc, \
-               gram_control_t *yycontrol)
-YY_DECL;
-
+  uniqstr name;
+  uniqstr type;
+  location type_declaration_location;
+} merger_list;
 
 /* From the parser.  */
 extern int gram_debug;
-void gram_error (location_t *loc, const char *msg);
-int gram_parse (void *control);
-
-/* The sort of braced code we are in.  */
-typedef enum braced_code_e
-  {
-    action_braced_code,
-    destructor_braced_code,
-    printer_braced_code
-  } braced_code_t;
-/* FIXME: This is really a dirty hack which demonstrates that we
-   should probably not try to parse the actions now.  */
-extern braced_code_t current_braced_code;
+int gram_parse (void);
+char const *token_name (int type);
 
 
 /* From reader.c. */
-void grammar_start_symbol_set (symbol_t *s, location_t l);
-void prologue_augment (const char *prologue, location_t location);
-void epilogue_set (const char *epilogue, location_t location);
-void grammar_symbol_append (symbol_t *s, location_t l);
-void grammar_rule_begin (symbol_t *lhs, location_t l);
-void grammar_rule_end (location_t l);
+void grammar_start_symbol_set (symbol *sym, location loc);
+void grammar_current_rule_begin (symbol *lhs, location loc,
+                                 named_ref *lhs_named_ref);
+void grammar_current_rule_end (location loc);
 void grammar_midrule_action (void);
-void grammar_current_rule_prec_set (symbol_t *precsym, location_t l);
-void grammar_current_rule_dprec_set (int dprec, location_t l);
-void grammar_current_rule_merge_set (const char* name, location_t l);
-
-void grammar_current_rule_symbol_append (symbol_t *symbol, location_t l);
-void grammar_current_rule_action_append (const char *action, location_t l);
-extern symbol_list_t *current_rule;
+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,
+                                         named_ref *named_ref);
+void grammar_current_rule_action_append (const char *action, location loc,
+                                         named_ref *named_ref, bool);
 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_ */