choice: don't allow both switch choice and arg choice

When both a switch or long choice and an arg choice is specified
`(-t|<foo>)`, and the switch or long choice is given, then we no longer
accept the arg choice.

Author: ethomson

adopt.c

@@ -85,6 +85,32 @@ INLINE(const adopt_spec *) spec_nextarg(adopt_parser *parser)
 	return NULL;
 }
 
+INLINE(int) spec_is_choice(const adopt_spec *spec)
+{
+	return ((spec + 1)->type &&
+	       ((spec + 1)->usage & ADOPT_USAGE_CHOICE));
+}
+
+/*
+ * If we have a choice with switches and bare arguments, and we see
+ * the switch, then we no longer expect the bare argument.
+ */
+INLINE(void) consume_choices(const adopt_spec *spec, adopt_parser *parser)
+{
+	/* back up to the beginning of the choices */
+	while (spec->type && (spec->usage & ADOPT_USAGE_CHOICE))
+		--spec;
+
+	if (!spec_is_choice(spec))
+		return;
+
+	do {
+		if (spec->type == ADOPT_ARG)
+			parser->arg_idx++;
+		++spec;
+	} while(spec->type && (spec->usage & ADOPT_USAGE_CHOICE));
+}
+
 static adopt_status_t parse_long(adopt_opt *opt, adopt_parser *parser)
 {
 	const adopt_spec *spec;
@@ -130,6 +156,8 @@ static adopt_status_t parse_long(adopt_opt *opt, adopt_parser *parser)
 	else
 		opt->status = ADOPT_STATUS_OK;
 
+	consume_choices(opt->spec, parser);
+
 done:
 	return opt->status;
 }
@@ -172,6 +200,8 @@ static adopt_status_t parse_short(adopt_opt *opt, adopt_parser *parser)
 	else
 		opt->status = ADOPT_STATUS_OK;
 
+	consume_choices(opt->spec, parser);
+
 done:
 	return opt->status;
 }
@@ -259,12 +289,6 @@ INLINE(int) spec_included(const adopt_spec **specs, const adopt_spec *spec)
 	return 0;
 }
 
-INLINE(int) spec_is_choice(const adopt_spec *spec)
-{
-	return ((spec + 1)->type &&
-	       ((spec + 1)->usage & ADOPT_USAGE_CHOICE));
-}
-
 static adopt_status_t validate_required(
 	adopt_opt *opt,
 	const adopt_spec specs[],

tests/adopt.c

@@ -825,3 +825,33 @@ void test_adopt__required_choice_specified(void)
 	cl_assert_equal_p(NULL, result.value);
 	cl_assert_equal_i(0, result.args_len);
 }
+
+void test_adopt__choice_switch_or_arg_advances_arg(void)
+{
+	int foo = 0;
+	char *bar = NULL, *baz = NULL, *final = NULL;
+	adopt_opt result;
+
+	adopt_spec specs[] = {
+		{ ADOPT_SWITCH, "foo",  'f', &foo,  'f', NULL, NULL },
+		{ ADOPT_SWITCH, "fooz", 'z', &foo,  'z', NULL, NULL, ADOPT_USAGE_CHOICE },
+		{ ADOPT_VALUE,  "bar",   0,  &bar,  'b', NULL, NULL, ADOPT_USAGE_CHOICE },
+		{ ADOPT_ARG,    "baz",   0,  &baz,   0,  NULL, NULL, ADOPT_USAGE_CHOICE },
+		{ ADOPT_ARG,    "final", 0, &final, 0,  NULL, NULL, 0 },
+		{ 0 },
+	};
+
+	char *args[] = { "-z", "actually_final" };
+
+	cl_assert_equal_i(ADOPT_STATUS_DONE, adopt_parse(&result, specs, args, 2));
+
+	cl_assert_equal_i(ADOPT_STATUS_DONE, result.status);
+	cl_assert_equal_p(NULL, result.arg);
+	cl_assert_equal_p(NULL, result.value);
+	cl_assert_equal_i(0, result.args_len);
+
+	cl_assert_equal_i('z', foo);
+	cl_assert_equal_p(NULL, bar);
+	cl_assert_equal_p(NULL, baz);
+	cl_assert_equal_s("actually_final", final);
+}