Default-initialize _supplied_arg_<x>=0 for ARGBASH_INDICATE_SUPPLIED

Author: kstrafe

src/stuff.m4

@@ -1243,7 +1243,10 @@ m4_define([_MAKE_DEFAULTS_OPTIONAL], [m4_do(
 			[action], [],
 			[incr], [_arg_varname=m4_expand(_default)_ENDL_],
 			[repeated], [_arg_varname=(_default)_ENDL_],
-			[_arg_varname=_sh_quote(_default)_ENDL_])],
+			[m4_do(
+				[_arg_varname=_sh_quote(_default)_ENDL_],
+				[m4_list_contains([HAVE_SUPPLIED], _argname, [[_supplied]_arg_varname=0]_ENDL_, [])],
+			)])],
 	)])],
 )])
 

tests/regressiontests/Makefile

@@ -372,7 +372,7 @@ test-simple: $(TESTDIR)/test-simple.sh
 	ERROR="[Nn]ot enough" 	$(REVERSE) $<
 	ERROR="require exactly 1" 	$(REVERSE) $<
 	$< pos -o 'uf ta' | grep -q 'OPT_S=uf ta,POS_S=pos,'
-	$< pos -o 'uf ta' --print-optionals | grep -q '_supplied_arg_prefix=1,_supplied_arg_print_optionals=1,_supplied_arg_la=x,_supplied_arg_not_supplied=x'
+	$< pos -o 'uf ta' --print-optionals | grep -q '_supplied_arg_prefix=1,_supplied_arg_print_optionals=1,_supplied_arg_la=0,_supplied_arg_not_supplied=x'
 	$< pos -o 'uf ta' --print-optionals --la x | grep -q '_supplied_arg_prefix=1,_supplied_arg_print_optionals=1,_supplied_arg_la=1,_supplied_arg_not_supplied=x'
 	$< pos -o 'uf ta' --print-optionals --la x --not-supplied | grep -q '_supplied_arg_prefix=1,_supplied_arg_print_optionals=1,_supplied_arg_la=1,_supplied_arg_not_supplied=x'
 	test -z "$(SHELLCHECK)" || $(SHELLCHECK) "$(TESTDIR)/test-simple.sh"

tests/regressiontests/make/tests/tests-base.m4

@@ -144,7 +144,7 @@ m4_define([test_simple_body], [[
 
 ADD_TEST_BASH([test-simple], [test_simple_body
 	$< pos -o 'uf ta' | grep -q 'OPT_S=uf ta,POS_S=pos,'
-	$< pos -o 'uf ta' --print-optionals | grep -q '_supplied_arg_prefix=1,_supplied_arg_print_optionals=1,_supplied_arg_la=x,_supplied_arg_not_supplied=x'
+	$< pos -o 'uf ta' --print-optionals | grep -q '_supplied_arg_prefix=1,_supplied_arg_print_optionals=1,_supplied_arg_la=0,_supplied_arg_not_supplied=x'
 	$< pos -o 'uf ta' --print-optionals --la x | grep -q '_supplied_arg_prefix=1,_supplied_arg_print_optionals=1,_supplied_arg_la=1,_supplied_arg_not_supplied=x'
 	$< pos -o 'uf ta' --print-optionals --la x --not-supplied | grep -q '_supplied_arg_prefix=1,_supplied_arg_print_optionals=1,_supplied_arg_la=1,_supplied_arg_not_supplied=x'
 ])

tests/regressiontests/test-simple.m4

@@ -17,7 +17,8 @@
 # Now we take the parsed data and assign them no nice-looking variable names,
 # sometimes after a basic validation
 if [ "$_arg_print_optionals" = on ]; then
-    echo "_supplied_arg_prefix=${_supplied_arg_prefix-x},_supplied_arg_print_optionals=${_supplied_arg_print_optionals-x},_supplied_arg_la=${_supplied_arg_la-x},_supplied_arg_not_supplied=${_supplied_arg_not_supplied-x}"
+    set -u
+    echo "_supplied_arg_prefix=${_supplied_arg_prefix},_supplied_arg_print_optionals=${_supplied_arg_print_optionals},_supplied_arg_la=${_supplied_arg_la},_supplied_arg_not_supplied=${_supplied_arg_not_supplied-x}"
 else
     echo "OPT_S=$_arg_prefix,POS_S=$_arg_pos_arg,LA=$_arg_la,"
 fi