YYLEX_PARAM: drop support

* data/yacc.c, doc/bison.texi: Remove YYLEX_PARAM support.
* NEWS: Document it.

diff --git a/NEWS b/NEWS
index 39c812e0ddcd5d0be245f896063cd7e183c0d087..d4f8a750283be5563c5c20bca956793ff18ccfdc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,10 +6,13 @@ GNU Bison NEWS
 
 *** Obsolete features
 
 
 *** Obsolete features
 

-  Support for YYFAIL is removed (deprecated in Bison 2.4.2).
-  Support for yystype and yyltype (instead of YYSTYPE and YYLTYPE)
-  is removed (deprecated in Bison 1.875).
-  Support for YYPARSE_PARAM is removed (deprecated in Bison 1.875).
+  Support for YYFAIL is removed (deprecated in Bison 2.4.2): use YYERROR.
+
+  Support for yystype and yyltype is removed (deprecated in Bison 1.875):
+  use YYSTYPE and YYLTYPE.
+
+  Support for YYLEX_PARAM and YYPARSE_PARAM is removed (deprecated in Bison
+  1.875): use %lex-param, %parse-param, or %param.

 
 ** Warnings
 
 
 ** Warnings
 

diff --git a/data/yacc.c b/data/yacc.c
index b64ccdf690be779d2435492ac9e9a7f82a6af5fa..f75f9d5ae3975041faef3277081006982807b295 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -687,11 +687,7 @@ while (0)
 ]b4_yy_location_print_define[
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
 ]b4_yy_location_print_define[
 
 /* YYLEX -- calling `yylex' with the right arguments.  */

-#ifdef YYLEX_PARAM
-# define YYLEX yylex (]b4_pure_if([&yylval[]b4_locations_if([, &yylloc]), ])[YYLEX_PARAM)
-#else
-# define YYLEX ]b4_function_call([yylex], [int], b4_lex_param)[
-#endif
+#define YYLEX ]b4_function_call([yylex], [int], b4_lex_param)[

 
 /* Enable debugging if requested.  */
 #if ]b4_api_PREFIX[DEBUG
 
 /* Enable debugging if requested.  */
 #if ]b4_api_PREFIX[DEBUG

diff --git a/doc/bison.texi b/doc/bison.texi
index f738f5125ba44b34ae03ac4dd4ad991192dae259..bc7b167c220c3b4386ed8f737445081ffda9791e 100644 (file)
--- a/doc/bison.texi
+++ b/doc/bison.texi
@@ -12604,13 +12604,6 @@ the next token.  @xref{Lexical, ,The Lexical Analyzer Function
 @code{yylex}}.
 @end deffn
 
 @code{yylex}}.
 @end deffn
 

-@deffn {Macro} YYLEX_PARAM
-An obsolete macro for specifying an extra argument (or list of extra
-arguments) for @code{yyparse} to pass to @code{yylex}.  The use of this
-macro is deprecated, and is supported only for Yacc like parsers.
-@xref{Pure Calling,, Calling Conventions for Pure Parsers}.
-@end deffn
-

 @deffn {Variable} yylloc
 External variable in which @code{yylex} should place the line and column
 numbers associated with a token.  (In a pure parser, it is a local
 @deffn {Variable} yylloc
 External variable in which @code{yylex} should place the line and column
 numbers associated with a token.  (In a pure parser, it is a local