X-Git-Url: http://git.efficios.com/?p=argpar.git;a=blobdiff_plain;f=argpar%2Fargpar.c;h=82b561ceaae707002f36754c55e828d35b882206;hp=1c3a06178189e90ca93d8564121183f2c9ddc1c0;hb=143cec42e14e050571be640cb2dfa5c5e0198d59;hpb=c530e1dcf020f4f6189ebafc5fd6cb99d0f013d4

diff --git a/argpar/argpar.c b/argpar/argpar.c
index 1c3a061..82b561c 100644
--- a/argpar/argpar.c
+++ b/argpar/argpar.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2020-2021 Simon Marchi <simon.marchi@efficios.com>
  */
 
-#include <assert.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -22,12 +21,15 @@
 
 #define ARGPAR_ZALLOC(_type) ARGPAR_CALLOC(_type, 1)
 
-#define ARGPAR_ASSERT(_cond) assert(_cond)
-
-#ifdef __MINGW_PRINTF_FORMAT
-# define ARGPAR_PRINTF_FORMAT __MINGW_PRINTF_FORMAT
+#ifdef NDEBUG
+/*
+ * Force usage of the assertion condition to prevent unused variable warnings
+ * when `assert()` are disabled by the `NDEBUG` definition.
+ */
+# define ARGPAR_ASSERT(_cond) ((void) sizeof((void) (_cond), 0))
 #else
-# define ARGPAR_PRINTF_FORMAT printf
+# include <assert.h>
+# define ARGPAR_ASSERT(_cond) assert(_cond)
 #endif
 
 /*
@@ -109,6 +111,9 @@ struct argpar_item_non_opt {
 
 /* Parsing error */
 struct argpar_error {
+	/* Error type */
+	enum argpar_error_type type;
+
 	/* Original argument index */
 	unsigned int orig_index;
 
@@ -271,6 +276,7 @@ end:
  */
 static
 int set_error(struct argpar_error ** const error,
+		enum argpar_error_type type,
 		const char * const unknown_opt_name,
 		const struct argpar_opt_descr * const opt_descr,
 		const bool is_short)
@@ -286,6 +292,8 @@ int set_error(struct argpar_error ** const error,
 		goto error;
 	}
 
+	(*error)->type = type;
+
 	if (unknown_opt_name) {
 		(*error)->unknown_opt_name = ARGPAR_CALLOC(char,
 			strlen(unknown_opt_name) + 1 + (is_short ? 1 : 2));
@@ -314,6 +322,14 @@ end:
 	return ret;
 }
 
+ARGPAR_HIDDEN
+enum argpar_error_type argpar_error_type(
+		const struct argpar_error * const error)
+{
+	ARGPAR_ASSERT(error);
+	return error->type;
+}
+
 ARGPAR_HIDDEN
 unsigned int argpar_error_orig_index(const struct argpar_error * const error)
 {
@@ -326,6 +342,7 @@ const char *argpar_error_unknown_opt_name(
 		const struct argpar_error * const error)
 {
 	ARGPAR_ASSERT(error);
+	ARGPAR_ASSERT(error->type == ARGPAR_ERROR_TYPE_UNKNOWN_OPT);
 	ARGPAR_ASSERT(error->unknown_opt_name);
 	return error->unknown_opt_name;
 }
@@ -335,6 +352,8 @@ const struct argpar_opt_descr *argpar_error_opt_descr(
 		const struct argpar_error * const error, bool * const is_short)
 {
 	ARGPAR_ASSERT(error);
+	ARGPAR_ASSERT(error->type == ARGPAR_ERROR_TYPE_MISSING_OPT_ARG ||
+		error->type == ARGPAR_ERROR_TYPE_UNEXPECTED_OPT_ARG);
 	ARGPAR_ASSERT(error->opt_descr);
 
 	if (is_short) {
@@ -390,10 +409,8 @@ end:
 /* Return type of parse_short_opt_group() and parse_long_opt() */
 enum parse_orig_arg_opt_ret {
 	PARSE_ORIG_ARG_OPT_RET_OK,
-	PARSE_ORIG_ARG_OPT_RET_ERROR_UNKNOWN_OPT = -1,
-	PARSE_ORIG_ARG_OPT_RET_ERROR_MISSING_OPT_ARG = -2,
-	PARSE_ORIG_ARG_OPT_RET_ERROR_UNEXPECTED_OPT_ARG = -4,
-	PARSE_ORIG_ARG_OPT_RET_ERROR_MEMORY = -5,
+	PARSE_ORIG_ARG_OPT_RET_ERROR = -1,
+	PARSE_ORIG_ARG_OPT_RET_ERROR_MEMORY = -2,
 };
 
 /*
@@ -432,9 +449,10 @@ enum parse_orig_arg_opt_ret parse_short_opt_group(
 		const char unknown_opt_name[] =
 			{*iter->short_opt_group_ch, '\0'};
 
-		ret = PARSE_ORIG_ARG_OPT_RET_ERROR_UNKNOWN_OPT;
+		ret = PARSE_ORIG_ARG_OPT_RET_ERROR;
 
-		if (set_error(error, unknown_opt_name, NULL, true)) {
+		if (set_error(error, ARGPAR_ERROR_TYPE_UNKNOWN_OPT,
+				unknown_opt_name, NULL, true)) {
 			ret = PARSE_ORIG_ARG_OPT_RET_ERROR_MEMORY;
 		}
 
@@ -457,9 +475,10 @@ enum parse_orig_arg_opt_ret parse_short_opt_group(
 		 */
 		if (!opt_arg || (iter->short_opt_group_ch[1] &&
 				strlen(opt_arg) == 0)) {
-			ret = PARSE_ORIG_ARG_OPT_RET_ERROR_MISSING_OPT_ARG;
+			ret = PARSE_ORIG_ARG_OPT_RET_ERROR;
 
-			if (set_error(error, NULL, descr, true)) {
+			if (set_error(error, ARGPAR_ERROR_TYPE_MISSING_OPT_ARG,
+					NULL, descr, true)) {
 				ret = PARSE_ORIG_ARG_OPT_RET_ERROR_MEMORY;
 			}
 
@@ -553,9 +572,10 @@ enum parse_orig_arg_opt_ret parse_long_opt(const char * const long_opt_arg,
 	/* Find corresponding option descriptor */
 	descr = find_descr(descrs, '\0', long_opt_name);
 	if (!descr) {
-		ret = PARSE_ORIG_ARG_OPT_RET_ERROR_UNKNOWN_OPT;
+		ret = PARSE_ORIG_ARG_OPT_RET_ERROR;
 
-		if (set_error(error, long_opt_name, NULL, false)) {
+		if (set_error(error, ARGPAR_ERROR_TYPE_UNKNOWN_OPT,
+				long_opt_name, NULL, false)) {
 			ret = PARSE_ORIG_ARG_OPT_RET_ERROR_MEMORY;
 		}
 
@@ -570,9 +590,10 @@ enum parse_orig_arg_opt_ret parse_long_opt(const char * const long_opt_arg,
 		} else {
 			/* `--long-opt arg` style */
 			if (!next_orig_arg) {
-				ret = PARSE_ORIG_ARG_OPT_RET_ERROR_MISSING_OPT_ARG;
+				ret = PARSE_ORIG_ARG_OPT_RET_ERROR;
 
-				if (set_error(error, NULL, descr, false)) {
+				if (set_error(error, ARGPAR_ERROR_TYPE_MISSING_OPT_ARG,
+						NULL, descr, false)) {
 					ret = PARSE_ORIG_ARG_OPT_RET_ERROR_MEMORY;
 				}
 
@@ -587,9 +608,10 @@ enum parse_orig_arg_opt_ret parse_long_opt(const char * const long_opt_arg,
 		 * Unexpected `--opt=arg` style for a long option which
 		 * doesn't accept an argument.
 		 */
-		ret = PARSE_ORIG_ARG_OPT_RET_ERROR_UNEXPECTED_OPT_ARG;
+		ret = PARSE_ORIG_ARG_OPT_RET_ERROR;
 
-		if (set_error(error, NULL, descr, false)) {
+		if (set_error(error, ARGPAR_ERROR_TYPE_UNEXPECTED_OPT_ARG,
+				NULL, descr, false)) {
 			ret = PARSE_ORIG_ARG_OPT_RET_ERROR_MEMORY;
 		}
 
@@ -741,28 +763,12 @@ enum argpar_iter_next_status argpar_iter_next(
 	case PARSE_ORIG_ARG_OPT_RET_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:
-	case PARSE_ORIG_ARG_OPT_RET_ERROR_UNEXPECTED_OPT_ARG:
+	case PARSE_ORIG_ARG_OPT_RET_ERROR:
 		if (error) {
 			ARGPAR_ASSERT(*error);
 			(*nc_error)->orig_index = iter->i;
 		}
-
-		switch (parse_orig_arg_opt_ret) {
-		case PARSE_ORIG_ARG_OPT_RET_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_NEXT_STATUS_ERROR_MISSING_OPT_ARG;
-			break;
-		case PARSE_ORIG_ARG_OPT_RET_ERROR_UNEXPECTED_OPT_ARG:
-			status = ARGPAR_ITER_NEXT_STATUS_ERROR_UNEXPECTED_OPT_ARG;
-			break;
-		default:
-			abort();
-		}
-
+		status = ARGPAR_ITER_NEXT_STATUS_ERROR;
 		break;
 	case PARSE_ORIG_ARG_OPT_RET_ERROR_MEMORY:
 		status = ARGPAR_ITER_NEXT_STATUS_ERROR_MEMORY;