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.

diff --git a/ChangeLog b/ChangeLog
index b8a5748b4c6b1b0efccac5034b79745e07d511bf..a90249b493830facecaf9986cfdde545a4f724d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-04-20  Akim Demaille  <demaille@gostai.com>
 
 2009-04-20  Akim Demaille  <demaille@gostai.com>
 

+       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  <demaille@gostai.com>
+

        variables: accept dashes.
        * data/bison.m4 (b4_percent_define_if_define_): Also map dashes to
        underscores.
        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 384f875a01e7b0572d80fb7e26aab2f0b132e459..8c18d32c9ad6b3c21f7bd49342c53781a5a96076 100644 (file)
--- 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_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])
 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 a3a85a2b35617e173492bf12a773ad9979b2c6eb..367042713b9ebd923d65288c1c4b5093f3c1de20 100644 (file)
--- 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
 
 @item Default Value: @code{"false"}
 @end itemize

+@c api.pure

 
 @item api.push_pull
 @findex %define api.push_pull
 
 @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
 
 @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
 
 @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
 However, Bison does not compute which goto actions are useless.
 @end itemize
 @end itemize

+@c lr.keep_unreachable_states

 
 @item namespace
 @findex %define namespace
 
 @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"}}.
 
 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"}}.
 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
 @comment file: calc++-parser.yy
 @example
 %define parse.trace

-%error-verbose
+%define error-verbose

 @end example
 
 @noindent
 @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
 @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
 
 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
 @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}"
 @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.
 
 @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
 @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
 @end deffn
 
 @deffn {Macro} YYINITDEPTH

diff --git a/src/scan-gram.l b/src/scan-gram.l
index bc7592ec3e996f9143119c3cfad5043ca49cdb1c..2eb36664cd486f1295cddcbb281b7a57a8362f0e 100644 (file)
--- 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;
   "%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;
   "%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 841ae3925898662bc29299a70500ae96529d6af5..371cf84fa5cf9b9368500ce81e5bee961c4d339f 100644 (file)
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1,6 +1,6 @@
 # Executing Actions.                               -*- Autotest -*-
 # 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
 
 # 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]],
 # action.
 
 AT_DATA_GRAMMAR([[input.y]],

-[[%error-verbose
+[[%define error-verbose

 %debug
 %{
 # include <stdio.h>
 %debug
 %{
 # include <stdio.h>


@@ -93,7 +93,7 @@ AT_CLEANUP
 AT_SETUP([Exotic Dollars])
 
 AT_DATA_GRAMMAR([[input.y]],
 AT_SETUP([Exotic Dollars])
 
 AT_DATA_GRAMMAR([[input.y]],

-[[%error-verbose
+[[%define error-verbose

 %debug
 %{
 # include <stdio.h>
 %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],
 
 $3
 _AT_CHECK_PRINTER_AND_DESTRUCTOR($[1], $[2], $[3], $[4],

-[%error-verbose
+[%define error-verbose

 %debug
 %verbose
 %locations
 %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]],
 AT_SETUP([Default tagless %printer and %destructor])
 
 AT_DATA_GRAMMAR([[input.y]],

-[[%error-verbose
+[[%define error-verbose

 %debug
 %locations
 %initial-action {
 %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]],
 AT_SETUP([Default tagged and per-type %printer and %destructor])
 
 AT_DATA_GRAMMAR([[input.y]],

-[[%error-verbose
+[[%define error-verbose

 %debug
 
 %{
 %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]],
   [m4_pushdef([kind], [*]) m4_pushdef([not_kind], [])])
 
 AT_DATA_GRAMMAR([[input]]$1[[.y]],

-[[%error-verbose
+[[%define error-verbose

 %debug
 %locations
 %initial-action {
 %debug
 %locations
 %initial-action {