Revert 2009-12-30 change for undefined %prec token complaints.

That is, keep them as warnings because that should be sufficient
to satisfy POSIX without creating backward compatibility issues.
Suggested by Richard Stallman at
<http://lists.gnu.org/archive/html/bison-patches/2010-03/msg00033.html>.
* NEWS (2.5): Remove mention of complaint.
* src/reader.c (grammar_rule_check): Convert warning back to
complaint.
* tests/input.at (%prec's token must be defined): Update.
(cherry picked from commit 02354690ee02dfa05564137aafc6721eb54d21ab)

diff --git a/ChangeLog b/ChangeLog
index 0afeb458c5ad28ec335615a563a546691d760713..5f7e63bcb793505a916b78e4e5008b742e46a302 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-04-30  Joel E. Denny  <joeldenny@joeldenny.org>
+
+       Revert 2009-12-30 change for undefined %prec token complaints.
+       That is, keep them as warnings because that should be sufficient
+       to satisfy POSIX without creating backward compatibility issues.
+       Suggested by Richard Stallman at
+       <http://lists.gnu.org/archive/html/bison-patches/2010-03/msg00033.html>.
+       * NEWS (2.5): Remove mention of complaint.
+       * src/reader.c (grammar_rule_check): Convert warning back to
+       complaint.
+       * tests/input.at (%prec's token must be defined): Update.
+
 2010-04-25  Joel E. Denny  <joeldenny@joeldenny.org>
 
        build: don't require src/bison during bootstrap.

diff --git a/NEWS b/NEWS
index df2c9f17a887ea9b86a41d40b05cc1c6b68a9c70..b2e9e7c6d11e5ba44d295bd630c6d8fec64bc0b3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -130,12 +130,6 @@ Bison News
   discussion of how to suppress C preprocessor warnings about YYFAIL
   being unused, see the Bison 2.4.2 NEWS entry.
 
-** `%prec IDENTIFIER' requires IDENTIFIER to be defined separately.
-
-  As promised in Bison 2.4.2's NEWS entry, it is now an error if a token
-  that appears after a %prec directive is not defined by %token, %left,
-  %right, or %nonassoc.  This is required by POSIX.
-
 ** Temporary hack for adding a semicolon to the user action.
 
   Previously, Bison appended a semicolon to every user action for

diff --git a/src/reader.c b/src/reader.c
index 03c5bae5cc74c5221f8878b3e9a528e2e3360d7f..f1be24b38c495c2334f262a6f08b3bfba5ce635f 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -327,8 +327,8 @@ grammar_rule_check (const symbol_list *r)
   if (r->ruleprec
       && r->ruleprec->tag[0] != '\'' && r->ruleprec->tag[0] != '"'
       && !r->ruleprec->declared && !r->ruleprec->prec)
-    complain_at (r->location, _("token for %%prec is not defined: %s"),
-                 r->ruleprec->tag);
+    warn_at (r->location, _("token for %%prec is not defined: %s"),
+             r->ruleprec->tag);
 }
 
 

diff --git a/tests/input.at b/tests/input.at
index fb537cee5ed30f4e45639caef8d37ac4a13f1786..960b931acfd6d8c283d257ed0c701af114f34afd 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -811,8 +811,8 @@ AT_DATA([[input.y]],
 start: %prec PREC ;
 ]])
 
-AT_BISON_CHECK([[input.y]], [[1]], [],
-[[input.y:2.8-17: token for %prec is not defined: PREC
+AT_BISON_CHECK([[input.y]], [[0]], [],
+[[input.y:2.8-17: warning: token for %prec is not defined: PREC
 ]])
 
 AT_CLEANUP