[PATCH 03/11] YYPARSE_PARAM: drop support

[Akim Demaille]

* data/yacc.c: No longer support it.
* doc/bison.texi, tests/headers.at: Adjust.
* NEWS: Document.
---
 NEWS             |  5 +++--
 data/yacc.c      | 15 ++-------------
 doc/bison.texi   |  7 -------
 tests/headers.at |  8 ++++----
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/NEWS b/NEWS
index bd47608..9fb03bb 100644
--- a/NEWS
+++ b/NEWS
@@ -6,9 +6,10 @@ GNU Bison NEWS
 
 *** Obsolete features
 
-  Support for YYFAIL is removed, as announced since Bison 2.4.2.
+  Support for YYFAIL is removed (deprecated in Bison 2.4.2).
   Support for yystype and yyltype (instead of YYSTYPE and YYLTYPE)
-  is removed, as announced in Bison 1.875.
+  is removed (deprecated in Bison 1.875).
+  Support for YYPARSE_PARAM is removed (deprecated in Bison 1.875).
 
 ** Warnings
 
diff --git a/data/yacc.c b/data/yacc.c
index 1c465a1..d15f150 100644
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -259,13 +259,7 @@ b4_c_function_decl([b4_prefix[pstate_delete]], [[void]],
 # -------------------
 # When not the push parser.
 m4_define([b4_declare_yyparse_],
-[[#ifdef YYPARSE_PARAM
-]b4_c_function_decl(b4_prefix[parse], [int],
-                    [[void *YYPARSE_PARAM], [YYPARSE_PARAM]])[
-#else /* ! YYPARSE_PARAM */
-]b4_c_function_decl(b4_prefix[parse], [int], b4_parse_param)[
-#endif /* ! YYPARSE_PARAM */]dnl
-])
+[b4_c_function_decl(b4_prefix[parse], [int], b4_parse_param)])
 
 
 # b4_declare_yyparse
@@ -1407,12 +1401,7 @@ b4_c_function_def([[yyparse]], [[int]], b4_parse_param)[
 | yyparse.  |
 `----------*/
 
-#ifdef YYPARSE_PARAM
-]b4_c_function_def([yyparse], [int],
-                   [[void *YYPARSE_PARAM], [YYPARSE_PARAM]])[
-#else /* ! YYPARSE_PARAM */
-]b4_c_function_def([yyparse], [int], b4_parse_param)[
-#endif]])[
+]b4_c_function_def([yyparse], [int], b4_parse_param)])[
 {]b4_pure_if([b4_declare_scanner_communication_variables
 ])b4_push_if([b4_pure_if([], [[
   int yypushed_char = yychar;
diff --git a/doc/bison.texi b/doc/bison.texi
index 62ff045..9436719 100644
--- a/doc/bison.texi
+++ b/doc/bison.texi
@@ -12084,13 +12084,6 @@ parse a single token.  @xref{Push Parser Function, 
,The Push Parser Function
 More user feedback will help to stabilize it.)
 @end deffn
 
address@hidden {Macro} YYPARSE_PARAM
-An obsolete macro for specifying the name of a parameter that
address@hidden should accept.  The use of this macro is deprecated, and
-is supported only for Yacc like parsers.  @xref{Pure Calling,, Calling
-Conventions for Pure Parsers}.
address@hidden deffn
-
 @deffn {Macro} YYRECOVERING
 The expression @code{YYRECOVERING ()} yields 1 when the parser
 is recovering from a syntax error, and 0 otherwise.
diff --git a/tests/headers.at b/tests/headers.at
index 421dd7d..22f6000 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -127,7 +127,7 @@ AT_SETUP([Several parsers])
 # AT_TEST([PREFIX], [DIRECTIVES])
 # -------------------------------
 # Generate and compile to *.o.  Make sure there is no YY* nor yy* in
-# the header (but YYDEBUG and YYPARSE_PARAM).
+# the header (but YYDEBUG).
 m4_pushdef([AT_TEST],
 [AT_BISON_OPTION_PUSHDEFS([%define api.prefix "$1_" $2])
 AT_DATA_GRAMMAR([$1.AT_SKEL_CC_IF([yy], [y])],
@@ -165,14 +165,14 @@ AT_BISON_CHECK([-d -o AT_SKEL_CC_IF([$1.cc $1.yy], [$1.c 
$1.y])])
 AT_SKEL_CC_IF([],
   [AT_CHECK([$EGREP yy $1.h], [1])])
 
-# Ignore comments. Ignore YYPARSE_PARAM (obsolete) and
-# YYPUSH_MORE(_DEFINED)? (whose definition is constant).
+# Ignore comments. Ignore YYPUSH_MORE(_DEFINED)? (whose definition
+# is constant).
 #
 # YYDEBUG (not renamed) can be read, but not changed.
 AT_CHECK([[$PERL -0777 -e 's{/\*.*?\*/}{}sg;s,//.*,,;' \
             ]$1.AT_SKEL_CC_IF([hh], [h])[ |
          grep 'YY' |
-     $EGREP -wv 'YY(PARSE_PARAM|PUSH_MORE(_DEFINED)?)|(defined|if) YYDEBUG']],
+     $EGREP -wv 'YYPUSH_MORE(_DEFINED)?|(defined|if) YYDEBUG']],
          [1])
 AT_LANG_COMPILE([$1.o])
 
-- 
1.7.11.3