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

main: fix error message for missing argument

Browse Source 
* 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:
Akim Demaille
2018-10-04 21:38:32 +02:00
parent f84a8e96d1
commit 26859f6d61
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/getargs.c
View File

@@ -724,7 +724,7 @@ getargs (int argc, char *argv[])
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
error (0, 0, _("extra operand %s"), quote (argv[optind + 1]));
usage (EXIT_FAILURE);

8
tests/bison.in
View File

@@ -25,9 +25,15 @@ abs_top_builddir='@abs_top_builddir@'
BISON_PKGDATADIR=$abs_top_srcdir/data
export BISON_PKGDATADIR
$PREBISON "$abs_top_builddir/src/bison" ${1+"$@"}
stderr=tmp-bison.$$
$PREBISON "$abs_top_builddir/src/bison" ${1+"$@"} 2>"$stderr"
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
# compile Bison's src/parse-gram.y, post-process the synclines to
# avoid dependencies on the user's set up (srcdir vs. builddir).

25
tests/input.at
View File

@@ -20,6 +20,31 @@ AT_BANNER([[Input Processing.]])
# 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. ##
## ----------------- ##