d: remove support for parse.error verbose

Without the history, D should not support this option. Before the removal, 'detailed' and 'verbose' options generated the same code. * data/skeletons/lalr1.d: Here. * doc/bison.texi: Adapt tests to use 'detailed' instead of 'verbose'. * tests/calc.at: Document it.
akimd · Jan 7, 2021 · c13b3c0 · c13b3c0
1 parent f859462
commit c13b3c0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/data/skeletons/lalr1.d b/data/skeletons/lalr1.d
@@ -690,7 +690,7 @@ m4_popdef([b4_at_dollar])])dnl
   {]b4_parse_error_bmatch(
 [custom], [[
     yylexer.reportSyntaxError(yyctx);]],
-[detailed\|verbose], [[
+[detailed], [[
     if (yyctx.getToken() != ]b4_symbol(empty, kind)[)
     {
       // FIXME: This method of building the message is not compatible
@@ -732,7 +732,7 @@ m4_popdef([b4_at_dollar])])dnl
   }
 
 ]b4_parse_error_bmatch(
-[detailed\|verbose], [[
+[detailed], [[
   private int yysyntaxErrorArguments(Context yyctx, SymbolKind[] yyarg, int yyargn) {
     /* There are many possibilities here to consider:
        - If this state is a consistent state with a default action,

diff --git a/doc/bison.texi b/doc/bison.texi
@@ -13919,7 +13919,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 @samp{%define parse.error detailed} (or @samp{verbose}),
+available with @samp{%define parse.error detailed},
 which also turns on verbose error messages.
 @end deftypemethod
 

diff --git a/examples/d/calc/calc.y b/examples/d/calc/calc.y
@@ -20,7 +20,7 @@
 %language "D"
 
 %define api.parser.class {Calc}
-%define parse.error verbose
+%define parse.error detailed
 %define parse.trace
 
 %locations

diff --git a/examples/d/simple/calc.y b/examples/d/simple/calc.y
@@ -20,7 +20,7 @@
 %language "D"
 
 %define api.parser.class {Calc}
-%define parse.error verbose
+%define parse.error detailed
 
 %union {
   int ival;

diff --git a/tests/calc.at b/tests/calc.at
@@ -1453,26 +1453,25 @@ m4_define([AT_CHECK_CALC_LALR1_D],
 AT_CHECK_CALC_LALR1_D([])
 AT_CHECK_CALC_LALR1_D([%locations])
 #AT_CHECK_CALC_LALR1_D([%locations %define api.location.type {Span}])
-AT_CHECK_CALC_LALR1_D([%define parse.error verbose %define api.prefix {calc} %verbose])
+AT_CHECK_CALC_LALR1_D([%define parse.error detailed %define api.prefix {calc} %verbose])
 
 AT_CHECK_CALC_LALR1_D([%debug])
 
 AT_CHECK_CALC_LALR1_D([%define parse.error custom])
 AT_CHECK_CALC_LALR1_D([%locations %define parse.error custom])
 AT_CHECK_CALC_LALR1_D([%locations %define parse.error detailed])
 AT_CHECK_CALC_LALR1_D([%locations %define parse.error simple])
-AT_CHECK_CALC_LALR1_D([%locations %define parse.error verbose])
-AT_CHECK_CALC_LALR1_D([%define parse.error verbose %debug %verbose])
-AT_CHECK_CALC_LALR1_D([%define parse.error verbose %debug %define api.token.prefix {TOK_} %verbose])
-AT_CHECK_CALC_LALR1_D([%define parse.error verbose %debug %define api.symbol.prefix {SYMB_} %verbose])
-AT_CHECK_CALC_LALR1_D([%define parse.error verbose %debug %define api.symbol.prefix {SYMB_} %define api.token.prefix {TOK_} %verbose])
+AT_CHECK_CALC_LALR1_D([%define parse.error detailed %debug %verbose])
+AT_CHECK_CALC_LALR1_D([%define parse.error detailed %debug %define api.token.prefix {TOK_} %verbose])
+AT_CHECK_CALC_LALR1_D([%define parse.error detailed %debug %define api.symbol.prefix {SYMB_} %verbose])
+AT_CHECK_CALC_LALR1_D([%define parse.error detailed %debug %define api.symbol.prefix {SYMB_} %define api.token.prefix {TOK_} %verbose])
 
-AT_CHECK_CALC_LALR1_D([%locations %define parse.lac full %define parse.error verbose])
+AT_CHECK_CALC_LALR1_D([%locations %define parse.lac full %define parse.error detailed])
 AT_CHECK_CALC_LALR1_D([%locations %define parse.lac full %define parse.error custom])
 AT_CHECK_CALC_LALR1_D([%locations %define parse.lac full %define parse.error detailed %define parse.trace])
 
-#AT_CHECK_CALC_LALR1_D([%locations %define parse.error verbose %debug %verbose %parse-param {semantic_value *result}{int *count}{int *nerrs}])
-#AT_CHECK_CALC_LALR1_D([%locations %define parse.error verbose %debug %define api.prefix {calc} %verbose %parse-param {semantic_value *result}{int *count}{int *nerrs}])
+#AT_CHECK_CALC_LALR1_D([%locations %define parse.error detailed %debug %verbose %parse-param {semantic_value *result}{int *count}{int *nerrs}])
+#AT_CHECK_CALC_LALR1_D([%locations %define parse.error detailed %debug %define api.prefix {calc} %verbose %parse-param {semantic_value *result}{int *count}{int *nerrs}])
 
 
 # ----------------------- #