mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-13 22:33:03 +00:00
* 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.
This commit is contained in:
@@ -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.
|
||||
#
|
||||
# If BISON-OPTIONS contains `%debug' but not `%glr-parser', then
|
||||
#
|
||||
# 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
|
||||
# different from LALR's.
|
||||
@@ -354,17 +356,11 @@ m4_define([_AT_CHECK_CALC],
|
||||
[[$2
|
||||
]])
|
||||
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,
|
||||
# [NUM-DEBUG-LINES],
|
||||
# [NUM-STDERR-LINES],
|
||||
# [VERBOSE-AND-LOCATED-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,
|
||||
# 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
|
||||
# is correctly output on stderr.
|
||||
#
|
||||
@@ -388,12 +387,6 @@ m4_define([_AT_CHECK_CALC_ERROR],
|
||||
[[$3
|
||||
]])
|
||||
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
|
||||
# options.
|
||||
|
||||
Reference in New Issue
Block a user