/*
* An argpar iterator.
*
- * Such a structure contains the state of an iterator between
- * calls to argpar_iter_parse_next().
+ * Such a structure contains the state of an iterator between calls to
+ * argpar_iter_next().
*/
struct argpar_iter {
/*
/*
* Index of the argument to process in the next
- * argpar_iter_parse_next() call.
+ * argpar_iter_next() call.
*/
unsigned int i;
* Current character of the current short option group: if it's
* not `NULL`, the parser is in within a short option group,
* therefore it must resume there in the next
- * argpar_iter_parse_next() call.
+ * argpar_iter_next() call.
*/
const char *short_opt_ch;
};
}
ARGPAR_HIDDEN
-enum argpar_iter_parse_next_status argpar_iter_parse_next(
+enum argpar_iter_next_status argpar_iter_next(
struct argpar_iter * const iter,
const struct argpar_item ** const item, char ** const error)
{
- enum argpar_iter_parse_next_status status;
+ enum argpar_iter_next_status status;
enum parse_orig_arg_opt_ret parse_orig_arg_opt_ret;
const char *orig_arg;
const char *next_orig_arg;
}
if (iter->i == iter->argc) {
- status = ARGPAR_ITER_PARSE_NEXT_STATUS_END;
+ status = ARGPAR_ITER_NEXT_STATUS_END;
goto end;
}
iter->non_opt_index);
if (!non_opt_item) {
- status = ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_MEMORY;
+ status = ARGPAR_ITER_NEXT_STATUS_ERROR_MEMORY;
goto end;
}
iter->non_opt_index++;
iter->i++;
*item = &non_opt_item->base;
- status = ARGPAR_ITER_PARSE_NEXT_STATUS_OK;
+ status = ARGPAR_ITER_NEXT_STATUS_OK;
goto end;
}
(struct argpar_item **) item);
switch (parse_orig_arg_opt_ret) {
case PARSE_ORIG_ARG_OPT_RET_OK:
- status = ARGPAR_ITER_PARSE_NEXT_STATUS_OK;
+ status = ARGPAR_ITER_NEXT_STATUS_OK;
break;
case PARSE_ORIG_ARG_OPT_RET_ERROR_UNKNOWN_OPT:
case PARSE_ORIG_ARG_OPT_RET_ERROR_MISSING_OPT_ARG:
switch (parse_orig_arg_opt_ret) {
case PARSE_ORIG_ARG_OPT_RET_ERROR_UNKNOWN_OPT:
- status = ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT;
+ status = ARGPAR_ITER_NEXT_STATUS_ERROR_UNKNOWN_OPT;
break;
case PARSE_ORIG_ARG_OPT_RET_ERROR_MISSING_OPT_ARG:
- status = ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_MISSING_OPT_ARG;
+ status = ARGPAR_ITER_NEXT_STATUS_ERROR_MISSING_OPT_ARG;
break;
case PARSE_ORIG_ARG_OPT_RET_ERROR_INVALID_ARG:
- status = ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_INVALID_ARG;
+ status = ARGPAR_ITER_NEXT_STATUS_ERROR_INVALID_ARG;
break;
case PARSE_ORIG_ARG_OPT_RET_ERROR_UNEXPECTED_OPT_ARG:
- status = ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNEXPECTED_OPT_ARG;
+ status = ARGPAR_ITER_NEXT_STATUS_ERROR_UNEXPECTED_OPT_ARG;
break;
default:
abort();
break;
case PARSE_ORIG_ARG_OPT_RET_ERROR_MEMORY:
- status = ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_MEMORY;
+ status = ARGPAR_ITER_NEXT_STATUS_ERROR_MEMORY;
break;
default:
abort();
}
ARGPAR_HIDDEN
-unsigned int argpar_iter_get_ingested_orig_args(
+unsigned int argpar_iter_ingested_orig_args(
const struct argpar_iter * const iter)
{
return iter->i;
}
while (true) {
- const enum argpar_iter_parse_next_status status =
- argpar_iter_parse_next(iter, &item, &parse_ret.error);
+ const enum argpar_iter_next_status status =
+ argpar_iter_next(iter, &item, &parse_ret.error);
switch (status) {
- case ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_MISSING_OPT_ARG:
- case ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_INVALID_ARG:
- case ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNEXPECTED_OPT_ARG:
- case ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_MEMORY:
+ case ARGPAR_ITER_NEXT_STATUS_ERROR_MISSING_OPT_ARG:
+ case ARGPAR_ITER_NEXT_STATUS_ERROR_INVALID_ARG:
+ case ARGPAR_ITER_NEXT_STATUS_ERROR_UNEXPECTED_OPT_ARG:
+ case ARGPAR_ITER_NEXT_STATUS_ERROR_MEMORY:
goto error;
- case ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT:
+ case ARGPAR_ITER_NEXT_STATUS_ERROR_UNKNOWN_OPT:
if (fail_on_unknown_opt) {
parse_ret.ingested_orig_args =
- argpar_iter_get_ingested_orig_args(iter);
+ argpar_iter_ingested_orig_args(iter);
goto error;
}
free(parse_ret.error);
parse_ret.error = NULL;
goto success;
- case ARGPAR_ITER_PARSE_NEXT_STATUS_END:
+ case ARGPAR_ITER_NEXT_STATUS_END:
goto success;
default:
- ARGPAR_ASSERT(status == ARGPAR_ITER_PARSE_NEXT_STATUS_OK);
+ ARGPAR_ASSERT(status == ARGPAR_ITER_NEXT_STATUS_OK);
break;
}
success:
ARGPAR_ASSERT(!parse_ret.error);
- parse_ret.ingested_orig_args = argpar_iter_get_ingested_orig_args(iter);
+ parse_ret.ingested_orig_args = argpar_iter_ingested_orig_args(iter);
goto end;
error: