krzosa/first
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add int cmd kind

Browse Source
This commit is contained in:
Krzosa Karol
2024-03-15 06:53:55 +01:00
parent 6c4c141344
commit 0c4d19c9b8
2 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
core/cmd.c
View File

@@ -13,6 +13,15 @@ void AddBool(CmdParser *p, bool *result, const char *name, const char *help) {
SLL_QUEUE_ADD(p->fdecl, p->ldecl, decl); SLL_QUEUE_ADD(p->fdecl, p->ldecl, decl);
} }
void AddInt(CmdParser *p, int *result, const char *name, const char *help) {
CmdDecl *decl = MA_PushStruct(p->arena, CmdDecl);
decl->kind = CmdDeclKind_Int;
decl->name = S8_MakeFromChar((char *)name);
decl->help = S8_MakeFromChar((char *)help);
decl->int_result = result;
SLL_QUEUE_ADD(p->fdecl, p->ldecl, decl);
}
void AddList(CmdParser *p, S8_List *result, const char *name, const char *help) { void AddList(CmdParser *p, S8_List *result, const char *name, const char *help) {
CmdDecl *decl = MA_PushStruct(p->arena, CmdDecl); CmdDecl *decl = MA_PushStruct(p->arena, CmdDecl);
decl->kind = CmdDeclKind_List; decl->kind = CmdDeclKind_List;
@@ -65,7 +74,10 @@ void PrintCmdUsage(CmdParser *p) {
IO_Printf("%-30.*s %.*s\n", S8_Expand(example), S8_Expand(it->help)); IO_Printf("%-30.*s %.*s\n", S8_Expand(example), S8_Expand(it->help));
} else if (it->kind == CmdDeclKind_Enum) { } else if (it->kind == CmdDeclKind_Enum) {
S8_String enum_vals = StrEnumValues(p->arena, it); S8_String enum_vals = StrEnumValues(p->arena, it);
S8_String example = S8_Format(p->arena, "-%.*s %.*s", S8_Expand(it->name), S8_Expand(enum_vals)); S8_String example = S8_Format(p->arena, "-%.*s %.*s", S8_Expand(it->name), S8_Expand(enum_vals));
IO_Printf("%-30.*s %.*s\n", S8_Expand(example), S8_Expand(it->help));
} else if (it->kind == CmdDeclKind_Int) {
S8_String example = S8_Format(p->arena, "-%.*s 8", S8_Expand(it->name));
IO_Printf("%-30.*s %.*s\n", S8_Expand(example), S8_Expand(it->help)); IO_Printf("%-30.*s %.*s\n", S8_Expand(example), S8_Expand(it->help));
} else IO_Todo(); } else IO_Todo();
} }
@@ -96,8 +108,26 @@ bool ParseCmd(MA_Arena *arg_arena, CmdParser *p) {
if (decl->kind == CmdDeclKind_Bool) { if (decl->kind == CmdDeclKind_Bool) {
*decl->bool_result = !*decl->bool_result; *decl->bool_result = !*decl->bool_result;
} else if (decl->kind == CmdDeclKind_Int) {
if (i + 1 >= p->argc) {
IO_Printf("expected at least 1 argument after %.*s\n", S8_Expand(arg));
return false;
}
S8_String num = S8_MakeFromChar(p->argv[++i]);
for (int i = 0; i < num.len; i += 1) {
if (!CHAR_IsDigit(num.str[i])) {
IO_Printf("expected argument to be a number, got instead: %.*s", S8_Expand(num));
return false;
}
}
int count = atoi(num.str);
decl->int_result[0] = count;
} else if (decl->kind == CmdDeclKind_Enum) { } else if (decl->kind == CmdDeclKind_Enum) {
if (i + 1 >= p->argc) { IO_Printf("expected at least 1 argument after %.*s\n", S8_Expand(arg)); return false; } if (i + 1 >= p->argc) {
IO_Printf("expected at least 1 argument after %.*s\n", S8_Expand(arg));
return false;
}
S8_String option_from_cmd = S8_MakeFromChar(p->argv[++i]); S8_String option_from_cmd = S8_MakeFromChar(p->argv[++i]);
bool found_option = false; bool found_option = false;
@@ -105,7 +135,7 @@ bool ParseCmd(MA_Arena *arg_arena, CmdParser *p) {
S8_String option = S8_MakeFromChar((char *)decl->enum_options[i]); S8_String option = S8_MakeFromChar((char *)decl->enum_options[i]);
if (S8_AreEqual(option, option_from_cmd, true)) { if (S8_AreEqual(option, option_from_cmd, true)) {
*decl->enum_result = i; *decl->enum_result = i;
found_option = true; found_option = true;
break; break;
} }
} }
@@ -117,13 +147,19 @@ bool ParseCmd(MA_Arena *arg_arena, CmdParser *p) {
} }
} else if (decl->kind == CmdDeclKind_List) { } else if (decl->kind == CmdDeclKind_List) {
if (i + 1 >= p->argc) { IO_Printf("expected at least 1 argument after %.*s\n", S8_Expand(arg)); return false; } if (i + 1 >= p->argc) {
IO_Printf("expected at least 1 argument after %.*s\n", S8_Expand(arg));
return false;
}
i += 1; i += 1;
for (int counter = 0; i < p->argc; i += 1, counter += 1) { for (int counter = 0; i < p->argc; i += 1, counter += 1) {
S8_String arg = S8_MakeFromChar(p->argv[i]); S8_String arg = S8_MakeFromChar(p->argv[i]);
if (arg.str[0] == '-') { if (arg.str[0] == '-') {
if (counter == 0) { IO_Printf("expected at least 1 argument after %.*s\n", S8_Expand(arg)); return false; } if (counter == 0) {
IO_Printf("expected at least 1 argument after %.*s\n", S8_Expand(arg));
return false;
}
i -= 1; i -= 1;
break; break;
} }
@@ -132,8 +168,7 @@ bool ParseCmd(MA_Arena *arg_arena, CmdParser *p) {
} }
} else IO_Todo(); } else IO_Todo();
} } else {
else {
if (p->require_one_standalone_arg && p->args.node_count == 0) { if (p->require_one_standalone_arg && p->args.node_count == 0) {
S8_AddNode(arg_arena, &p->args, arg); S8_AddNode(arg_arena, &p->args, arg);
} else { } else {
@@ -162,19 +197,24 @@ void TestCmdParser() {
"exe", "exe",
"--build_scratch", "--build_scratch",
"-tests", "-tests",
"a", "b", "c", "a",
"--things", "1234", "asdsa", "b",
"-build", "release", "c",
"--things",
"1234",
"asdsa",
"-build",
"release",
}; };
int argc = MA_Lengthof(argv); int argc = MA_Lengthof(argv);
MA_Checkpoint scratch = MA_GetScratch(); MA_Checkpoint scratch = MA_GetScratch();
bool build_scratch = false; bool build_scratch = false;
S8_List test_list = {0}; S8_List test_list = {0};
S8_List test_things = {0}; S8_List test_things = {0};
int build_profile = 0; int build_profile = 0;
const char *build_profiles[] = {"debug", "release"}; const char *build_profiles[] = {"debug", "release"};
int build_profiles_count = MA_Lengthof(build_profiles); int build_profiles_count = MA_Lengthof(build_profiles);
CmdParser p = MakeCmdParser(scratch.arena, argc, argv, "this is a test"); CmdParser p = MakeCmdParser(scratch.arena, argc, argv, "this is a test");
AddBool(&p, &build_scratch, "build_scratch", "builds a sandbox where I experiment with things"); AddBool(&p, &build_scratch, "build_scratch", "builds a sandbox where I experiment with things");

10
core/cmd.h
View File

@@ -1,6 +1,7 @@
typedef enum { typedef enum {
CmdDeclKind_Bool, CmdDeclKind_Bool,
CmdDeclKind_Int,
CmdDeclKind_List, CmdDeclKind_List,
CmdDeclKind_Enum, CmdDeclKind_Enum,
} CmdDeclKind; } CmdDeclKind;
@@ -14,6 +15,7 @@ struct CmdDecl {
bool *bool_result; bool *bool_result;
S8_List *list_result; S8_List *list_result;
int *int_result;
int *enum_result; int *enum_result;
const char **enum_options; const char **enum_options;
@@ -27,9 +29,9 @@ struct CmdParser {
MA_Arena *arena; MA_Arena *arena;
const char *custom_help; const char *custom_help;
CmdDecl *fdecl; CmdDecl *fdecl;
CmdDecl *ldecl; CmdDecl *ldecl;
bool require_one_standalone_arg; bool require_one_standalone_arg;
S8_List args; S8_List args;
}; };