Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

YYPARSE_PARAM: drop support

Browse Source 
* data/yacc.c: No longer support it.
* doc/bison.texi, tests/headers.at: Adjust.
* NEWS: Document.
This commit is contained in:
Akim Demaille
2012-08-02 11:59:12 +02:00
parent 71b56f4683
commit de62ae867b
4 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@@ -6,9 +6,10 @@ GNU Bison NEWS
*** Obsolete features *** 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) 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 ** Warnings

15
data/yacc.c
View File

@@ -259,13 +259,7 @@ b4_c_function_decl([b4_prefix[pstate_delete]], [[void]],
# ------------------- # -------------------
# When not the push parser. # When not the push parser.
m4_define([b4_declare_yyparse_], m4_define([b4_declare_yyparse_],
[[#ifdef YYPARSE_PARAM [b4_c_function_decl(b4_prefix[parse], [int], b4_parse_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_declare_yyparse # b4_declare_yyparse
@@ -1407,12 +1401,7 @@ b4_c_function_def([[yyparse]], [[int]], b4_parse_param)[
| yyparse. | | yyparse. |
`----------*/ `----------*/
#ifdef YYPARSE_PARAM ]b4_c_function_def([yyparse], [int], b4_parse_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_pure_if([b4_declare_scanner_communication_variables {]b4_pure_if([b4_declare_scanner_communication_variables
])b4_push_if([b4_pure_if([], [[ ])b4_push_if([b4_pure_if([], [[
int yypushed_char = yychar; int yypushed_char = yychar;

7
doc/bison.texi
View File

@@ -12084,13 +12084,6 @@ parse a single token. @xref{Push Parser Function, ,The Push Parser Function
More user feedback will help to stabilize it.) More user feedback will help to stabilize it.)
@end deffn @end deffn
@deffn {Macro} YYPARSE_PARAM
An obsolete macro for specifying the name of a parameter that
@code{yyparse} 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}.
@end deffn
@deffn {Macro} YYRECOVERING @deffn {Macro} YYRECOVERING
The expression @code{YYRECOVERING ()} yields 1 when the parser The expression @code{YYRECOVERING ()} yields 1 when the parser
is recovering from a syntax error, and 0 otherwise. is recovering from a syntax error, and 0 otherwise.

8
tests/headers.at
View File

@@ -127,7 +127,7 @@ AT_SETUP([Several parsers])
# AT_TEST([PREFIX], [DIRECTIVES]) # AT_TEST([PREFIX], [DIRECTIVES])
# ------------------------------- # -------------------------------
# Generate and compile to *.o. Make sure there is no YY* nor yy* in # 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], m4_pushdef([AT_TEST],
[AT_BISON_OPTION_PUSHDEFS([%define api.prefix "$1_" $2]) [AT_BISON_OPTION_PUSHDEFS([%define api.prefix "$1_" $2])
AT_DATA_GRAMMAR([$1.AT_SKEL_CC_IF([yy], [y])], 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_SKEL_CC_IF([],
[AT_CHECK([$EGREP yy $1.h], [1])]) [AT_CHECK([$EGREP yy $1.h], [1])])
# Ignore comments. Ignore YYPARSE_PARAM (obsolete) and # Ignore comments. Ignore YYPUSH_MORE(_DEFINED)? (whose definition
# YYPUSH_MORE(_DEFINED)? (whose definition is constant). # is constant).
# #
# YYDEBUG (not renamed) can be read, but not changed. # YYDEBUG (not renamed) can be read, but not changed.
AT_CHECK([[$PERL -0777 -e 's{/\*.*?\*/}{}sg;s,//.*,,;' \ AT_CHECK([[$PERL -0777 -e 's{/\*.*?\*/}{}sg;s,//.*,,;' \
]$1.AT_SKEL_CC_IF([hh], [h])[ | ]$1.AT_SKEL_CC_IF([hh], [h])[ |
grep 'YY' | grep 'YY' |
$EGREP -wv 'YY(PARSE_PARAM|PUSH_MORE(_DEFINED)?)|(defined|if) YYDEBUG']], $EGREP -wv 'YYPUSH_MORE(_DEFINED)?|(defined|if) YYDEBUG']],
[1]) [1])
AT_LANG_COMPILE([$1.o]) AT_LANG_COMPILE([$1.o])