Merge branch 'rightlib' into mergelibs-240708-1553

1 files changed, 8 insertions, 7 deletions

diff --git a/contrib/tools/bison/src/reader.h b/contrib/tools/bison/src/reader.h
index ba6ffe6edc..9f59dc0053 100644
--- a/contrib/tools/bison/src/reader.h
+++ b/contrib/tools/bison/src/reader.h
@@ -1,7 +1,7 @@
 /* Input parser for Bison
 
-   Copyright (C) 2000-2003, 2005-2007, 2009-2013 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000-2003, 2005-2007, 2009-2015, 2018-2019 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -38,7 +38,6 @@ typedef struct merger_list
 /* From the parser.  */
 extern int gram_debug;
 int gram_parse (void);
-char const *token_name (int type);
 
 
 /* From reader.c. */
@@ -52,10 +51,15 @@ 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_expect_sr (int count, location loc);
+void grammar_current_rule_expect_rr (int count, location loc);
 void grammar_current_rule_symbol_append (symbol *sym, location loc,
                                          named_ref *nref);
+/* Attach an ACTION to the current rule.  */
 void grammar_current_rule_action_append (const char *action, location loc,
-                                         named_ref *nref, bool);
+                                         named_ref *nref, uniqstr tag);
+/* Attach a PREDICATE to the current rule.  */
+void grammar_current_rule_predicate_append (const char *predicate, location loc);
 void reader (void);
 void free_merger_functions (void);
 
@@ -64,9 +68,6 @@ extern merger_list *merge_functions;
 /* 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;