Merge remote-tracking branch 'origin/maint'

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index e57100522a16ed6663c3b55b38e3d8bb56bc092a..2a78f30ab863e2b95b9060824d31f36fc3825d44 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,7 +1,7 @@
 /* Input parser for Bison
 
 /* Input parser for Bison
 

-   Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2005-2007, 2009-2012 Free Software
+   Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -44,16 +44,16 @@ char const *token_name (int type);
 /* From reader.c. */
 void grammar_start_symbol_set (symbol *sym, location loc);
 void grammar_current_rule_begin (symbol *lhs, location loc,
 /* From reader.c. */
 void grammar_start_symbol_set (symbol *sym, location loc);
 void grammar_current_rule_begin (symbol *lhs, location loc,

-                                named_ref *lhs_named_ref);
+                                 named_ref *lhs_named_ref);

 void grammar_current_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_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,

-                                        named_ref *named_ref);
+                                         named_ref *named_ref);

 void grammar_current_rule_action_append (const char *action, location loc,
 void grammar_current_rule_action_append (const char *action, location loc,

-                                        named_ref *named_ref);
+                                         named_ref *named_ref, bool);

 void reader (void);
 void free_merger_functions (void);
 
 void reader (void);
 void free_merger_functions (void);