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

* data/yacc.c (yy_reduce_print, YY_REDUCE_PRINT):

Browse Source 
Fix typos in previous change that broke 'make check'.
YY_REDUCE_PRINT cannot be a pseudo-varargs macro; that isn't
supported in C.
* tests/calc.at (_AT_CHECK_CALC,_AT_CHECK_CALC_ERROR):
Don't check NUM-STDERR-LINES, since the output format is fluctuating.
We can revert this once things settle down.
This commit is contained in:
Paul Eggert
2005-11-18 19:37:13 +00:00
parent 035aa4a0bb
commit d9963c8597
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,5 +1,13 @@
2005-11-18 Paul Eggert <eggert@cs.ucla.edu> 2005-11-18 Paul Eggert <eggert@cs.ucla.edu>
* data/yacc.c (yy_reduce_print, YY_REDUCE_PRINT):
Fix typos in previous change that broke 'make check'.
YY_REDUCE_PRINT cannot be a pseudo-varargs macro; that isn't
supported in C.
* tests/calc.at (_AT_CHECK_CALC,_AT_CHECK_CALC_ERROR):
Don't check NUM-STDERR-LINES, since the output format is fluctuating.
We can revert this once things settle down.
* src/conflicts.c (conflicts_print): Don't print file name twice * src/conflicts.c (conflicts_print): Don't print file name twice
when %expect fails because there were no conflicts. when %expect fails because there were no conflicts.
* doc/bison.texinfo (Expect Decl): Tighten up wording in previous * doc/bison.texinfo (Expect Decl): Tighten up wording in previous

18
data/yacc.c
View File

@@ -668,9 +668,9 @@ do { \
`------------------------------------------------*/ `------------------------------------------------*/
]b4_c_function_def([yy_reduce_print], [static void], ]b4_c_function_def([yy_reduce_print], [static void],
[[YYSTYPE *yyvsp], [yyvsvp]], [[YYSTYPE *yyvsp], [yyvsp]],
b4_location_if([[[YYLTYPE *yylsp], [yyvlvp]],]) b4_location_if([[[YYLTYPE *yylsp], [yylsp]],])
[[int yyrule], [yyrule]] [[int yyrule], [yyrule]]m4_ifset([b4_parse_param], [,])
b4_parse_param)[ b4_parse_param)[
{ {
int yynrhs = yyr2[yyrule]; int yynrhs = yyr2[yyrule];
@@ -690,10 +690,10 @@ do { \
} }
} }
# define YY_REDUCE_PRINT(Args) \ # define YY_REDUCE_PRINT(Rule) \
do { \ do { \
if (yydebug) \ if (yydebug) \
yy_reduce_print (yyvsp, ]b4_location_if([yylsp, ])[Args); \ yy_reduce_print (yyvsp, ]b4_location_if([yylsp, ])[Rule]b4_user_args[); \
} while (/*CONSTCOND*/ 0) } while (/*CONSTCOND*/ 0)
/* Nonzero means print parse trace. It is left uninitialized so that /* Nonzero means print parse trace. It is left uninitialized so that
@@ -703,7 +703,7 @@ int yydebug;
# define YYDPRINTF(Args) # define YYDPRINTF(Args)
# define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_SYMBOL_PRINT(Title, Type, Value, Location)
# define YY_STACK_PRINT(Bottom, Top) # define YY_STACK_PRINT(Bottom, Top)
# define YY_REDUCE_PRINT(Args) # define YY_REDUCE_PRINT(Rule)
#endif /* !YYDEBUG */ #endif /* !YYDEBUG */
@@ -1261,7 +1261,7 @@ yyreduce:
]b4_location_if( ]b4_location_if(
[[ /* Default location. */ [[ /* Default location. */
YYLLOC_DEFAULT (yyloc, yylsp - yylen, yylen);]])[ YYLLOC_DEFAULT (yyloc, yylsp - yylen, yylen);]])[
YY_REDUCE_PRINT ((yyn]b4_user_args[)); YY_REDUCE_PRINT (yyn);
switch (yyn) switch (yyn)
{ {
]b4_actions[ ]b4_actions[

23
tests/calc.at
View File

@@ -340,12 +340,14 @@ m4_define([AT_DATA_CALC_Y],
# _AT_CHECK_CALC(BISON-OPTIONS, INPUT, [NUM-STDERR-LINES = 0]) # _AT_CHECK_CALC(BISON-OPTIONS, INPUT, [NUM-STDERR-LINES])
# ------------------------------------------------------------ # --------------------------------------------------------
# Run `calc' on INPUT and expect no STDOUT nor STDERR. # Run `calc' on INPUT and expect no STDOUT nor STDERR.
# #
# If BISON-OPTIONS contains `%debug' but not `%glr-parser', then # If BISON-OPTIONS contains `%debug' but not `%glr-parser', then
#
# NUM-STDERR-LINES is the number of expected lines on stderr. # NUM-STDERR-LINES is the number of expected lines on stderr.
# Currently this is ignored, though, since the output format is fluctuating.
# #
# We don't count GLR's traces yet, since its traces are somewhat # We don't count GLR's traces yet, since its traces are somewhat
# different from LALR's. # different from LALR's.
@@ -354,17 +356,11 @@ m4_define([_AT_CHECK_CALC],
[[$2 [[$2
]]) ]])
AT_PARSER_CHECK([./calc input], 0, [], [stderr]) AT_PARSER_CHECK([./calc input], 0, [], [stderr])
m4_bmatch([$1],
[%debug.*%glr\|%glr.*%debug],
[],
[%debug],
[AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0, [$3
])])
]) ])
# _AT_CHECK_CALC_ERROR(BISON-OPTIONS, EXIT-STATUS, INPUT, # _AT_CHECK_CALC_ERROR(BISON-OPTIONS, EXIT-STATUS, INPUT,
# [NUM-DEBUG-LINES], # [NUM-STDERR-LINES],
# [VERBOSE-AND-LOCATED-ERROR-MESSAGE]) # [VERBOSE-AND-LOCATED-ERROR-MESSAGE])
# --------------------------------------------------------- # ---------------------------------------------------------
# Run `calc' on INPUT, and expect a `syntax error' message. # Run `calc' on INPUT, and expect a `syntax error' message.
@@ -372,6 +368,9 @@ m4_bmatch([$1],
# If INPUT starts with a slash, it is used as absolute input file name, # If INPUT starts with a slash, it is used as absolute input file name,
# otherwise as contents. # otherwise as contents.
# #
# NUM-STDERR-LINES is the number of expected lines on stderr.
# Currently this is ignored, though, since the output format is fluctuating.
#
# If BISON-OPTIONS contains `%location', then make sure the ERROR-LOCATION # If BISON-OPTIONS contains `%location', then make sure the ERROR-LOCATION
# is correctly output on stderr. # is correctly output on stderr.
# #
@@ -388,12 +387,6 @@ m4_define([_AT_CHECK_CALC_ERROR],
[[$3 [[$3
]]) ]])
AT_PARSER_CHECK([./calc input], $2, [], [stderr])]) AT_PARSER_CHECK([./calc input], $2, [], [stderr])])
m4_bmatch([$1],
[%debug.*%glr\|%glr.*%debug],
[],
[%debug],
[AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0, [$4
])])
# Normalize the observed and expected error messages, depending upon the # Normalize the observed and expected error messages, depending upon the
# options. # options.