style: use %code for local function declarations in our parser

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index a16bfaf3b9daa4ff1b7ed961443438ebe83f9eca..ba6ffe6edca76c8a91d2a4a81c5ee9e03cbd034e 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,30 +1,29 @@
 /* Input parser for Bison
 
 /* Input parser for Bison
 

-   Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006 Free Software
+   Copyright (C) 2000-2003, 2005-2007, 2009-2013 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.
 

-   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
    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
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, 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"
 
 #ifndef READER_H_
 # define READER_H_
 
 # include "location.h"
 # include "symlist.h"

+# include "named-ref.h"

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


@@ -33,6 +32,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,23 +43,29 @@ 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, bool post);
-void grammar_current_rule_begin (symbol *lhs, 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_end (location loc);
 void grammar_midrule_action (void);

+/* Apply %empty to the current rule.  */
+void grammar_current_rule_empty_set (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,
+                                         named_ref *nref);
+void grammar_current_rule_action_append (const char *action, location loc,
+                                         named_ref *nref, bool);

 void reader (void);
 void free_merger_functions (void);
 
 extern merger_list *merge_functions;
 
 /* Was %union seen?  */
 void reader (void);
 void free_merger_functions (void);
 
 extern merger_list *merge_functions;
 
 /* Was %union seen?  */

-extern bool typed;
+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;