mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-22 10:43:02 +00:00
main: fix error message for missing argument
* src/getargs.c (getargs): Don't display any argv other that argv[0] when reporting a missing argument. * tests/bison.in: Neutralize path differences in stderr. * tests/input.at (Invalid number of arguments): New.
This commit is contained in:
@@ -724,7 +724,7 @@ getargs (int argc, char *argv[])
|
|||||||
if (argc - optind != 1)
|
if (argc - optind != 1)
|
||||||
{
|
{
|
||||||
if (argc - optind < 1)
|
if (argc - optind < 1)
|
||||||
error (0, 0, _("%s: missing operand"), quotearg_colon (argv[argc - 1]));
|
error (0, 0, _("missing operand"));
|
||||||
else
|
else
|
||||||
error (0, 0, _("extra operand %s"), quote (argv[optind + 1]));
|
error (0, 0, _("extra operand %s"), quote (argv[optind + 1]));
|
||||||
usage (EXIT_FAILURE);
|
usage (EXIT_FAILURE);
|
||||||
|
|||||||
@@ -25,9 +25,15 @@ abs_top_builddir='@abs_top_builddir@'
|
|||||||
BISON_PKGDATADIR=$abs_top_srcdir/data
|
BISON_PKGDATADIR=$abs_top_srcdir/data
|
||||||
export BISON_PKGDATADIR
|
export BISON_PKGDATADIR
|
||||||
|
|
||||||
$PREBISON "$abs_top_builddir/src/bison" ${1+"$@"}
|
stderr=tmp-bison.$$
|
||||||
|
$PREBISON "$abs_top_builddir/src/bison" ${1+"$@"} 2>"$stderr"
|
||||||
status=$?
|
status=$?
|
||||||
|
|
||||||
|
# Neutralize path differences in error messages so that check and
|
||||||
|
# installcheck behave the same way.
|
||||||
|
sed -e "s,$abs_top_builddir/src/,,g" <"$stderr" >&2
|
||||||
|
rm -f "$stderr"
|
||||||
|
|
||||||
# As a special dark magic, if we are actually using this wrapper to
|
# As a special dark magic, if we are actually using this wrapper to
|
||||||
# compile Bison's src/parse-gram.y, post-process the synclines to
|
# compile Bison's src/parse-gram.y, post-process the synclines to
|
||||||
# avoid dependencies on the user's set up (srcdir vs. builddir).
|
# avoid dependencies on the user's set up (srcdir vs. builddir).
|
||||||
|
|||||||
@@ -20,6 +20,31 @@ AT_BANNER([[Input Processing.]])
|
|||||||
# Mostly test that we are robust to mistakes.
|
# Mostly test that we are robust to mistakes.
|
||||||
|
|
||||||
|
|
||||||
|
## ----------------------------- ##
|
||||||
|
## Invalid number of arguments. ##
|
||||||
|
## ----------------------------- ##
|
||||||
|
|
||||||
|
AT_SETUP([Invalid number of arguments])
|
||||||
|
|
||||||
|
AT_BISON_CHECK([], [1], [],
|
||||||
|
[[bison: missing operand
|
||||||
|
Try 'bison --help' for more information.
|
||||||
|
]])
|
||||||
|
|
||||||
|
AT_BISON_CHECK([1.y 2.y], [1], [],
|
||||||
|
[[bison: extra operand '2.y'
|
||||||
|
Try 'bison --help' for more information.
|
||||||
|
]])
|
||||||
|
|
||||||
|
AT_BISON_CHECK([--skeleton], [1], [],
|
||||||
|
[[bison: option '--skeleton' requires an argument
|
||||||
|
Try 'bison --help' for more information.
|
||||||
|
]])
|
||||||
|
|
||||||
|
AT_CLEANUP
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## ----------------- ##
|
## ----------------- ##
|
||||||
## Invalid options. ##
|
## Invalid options. ##
|
||||||
## ----------------- ##
|
## ----------------- ##
|
||||||
|
|||||||
Reference in New Issue
Block a user