Pushed in master only. But already obsoleted by our desire to stay
away from Boolean variables. Yet it allows to stress some of the
infrastructure, so I pushed it.
* data/bison.m4 (b4_error_verbose_if): Based on error-verbose
instead of error_verbose.
* src/scan-gram.l (%error-verbose): Map the error-verbose
variable.
* doc/bison.texinfo: Promote %define error-verbose instead of
%error-verbose.
* tests/actions.at: Prefer %define error-verbose to %error-verbose.
From 71b00ed87431c17606afc2b44c9d320d347a76bc Mon Sep 17 00:00:00 2001
From: Akim Demaille <[email protected]>
Date: Mon, 20 Apr 2009 12:25:47 +0200
Subject: [PATCH 3/3] variables: prefer error-verbose to error_verbose.
* data/bison.m4 (b4_error_verbose_if): Based on error-verbose
instead of error_verbose.
* src/scan-gram.l (%error-verbose): Map the error-verbose
variable.
* doc/bison.texinfo: Promote %define error-verbose instead of
%error-verbose.
* tests/actions.at: Prefer %define error-verbose to %error-verbose.
---
ChangeLog | 11 +++++++++++
data/bison.m4 | 2 +-
doc/bison.texinfo | 45 ++++++++++++++++++++++++++++++++-------------
src/scan-gram.l | 2 +-
tests/actions.at | 16 ++++++++--------
5 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b8a5748..a90249b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2009-04-20 Akim Demaille <[email protected]>
+ variables: prefer error-verbose to error_verbose.
+ * data/bison.m4 (b4_error_verbose_if): Based on error-verbose
+ instead of error_verbose.
+ * src/scan-gram.l (%error-verbose): Map to the error-verbose
+ variable.
+ * doc/bison.texinfo: Promote %define error-verbose instead of
+ %error-verbose.
+ * tests/actions.at: Prefer %define error-verbose to %error-verbose.
+
+2009-04-15 Akim Demaille <[email protected]>
+
variables: accept dashes.
* data/bison.m4 (b4_percent_define_if_define_): Also map dashes to
underscores.
diff --git a/data/bison.m4 b/data/bison.m4
index 384f875..8c18d32 100644
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -684,7 +684,7 @@ b4_percent_define_if_define_([$1], $[1], $[2])])
# b4_lex_symbol_if([IF-YYLEX-RETURNS-A-COMPLETE-SYMBOL], [IF-NOT])
# b4_variant_if([IF-VARIANT-ARE-USED], [IF-NOT])
# ----------------------------------------------
-b4_percent_define_if_define([error_verbose])
+b4_percent_define_if_define([error-verbose])
b4_percent_define_if_define([lex_symbol])
b4_percent_define_if_define([locations]) # Whether locations are tracked.
b4_percent_define_if_define([parse.assert])
diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index a3a85a2..3670427 100644
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -4894,6 +4894,7 @@ Some of the accepted @var{variable}s are:
@item Default Value: @code{"false"}
@end itemize
+...@c api.pure
@item api.push_pull
@findex %define api.push_pull
@@ -4910,6 +4911,24 @@ More user feedback will help to stabilize it.)
@item Default Value: @code{"pull"}
@end itemize
+...@c api.push_pull
+
+...@item error-verbose
+...@findex %define error-verbose
+...@itemize
+...@item Languages(s):
+all.
+...@item Purpose:
+Enable the generation of more verbose error messages than a instead of
+just plain @w...@code{"syntax error"}}. @xref{Error Reporting, ,The Error
+Reporting Function @code{yyerror}}.
+...@item Accepted Values:
+Boolean
+...@item Default Value:
+...@code{false}
+...@end itemize
+...@c error-verbose
+
@item lr.keep_unreachable_states
@findex %define lr.keep_unreachable_states
@@ -4953,6 +4972,7 @@ states.
However, Bison does not compute which goto actions are useless.
@end itemize
@end itemize
+...@c lr.keep_unreachable_states
@item namespace
@findex %define namespace
@@ -5693,8 +5713,8 @@ called by @code{yyparse} whenever a syntax error is
found, and it
receives one argument. For a syntax error, the string is normally
@w...@code{"syntax error"}}.
-...@findex %error-verbose
-If you invoke the directive @code{%error-verbose} in the Bison
+...@findex %define error-verbose
+If you invoke the directive @code{%define error-verbose} in the Bison
declarations section (@pxref{Bison Declarations, ,The Bison Declarations
Section}), then Bison provides a more verbose and specific error message
string instead of just plain @w...@code{"syntax error"}}.
@@ -8584,7 +8604,7 @@ error messages.
@comment file: calc++-parser.yy
@example
%define parse.trace
-%error-verbose
+%define error-verbose
@end example
@noindent
@@ -9065,7 +9085,7 @@ Run the syntactic analysis, and return @code{true} on
success,
@deftypemethod {YYParser} {boolean} getErrorVerbose ()
@deftypemethodx {YYParser} {void} setErrorVerbose (boolean @var{verbose})
Get or set the option to produce verbose error messages. These are only
-available with the @code{%error-verbose} directive, which also turn on
+available with the @code{%define error-verbose} directive, which also turn on
verbose error messages.
@end deftypemethod
@@ -9994,8 +10014,7 @@ token is reset to the token that originally caused the
violation.
@end deffn
@deffn {Directive} %error-verbose
-Bison declaration to request verbose, specific error message strings
-when @code{yyerror} is called.
+An obsolete directive standing for @samp{%define error-verbose}.
@end deffn
@deffn {Directive} %file-prefix "@var{prefix}"
@@ -10193,16 +10212,16 @@ instead.
@deffn {Function} yyerror
User-supplied function to be called by @code{yyparse} on error.
-...@xref{error Reporting, ,The Error
-Reporting Function @code{yyerror}}.
+...@xref{error Reporting, ,The Error Reporting Function @code{yyerror}}.
@end deffn
@deffn {Macro} YYERROR_VERBOSE
-An obsolete macro that you define with @code{#define} in the prologue
-to request verbose, specific error message strings
-when @code{yyerror} is called. It doesn't matter what definition you
-use for @code{YYERROR_VERBOSE}, just whether you define it. Using
-...@code{%error-verbose} is preferred.
+An obsolete macro used in the @file{yacc.c} skeleton, that you define
+with @code{#define} in the prologue to request verbose, specific error
+message strings when @code{yyerror} is called. It doesn't matter what
+definition you use for @code{YYERROR_VERBOSE}, just whether you define
+it. Using @code{%define error-verbose} is preferred (@pxref{Error
+Reporting, ,The Error Reporting Function @code{yyerror}}).
@end deffn
@deffn {Macro} YYINITDEPTH
diff --git a/src/scan-gram.l b/src/scan-gram.l
index bc7592e..2eb3666 100644
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -181,7 +181,7 @@ splice (\\[ \f\t\v]*\n)*
"%defines" return PERCENT_DEFINES;
"%destructor" return PERCENT_DESTRUCTOR;
"%dprec" return PERCENT_DPREC;
- "%error"[-_]"verbose" RETURN_PERCENT_FLAG("error_verbose");
+ "%error"[-_]"verbose" RETURN_PERCENT_FLAG("error-verbose");
"%expect" return PERCENT_EXPECT;
"%expect"[-_]"rr" return PERCENT_EXPECT_RR;
"%file-prefix" return PERCENT_FILE_PREFIX;
diff --git a/tests/actions.at b/tests/actions.at
index 841ae39..371cf84 100644
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1,6 +1,6 @@
# Executing Actions. -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
# 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
@@ -29,7 +29,7 @@ AT_SETUP([Mid-rule actions])
# action.
AT_DATA_GRAMMAR([[input.y]],
-[[%error-verbose
+[[%define error-verbose
%debug
%{
# include <stdio.h>
@@ -93,7 +93,7 @@ AT_CLEANUP
AT_SETUP([Exotic Dollars])
AT_DATA_GRAMMAR([[input.y]],
-[[%error-verbose
+[[%define error-verbose
%debug
%{
# include <stdio.h>
@@ -557,7 +557,7 @@ m4_define([AT_CHECK_PRINTER_AND_DESTRUCTOR],
$3
_AT_CHECK_PRINTER_AND_DESTRUCTOR($[1], $[2], $[3], $[4],
-[%error-verbose
+[%define error-verbose
%debug
%verbose
%locations
@@ -588,7 +588,7 @@ AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser], [with union])
AT_SETUP([Default tagless %printer and %destructor])
AT_DATA_GRAMMAR([[input.y]],
-[[%error-verbose
+[[%define error-verbose
%debug
%locations
%initial-action {
@@ -706,7 +706,7 @@ AT_CLEANUP
AT_SETUP([Default tagged and per-type %printer and %destructor])
AT_DATA_GRAMMAR([[input.y]],
-[[%error-verbose
+[[%define error-verbose
%debug
%{
@@ -850,7 +850,7 @@
m4_define([_AT_CHECK_DEFAULT_PRINTER_AND_DESTRUCTOR_FOR_END_TOKEN],
[m4_pushdef([kind], [*]) m4_pushdef([not_kind], [])])
AT_DATA_GRAMMAR([[input]]$1[[.y]],
-[[%error-verbose
+[[%define error-verbose
%debug
%locations
%initial-action {
--
1.6.2.2
