Merge pull request 'dev' (#2 ) from dev into main

Reviewed-on: #2
2025-07-16 14:10:30 +08:00
15 changed files with 105 additions and 350 deletions
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ conan create .


 ## 示例程序
-构建简单的命令行程序,更多示例请参考`example`目录
+构建简单的命令行程序
 ```c
 #include "ArgParse.h"
 #include <stdbool.h>
@@ -42,11 +42,11 @@ conan create .
 #include <string.h>

 ArgParse *Init() {
-    ArgParse *ap = argParseInit("简单的命令行工具示例",ArgParseNOVALUE);
+    ArgParse *ap = argParseInit("简单的命令行工具示例");

    // 添加第一个命令
    Command *cmd = argParseAddCommand(
-        ap, "list", "列出文件列表", NULL, NULL, NULL, ArgParseSINGLEVALUE);
+        ap, "list", "列出文件列表", NULL, NULL, NULL, SINGLEVALUE);

    // 添加第一个命令的参数
    argParseAddArg(cmd,
@@ -56,7 +56,7 @@ ArgParse *Init() {
                   NULL,
                   NULL,
                   false,
-                   ArgParseNOVALUE);
+                   NOVALUE);

    return ap;
 }
--- a/conanfile.py
+++ b/conanfile.py
@@ -6,7 +6,7 @@ import os

 class loggingRecipe(ConanFile):
    name = "cargparse"
-    version = "0.3.2"
+    version = "0.3.0"
    license = "MIT"
    author = "321640253@qq.com"
    url = "https://gitea.youmetme.wang/youmetme/logging"
--- a/examples/simple.c
+++ b/examples/simple.c
@@ -4,11 +4,11 @@
 #include <string.h>

 ArgParse *Init() {
-    ArgParse *ap = argParseInit("简单的命令行工具示例",ArgParseNOVALUE);
+    ArgParse *ap = argParseInit("简单的命令行工具示例",NOVALUE);

    // 添加第一个命令
    Command *cmd = argParseAddCommand(
-        ap, "list", "列出文件列表", NULL, NULL, NULL, ArgParseSINGLEVALUE);
+        ap, "list", "列出文件列表", NULL, NULL, NULL, SINGLEVALUE);

    // 添加第一个命令的参数
    argParseAddArg(cmd,
@@ -18,7 +18,7 @@ ArgParse *Init() {
                   NULL,
                   NULL,
                   false,
-                   ArgParseNOVALUE);
+                   NOVALUE);

    return ap;
 }
--- a/include/ArgParse.h
+++ b/include/ArgParse.h
@@ -7,12 +7,6 @@
 extern "C" {
 #endif

-#ifdef _MSC_VER
-#define NORETURN __declspec(noreturn)
-#else
-#define NORETURN _Noreturn
-#endif
-
 #define ARG_DEFAULT_HELP_FLAG "--help"

 typedef struct ArgParse ArgParse; // 解析器
@@ -22,10 +16,10 @@ typedef int (*ArgParseCallback)(ArgParse *argParse,
                                int       val_len); // 回调函数

 typedef enum {
-    ArgParseNOVALUE = 0, // 无值
-    ArgParseSINGLEVALUE, // 单值 例如： -i https://www.baidu.com
-    ArgParseMULTIVALUE,  // 多值 例如: -s a b c 或 -s a -s b -s c等
-} ArgParseValueType;     // 值类型
+    NOVALUE = 0,     // 无值
+    SINGLEVALUE,     // 单值 例如： -i https://www.baidu.com
+    MULTIVALUE,      // 多值 例如: -s a b c 或 -s a -s b -s c等
+} ArgParseValueType; // 值类型

 typedef struct CommandArgs {
    /* 构造属性 */
@@ -75,7 +69,7 @@ typedef struct ArgParse {
    struct CommandArgs **global_args;     // 全局参数
    int                  global_args_len; // 全局参数个数
    char                *documentation;   // 帮助文档
-    ArgParseValueType    value_type; // 值类型 程序默认需要的值例如 gcc main.c
+    ArgParseValueType value_type; // 值类型 程序默认需要的值例如 gcc main.c

    /* 解析所用到的属性*/
    struct Command *current_command; // 当前解析到的命令
@@ -309,10 +303,10 @@ char *argParseGenerateHelp(ArgParse *argParse);
 char *
 argParseGenerateArgErrorMsg(ArgParse *argParse, char *name, bool short_flag);

-NORETURN void argParseError(ArgParse   *argParse,
-                            Command    *lastCommand,
-                            const char *prefix,
-                            const char *suffix);
+_Noreturn void argParseError(ArgParse   *argParse,
+                             Command    *lastCommand,
+                             const char *prefix,
+                             const char *suffix);

 #ifdef __cplusplus
 }
--- a/src/ArgParse.c
+++ b/src/ArgParse.c
@@ -7,10 +7,6 @@
 #include <stdlib.h>
 #include <string.h>

-#define RED   "\033[0;31m"
-#define BLUE  "\033[0;34m"
-#define RESET "\033[0m"
-
 static bool _AutoHelp = true; // 是否自动添加帮助信息
 static bool _COLOR    = true; // 是否启用颜色

@@ -41,20 +37,15 @@ ArgParse *argParseInit(char *documentation, ArgParseValueType value_type) {

 /**
 * @brief 自动帮助信息回调函数
- * @param argParse ArgParse结构体指针
- * @param val 参数值
- * @param val_len 参数值长度
- * @return 无返回值，将直接结束程序
 */
-NORETURN int __helpCallback(ArgParse *argParse, char **val, int val_len) {
+int __helpCallback(ArgParse *argParse, char **val, int val_len) {
    if (argParse == NULL) {
-        exit(1);
+        return -1;
    }
    char *help_doc = argParseGenerateHelp(argParse);
    printf("%s\n", help_doc);
    free(help_doc);
-    argParseFree(argParse);
-    exit(0);
+    return 0;
 }

 /**
@@ -76,7 +67,7 @@ void argParseAutoHelp(ArgParse *argParse) {
                         NULL,
                         __helpCallback,
                         false,
-                         ArgParseNOVALUE);
+                         NOVALUE);
 }

 int __commandHelpCallback(ArgParse *argParse, char **val, int val_len) {
@@ -105,7 +96,7 @@ void argParseCommandAutoHelp(Command *command) {
                   NULL,
                   __commandHelpCallback,
                   false,
-                   ArgParseNOVALUE);
+                   NOVALUE);
 }

 Command *argParseAddCommand(ArgParse         *argParse,
@@ -323,7 +314,7 @@ int __processArgs(ArgParse *argParse, CommandArgs *arg, int arg_index) {

    int current_index = arg_index;

-    if (arg->value_type == ArgParseMULTIVALUE) {
+    if (arg->value_type == MULTIVALUE) {
        for (int i = arg_index + 1; i < argParse->argc; i++) {
            if (checkArgType(argParse->argv[i]) ==
                COMMAND) { // COMMAND是无--或-开头的字符串，也可认定为参数值
@@ -334,12 +325,12 @@ int __processArgs(ArgParse *argParse, CommandArgs *arg, int arg_index) {
                break;
            }
        }
-    } else if (arg->value_type == ArgParseSINGLEVALUE) {
+    } else if (arg->value_type == SINGLEVALUE) {
        if (arg_index + 1 < argParse->argc) {
            argParseSetArgVal(arg, argParse->argv[arg_index + 1]);
            current_index = arg_index + 1;
        }
-    } else if (arg->value_type == ArgParseNOVALUE) {
+    } else if (arg->value_type == NOVALUE) {
        current_index = arg_index;
    }

@@ -446,7 +437,7 @@ int __processCommand(ArgParse *argParse, char *name, int command_index) {

    command              = argParseFindCommand(argParse, name); // 查找命令

-    if (command == NULL && argParse->value_type == ArgParseNOVALUE) {
+    if (command == NULL && argParse->value_type == NOVALUE) {
        char *msg = NULL;
        if (name != NULL) {
            msg = stringNewCopy("\033[1;31mERROR\033[0m:");
@@ -458,7 +449,7 @@ int __processCommand(ArgParse *argParse, char *name, int command_index) {
        return -1;
    }

-    if (command == NULL && argParse->value_type != ArgParseNOVALUE) {
+    if (command == NULL && argParse->value_type != NOVALUE) {
        return __processVal(argParse, command_index);
    }

@@ -472,7 +463,7 @@ int __processCommand(ArgParse *argParse, char *name, int command_index) {
        switch (argType) {
        case COMMAND: {
            // 命令无值则处理子命令
-            if (command->value_type == ArgParseNOVALUE) {
+            if (command->value_type == NOVALUE) {
                __processSubCommand(argParse, command, argParse->argv[i], i);
                return argParse->argc - 1;
            } else {
@@ -532,7 +523,6 @@ int __processCommand(ArgParse *argParse, char *name, int command_index) {

 /**
 * @brief 解析命令行参数
- * @errors: 错误信息字符串统一又调用方申请，处理函数释放
 * @param argParse 解析器指针
 * @param argc 参数个数
 * @param argv 参数列表
@@ -584,47 +574,6 @@ void argParseParse(ArgParse *argParse, int argc, char *argv[]) {
                                            argParse->current_command->val,
                                            argParse->current_command->val_len);
    }
-
-    // 检查全局参数必填参数是否已设置
-    for (int i = 0; i < argParse->global_args_len; i++) {
-        if (argParse->global_args[i]->required &&
-            argParse->global_args[i]->is_trigged == false) {
-            // 错误处理，必填全局参数未设置
-            char *msg =
-                stringNewCopy(RED "ERROR" RESET ": Global Option " BLUE);
-            if (argParse->global_args[i]->short_opt != NULL) {
-                __catStr(&msg, 1, argParse->global_args[i]->short_opt);
-            } else {
-                __catStr(&msg, 1, argParse->global_args[i]->long_opt);
-            }
-            __catStr(&msg, 1, RESET " is required");
-            argParseError(argParse, NULL, msg,
-                          NULL); // 错误处理
-        }
-    }
-
-    // 检查当前命令的必填参数是否已设置
-    if (argParse->current_command != NULL) {
-        for (int i = 0; i < argParse->current_command->args_len; i++) {
-            if (argParse->current_command->args[i]->required &&
-                argParse->current_command->args[i]->is_trigged == false) {
-                // 错误处理，必填参数未设置
-                char *msg = stringNewCopy(RED "ERROR" RESET ": Command " BLUE);
-                __catStr(&msg, 1, argParse->current_command->name);
-                __catStr(&msg, 1, RESET " Option " BLUE);
-                if (argParse->current_command->args[i]->short_opt != NULL) {
-                    __catStr(
-                        &msg, 1, argParse->current_command->args[i]->short_opt);
-                } else {
-                    __catStr(
-                        &msg, 1, argParse->current_command->args[i]->long_opt);
-                }
-                __catStr(&msg, 1, RESET " is required");
-                argParseError(
-                    argParse, argParse->current_command, msg, NULL); // 错误处理
-            }
-        }
-    }
 }

 /**
@@ -802,12 +751,12 @@ char *argParseGenerateHelpForCommand(Command *command) {
    __catStr(&help_msg, 2, "\033[1;33mUsage\033[0m: ", command->name);

    switch (command->value_type) {
-    case ArgParseNOVALUE:
+    case NOVALUE:
        break;
-    case ArgParseSINGLEVALUE:
+    case SINGLEVALUE:
        __catStr(&help_msg, 1, " <value>");
        break;
-    case ArgParseMULTIVALUE:
+    case MULTIVALUE:
        __catStr(&help_msg, 1, " <value>...");
    }

@@ -869,10 +818,10 @@ bool argParseCheckCommandTriggered(ArgParse *argParse, char *command_name) {
    return command->is_trigged;
 }

-NORETURN void argParseError(ArgParse   *argParse,
-                            Command    *lastCommand,
-                            const char *prefix,
-                            const char *suffix) {
+_Noreturn void argParseError(ArgParse   *argParse,
+                             Command    *lastCommand,
+                             const char *prefix,
+                             const char *suffix) {
    if (argParse == NULL) {
        printf("ERROR: Parse is NULL\n");
        exit(1);
@@ -892,6 +841,7 @@ NORETURN void argParseError(ArgParse   *argParse,
            __catStr(&mgs, 2, "\n", suffix);
        }

+        // printf("\033[1;31mERROR\033[0m: Last command is unknown\n");
        printf("%s\n", mgs);
        free(mgs);
        free(help);
--- a/src/ArgParseTools.c
+++ b/src/ArgParseTools.c
@@ -179,7 +179,7 @@ argParseFindGlobalArgs(ArgParse *argParse, char *name, bool short_flag) {
 * @return 成功返回true，失败返回false
 */
 bool argParseSetArgVal(CommandArgs *args, char *val) {
-    if (args->value_type == ArgParseMULTIVALUE) { // 多值
+    if (args->value_type == MULTIVALUE) { // 多值
        args->val = realloc(args->val, (args->val_len + 1) * sizeof(char *));
        if (args->val == NULL) {
            return false;
@@ -190,7 +190,7 @@ bool argParseSetArgVal(CommandArgs *args, char *val) {
        }
        args->val_len++;
        return true;
-    } else if (args->value_type == ArgParseSINGLEVALUE) { // 单值
+    } else if (args->value_type == SINGLEVALUE) { // 单值
        if (args->val != NULL) {
            free(args->val);
        }
@@ -205,7 +205,7 @@ bool argParseSetArgVal(CommandArgs *args, char *val) {
        }
        args->val_len = 1;
        return true;
-    } else if (args->value_type == ArgParseNOVALUE) { // 无值
+    } else if (args->value_type == NOVALUE) { // 无值
        return true;
    }

@@ -213,7 +213,7 @@ bool argParseSetArgVal(CommandArgs *args, char *val) {
 }

 bool argParseSetCommandVal(Command *command, char *val) {
-    if (command->value_type == ArgParseMULTIVALUE) { // 多值
+    if (command->value_type == MULTIVALUE) { // 多值
        command->val =
            realloc(command->val, (command->val_len + 1) * sizeof(char *));
        if (command->val == NULL) {
@@ -225,7 +225,7 @@ bool argParseSetCommandVal(Command *command, char *val) {
        }
        command->val_len++;
        return true;
-    } else if (command->value_type == ArgParseSINGLEVALUE) { // 单值
+    } else if (command->value_type == SINGLEVALUE) { // 单值
        if (command->val != NULL) {
            free(command->val);
        }
@@ -240,7 +240,7 @@ bool argParseSetCommandVal(Command *command, char *val) {
        }
        command->val_len = 1;
        return true;
-    } else if (command->value_type == ArgParseNOVALUE) { // 无值
+    } else if (command->value_type == NOVALUE) { // 无值
        return true;
    }
    return false;
@@ -254,7 +254,7 @@ bool argParseSetCommandVal(Command *command, char *val) {
 */
 bool argParseSetVal(ArgParse *argParse, char *val) {

-    if (argParse->value_type == ArgParseMULTIVALUE) { // 多值
+    if (argParse->value_type == MULTIVALUE) { // 多值
        argParse->val =
            realloc(argParse->val, (argParse->val_len + 1) * sizeof(char *));
        if (argParse->val == NULL) {
@@ -266,7 +266,7 @@ bool argParseSetVal(ArgParse *argParse, char *val) {
        }
        argParse->val_len++;
        return true;
-    } else if (argParse->value_type == ArgParseSINGLEVALUE) { // 单值
+    } else if (argParse->value_type == SINGLEVALUE) { // 单值
        if (argParse->val != NULL) {
            free(argParse->val);
        }
@@ -281,7 +281,7 @@ bool argParseSetVal(ArgParse *argParse, char *val) {
        }
        argParse->val_len = 1;
        return true;
-    } else if (argParse->value_type == ArgParseNOVALUE) { // 无值
+    } else if (argParse->value_type == NOVALUE) { // 无值
        return true;
    }
    return false;
--- a/src/ArgParseTools.h
+++ b/src/ArgParseTools.h
@@ -26,14 +26,14 @@ Command *createCommand(char             *name,
 CommandGroup *createCommandGroup(char *name, char *help); // 创建命令组

 CommandGroup *addCommandToGroup(CommandGroup *group,
-                                Command      *command); // 添加命令到命令组
+                                Command *command); // 添加命令到命令组

-CommandArgs *createCommandArgs(char             *short_opt,
-                               char             *long_opt,
-                               char             *default_val,
-                               char             *help,
-                               ArgParseCallback  callback,
-                               bool              required,
+CommandArgs *createCommandArgs(char            *short_opt,
+                               char            *long_opt,
+                               char            *default_val,
+                               char            *help,
+                               ArgParseCallback callback,
+                               bool             required,
                               ArgParseValueType value_type); // 创建命令参数

 /**
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -36,13 +36,4 @@ set_tests_properties(${PROJECT_NAME}unknow_command_arg PROPERTIES WILL_FAIL TRUE
 # 未知命令选项测试,预期打印该命令的帮助信息
 add_executable(${PROJECT_NAME}val test_val.c)
 target_link_libraries(${PROJECT_NAME}val CArgParse)
-add_test(${PROJECT_NAME}val ${PROJECT_NAME}val file1.txt file2.txt file3.txt -v -q)
-
-# 必填参数测试
-add_executable(${PROJECT_NAME}required test_required.c)
-target_link_libraries(${PROJECT_NAME}required CArgParse)
-add_test(${PROJECT_NAME}required_1 ${PROJECT_NAME}required -f)
-add_test(${PROJECT_NAME}required_2 ${PROJECT_NAME}required)
-set_tests_properties(${PROJECT_NAME}required_2 PROPERTIES WILL_FAIL TRUE)
-add_test(${PROJECT_NAME}required_3 ${PROJECT_NAME}required -h)
-add_test(${PROJECT_NAME}required_4 ${PROJECT_NAME}required -f install -h)
+add_test(${PROJECT_NAME}val ${PROJECT_NAME}val file1.txt file2.txt file3.txt -v -q)
--- a/tests/initArgParse.h
+++ b/tests/initArgParse.h
@@ -4,7 +4,7 @@
 #include <string.h>

 ArgParse *initArgParse() {
-    ArgParse *argparse    = argParseInit("测试程序", ArgParseNOVALUE);
+    ArgParse *argparse    = argParseInit("测试程序",NOVALUE);
    Command  *command     = NULL;
    Command  *sub_command = NULL;

@@ -16,24 +16,13 @@ ArgParse *initArgParse() {
                         NULL,
                         NULL,
                         false,
-                         ArgParseNOVALUE);
-    argParseAddGlobalArg(argparse,
-                         "-q",
-                         "--quiet",
-                         "Quiet mode",
-                         NULL,
-                         NULL,
-                         false,
-                         ArgParseNOVALUE);
+                         NOVALUE);
+    argParseAddGlobalArg(
+        argparse, "-q", "--quiet", "Quiet mode", NULL, NULL, false, NOVALUE);

    // add arguments
-    command = argParseAddCommand(argparse,
-                                 "install",
-                                 "Install the package",
-                                 NULL,
-                                 NULL,
-                                 NULL,
-                                 ArgParseNOVALUE);
+    command = argParseAddCommand(
+        argparse, "install", "Install the package", NULL, NULL, NULL, NOVALUE);
    argParseAddArg(command,
                   "-i",
                   "--index",
@@ -41,7 +30,7 @@ ArgParse *initArgParse() {
                   "https://example.com",
                   NULL,
                   false,
-                   ArgParseSINGLEVALUE);
+                   SINGLEVALUE);
    argParseAddArg(command,
                   "-f",
                   "--file",
@@ -49,7 +38,7 @@ ArgParse *initArgParse() {
                   "package.json",
                   NULL,
                   false,
-                   ArgParseMULTIVALUE);
+                   MULTIVALUE);
    argParseAddArg(command,
                   "-p",
                   "--package",
@@ -57,15 +46,10 @@ ArgParse *initArgParse() {
                   "package.json",
                   NULL,
                   false,
-                   ArgParseMULTIVALUE);
+                   MULTIVALUE);

-    sub_command = argParseAddSubCommand(command,
-                                        "tools",
-                                        "Install tools",
-                                        NULL,
-                                        NULL,
-                                        NULL,
-                                        ArgParseMULTIVALUE);
+    sub_command = argParseAddSubCommand(
+        command, "tools", "Install tools", NULL, NULL, NULL, MULTIVALUE);

    argParseAddArg(sub_command,
                   "-t",
@@ -74,14 +58,9 @@ ArgParse *initArgParse() {
                   "Tool name",
                   NULL,
                   true,
-                   ArgParseMULTIVALUE);
-    sub_command = argParseAddSubCommand(command,
-                                        "tools_sub",
-                                        "Install tools",
-                                        NULL,
-                                        NULL,
-                                        NULL,
-                                        ArgParseMULTIVALUE);
+                   MULTIVALUE);
+    sub_command = argParseAddSubCommand(
+        command, "tools_sub", "Install tools", NULL, NULL, NULL, MULTIVALUE);

    argParseAddArg(sub_command,
                   "-s",
@@ -90,7 +69,7 @@ ArgParse *initArgParse() {
                   "tools subcommand test",
                   NULL,
                   true,
-                   ArgParseMULTIVALUE);
+                   MULTIVALUE);

    command = argParseAddCommand(argparse,
                                 "uninstall",
@@ -98,7 +77,7 @@ ArgParse *initArgParse() {
                                 NULL,
                                 NULL,
                                 NULL,
-                                 ArgParseSINGLEVALUE);
+                                 SINGLEVALUE);
    argParseAddArg(command,
                   "-p",
                   "--package",
@@ -106,7 +85,7 @@ ArgParse *initArgParse() {
                   "Package name",
                   NULL,
                   true,
-                   ArgParseMULTIVALUE);
+                   MULTIVALUE);

    return argparse;
 }
--- a/tests/test_mult_arg.c
+++ b/tests/test_mult_arg.c
@@ -10,11 +10,12 @@ int main(int argc, char *argv[]) {

    const char *testv[3] = {"testpackge1", "testpackge2", "testpackge3"};

-    // Test -p
-    char *val            = argParseGetCurArg(argparse, "-p");

-    int    len           = 0;
-    char **vals          = argParseGetCurArgList(argparse, "-p", &len);
+    // Test -p
+    char *val = argParseGetCurArg(argparse, "-p");
+
+    int len = 0;
+    char **vals = argParseGetCurArgList(argparse, "-p", &len);

    for (int i = 0; i < len; i++) {
        printf("-p Value: %s\n", vals[i]);
@@ -26,15 +27,18 @@ int main(int argc, char *argv[]) {
    printf("-i Value: %s\n", val_i);
    assert(strcmp(val_i, "www.test.com") == 0);

+
+
    // Test -f
-    len                  = 0;
+    len = 0;
    const char *testf[2] = {"file1.txt", "file2.txt"};
-    char      **val_f    = argParseGetCurArgList(argparse, "-f", &len);
+    char **val_f = argParseGetCurArgList(argparse, "-f", &len);
    for (int i = 0; i < len; i++) {
        printf("-f Value: %s\n", val_f[i]);
        assert(strcmp(val_f[i], testf[i]) == 0);
    }

+
    argParseFree(argparse);

    return 0;
--- a/tests/test_required.c
+++ b/tests/test_required.c
@@ -1,144 +0,0 @@
-#include "ArgParse.h"
-#include <assert.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-ArgParse *initArgParse() {
-    ArgParse *argparse    = argParseInit("测试程序", ArgParseNOVALUE);
-    Command  *command     = NULL;
-    Command  *sub_command = NULL;
-
-    // add global arguments
-    argParseAddGlobalArg(argparse,
-                         "-v",
-                         "--version",
-                         "Show version",
-                         NULL,
-                         NULL,
-                         false,
-                         ArgParseNOVALUE);
-    argParseAddGlobalArg(argparse,
-                         "-f",
-                         "--file",
-                         "File name",
-                         NULL,
-                         NULL,
-                         true,
-                         ArgParseNOVALUE);
-
-    // add arguments
-    command = argParseAddCommand(argparse,
-                                 "install",
-                                 "Install the package",
-                                 NULL,
-                                 NULL,
-                                 NULL,
-                                 ArgParseNOVALUE);
-    argParseAddArg(command,
-                   "-i",
-                   "--index",
-                   "Index URL",
-                   "https://example.com",
-                   NULL,
-                   false,
-                   ArgParseSINGLEVALUE);
-    argParseAddArg(command,
-                   "-f",
-                   "--file",
-                   "Package file",
-                   "package.json",
-                   NULL,
-                   true,
-                   ArgParseMULTIVALUE);
-    argParseAddArg(command,
-                   "-p",
-                   "--package",
-                   "Package file",
-                   "package.json",
-                   NULL,
-                   false,
-                   ArgParseMULTIVALUE);
-
-    sub_command = argParseAddSubCommand(command,
-                                        "tools",
-                                        "Install tools",
-                                        NULL,
-                                        NULL,
-                                        NULL,
-                                        ArgParseMULTIVALUE);
-
-    argParseAddArg(sub_command,
-                   "-t",
-                   "--tool",
-                   "Tool name",
-                   "Tool name",
-                   NULL,
-                   true,
-                   ArgParseMULTIVALUE);
-    sub_command = argParseAddSubCommand(command,
-                                        "tools_sub",
-                                        "Install tools",
-                                        NULL,
-                                        NULL,
-                                        NULL,
-                                        ArgParseMULTIVALUE);
-
-    argParseAddArg(sub_command,
-                   "-s",
-                   "--source",
-                   "test_source",
-                   "tools subcommand test",
-                   NULL,
-                   true,
-                   ArgParseMULTIVALUE);
-
-    command = argParseAddCommand(argparse,
-                                 "uninstall",
-                                 "Uninstall the package",
-                                 NULL,
-                                 NULL,
-                                 NULL,
-                                 ArgParseSINGLEVALUE);
-    argParseAddArg(command,
-                   "-p",
-                   "--package",
-                   "Package name",
-                   "Package name",
-                   NULL,
-                   true,
-                   ArgParseMULTIVALUE);
-
-    return argparse;
-}
-
-int main(int argc, char *argv[]) {
-    ArgParse *argparse = initArgParse();
-
-    argParseParse(argparse, argc, argv);
-
-    char *val = argParseGetVal(argparse);
-    if (val) {
-        printf("val: %s\n", val);
-    }
-
-    // int    len        = 0;
-    // char **vals       = argParseGetValList(argparse, &len);
-
-    // char *test_val[3] = {"file1.txt", "file2.txt", "file3.txt"};
-
-    // if (vals) {
-    //     for (int i = 0; i < len; i++) {
-    //         printf("vals: %s\n", vals[i]);
-    //         assert(strcmp(vals[i], test_val[i]) == 0);
-    //     }
-    // }
-
-    // assert(argParseCheckGlobalTriggered(argparse, "-v"));
-    // assert(argParseCheckGlobalTriggered(argparse, "-f"));
-
-    argParseFree(argparse);
-
-    return 0;
-}
--- a/tests/test_single_arg.c
+++ b/tests/test_single_arg.c
@@ -10,10 +10,10 @@ int main(int argc, char *argv[]) {

    const char *testv[3] = {"testpackge1", "testpackge2", "testpackge3"};

-    char *val            = argParseGetCurArg(argparse, "-p");
+    char *val = argParseGetCurArg(argparse, "-p");

-    int    len           = 0;
-    char **vals          = argParseGetCurArgList(argparse, "-p", &len);
+    int len = 0;
+    char **vals = argParseGetCurArgList(argparse, "-p", &len);

    for (int i = 0; i < len; i++) {
        printf("-p Value: %s\n", vals[i]);
--- a/tests/test_subcommand.c
+++ b/tests/test_subcommand.c
@@ -8,11 +8,12 @@ int main(int argc, char *argv[]) {

    argParseParse(argparse, argc, argv);

+    
    char *command_name = argParseGetCurCommandName(argparse);
    printf("command name: %s\n", command_name);
    assert(strcmp(command_name, "tools") == 0);

-    char *val = argParseGetCurArg(argparse, "-t");
+    char * val = argParseGetCurArg(argparse, "-t");
    printf("tools -t: %s\n", val);

    argParseFree(argparse);
--- a/tests/test_unknow_command.c
+++ b/tests/test_unknow_command.c
@@ -7,6 +7,7 @@ int main(int argc, char *argv[]) {

    argParseParse(argparse, argc, argv);

+
    argParseFree(argparse);

    return 0;
--- a/tests/test_val.c
+++ b/tests/test_val.c
@@ -5,7 +5,7 @@
 #include <string.h>

 ArgParse *initArgParse() {
-    ArgParse *argparse    = argParseInit("测试程序", ArgParseMULTIVALUE);
+    ArgParse *argparse    = argParseInit("测试程序", MULTIVALUE);
    Command  *command     = NULL;
    Command  *sub_command = NULL;

@@ -17,24 +17,13 @@ ArgParse *initArgParse() {
                         NULL,
                         NULL,
                         false,
-                         ArgParseNOVALUE);
-    argParseAddGlobalArg(argparse,
-                         "-q",
-                         "--quiet",
-                         "Quiet mode",
-                         NULL,
-                         NULL,
-                         false,
-                         ArgParseNOVALUE);
+                         NOVALUE);
+    argParseAddGlobalArg(
+        argparse, "-q", "--quiet", "Quiet mode", NULL, NULL, false, NOVALUE);

    // add arguments
-    command = argParseAddCommand(argparse,
-                                 "install",
-                                 "Install the package",
-                                 NULL,
-                                 NULL,
-                                 NULL,
-                                 ArgParseNOVALUE);
+    command = argParseAddCommand(
+        argparse, "install", "Install the package", NULL, NULL, NULL, NOVALUE);
    argParseAddArg(command,
                   "-i",
                   "--index",
@@ -42,7 +31,7 @@ ArgParse *initArgParse() {
                   "https://example.com",
                   NULL,
                   false,
-                   ArgParseSINGLEVALUE);
+                   SINGLEVALUE);
    argParseAddArg(command,
                   "-f",
                   "--file",
@@ -50,7 +39,7 @@ ArgParse *initArgParse() {
                   "package.json",
                   NULL,
                   false,
-                   ArgParseMULTIVALUE);
+                   MULTIVALUE);
    argParseAddArg(command,
                   "-p",
                   "--package",
@@ -58,15 +47,10 @@ ArgParse *initArgParse() {
                   "package.json",
                   NULL,
                   false,
-                   ArgParseMULTIVALUE);
+                   MULTIVALUE);

-    sub_command = argParseAddSubCommand(command,
-                                        "tools",
-                                        "Install tools",
-                                        NULL,
-                                        NULL,
-                                        NULL,
-                                        ArgParseMULTIVALUE);
+    sub_command = argParseAddSubCommand(
+        command, "tools", "Install tools", NULL, NULL, NULL, MULTIVALUE);

    argParseAddArg(sub_command,
                   "-t",
@@ -75,14 +59,9 @@ ArgParse *initArgParse() {
                   "Tool name",
                   NULL,
                   true,
-                   ArgParseMULTIVALUE);
-    sub_command = argParseAddSubCommand(command,
-                                        "tools_sub",
-                                        "Install tools",
-                                        NULL,
-                                        NULL,
-                                        NULL,
-                                        ArgParseMULTIVALUE);
+                   MULTIVALUE);
+    sub_command = argParseAddSubCommand(
+        command, "tools_sub", "Install tools", NULL, NULL, NULL, MULTIVALUE);

    argParseAddArg(sub_command,
                   "-s",
@@ -91,7 +70,7 @@ ArgParse *initArgParse() {
                   "tools subcommand test",
                   NULL,
                   true,
-                   ArgParseMULTIVALUE);
+                   MULTIVALUE);

    command = argParseAddCommand(argparse,
                                 "uninstall",
@@ -99,7 +78,7 @@ ArgParse *initArgParse() {
                                 NULL,
                                 NULL,
                                 NULL,
-                                 ArgParseSINGLEVALUE);
+                                 SINGLEVALUE);
    argParseAddArg(command,
                   "-p",
                   "--package",
@@ -107,7 +86,7 @@ ArgParse *initArgParse() {
                   "Package name",
                   NULL,
                   true,
-                   ArgParseMULTIVALUE);
+                   MULTIVALUE);

    return argparse;
 }
@@ -122,8 +101,8 @@ int main(int argc, char *argv[]) {
        printf("val: %s\n", val);
    }

-    int    len        = 0;
-    char **vals       = argParseGetValList(argparse, &len);
+    int    len  = 0;
+    char **vals = argParseGetValList(argparse, &len);

    char *test_val[3] = {"file1.txt", "file2.txt", "file3.txt"};