Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Fix up CLI parsing

Browse Source
This commit is contained in:
Bruce Hill 2024-09-03 21:09:11 -04:00
parent c14ed3e3e7
commit e15cb21cd5
3 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -6,9 +6,9 @@ the language design decisions of the future.
``` ```
func greeting(name:Text)->Text: func greeting(name:Text)->Text:
greeting := "hello {name}!" greeting := "hello $name!"
words := greeting:split(" ") words := greeting:split($/ /)
return " ":join([w:capitalize() for w in words]) return " ":join([w:title() for w in words])
func main(name="World"): func main(name="World"):
to_say := greeting(name) to_say := greeting(name)

2
builtins/util.c
View File

@ -105,7 +105,7 @@ public CORD CORD_replace(CORD c, CORD to_replace, CORD replacement)
while (pos < len) { while (pos < len) {
size_t found = CORD_str(c, pos, to_replace); size_t found = CORD_str(c, pos, to_replace);
if (found == CORD_NOT_FOUND) { if (found == CORD_NOT_FOUND) {
if (pos < len-1) if (pos < len)
ret = CORD_cat(ret, CORD_substr(c, pos, len)); ret = CORD_cat(ret, CORD_substr(c, pos, len));
return ret; return ret;
} }

35
compile.c
View File

@ -3011,7 +3011,7 @@ CORD compile_cli_arg_call(env_t *env, CORD fn_name, type_t *fn_type)
set_binding(env, arg->name, new(binding_t, .type=t, .code=CORD_cat("$", arg->name))); set_binding(env, arg->name, new(binding_t, .type=t, .code=CORD_cat("$", arg->name)));
} }
// Provide --flags: // Provide --flags:
code = CORD_all(code, "CORD flag;\n" code = CORD_all(code, "Text_t flag;\n"
"for (int i = 1; i < argc; ) {\n" "for (int i = 1; i < argc; ) {\n"
"if (streq(argv[i], \"--\")) {\n" "if (streq(argv[i], \"--\")) {\n"
"argv[i] = NULL;\n" "argv[i] = NULL;\n"
@ -3024,7 +3024,7 @@ CORD compile_cli_arg_call(env_t *env, CORD fn_name, type_t *fn_type)
switch (t->tag) { switch (t->tag) {
case BoolType: { case BoolType: {
code = CORD_all(code, "else if (pop_flag(argv, &i, \"", flag, "\", &flag)) {\n" code = CORD_all(code, "else if (pop_flag(argv, &i, \"", flag, "\", &flag)) {\n"
"if (flag) {\n", "if (flag.length != 0) {\n",
"$", arg->name, " = Bool$from_text(flag, &", arg->name, "$is_set", ");\n" "$", arg->name, " = Bool$from_text(flag, &", arg->name, "$is_set", ");\n"
"if (!", arg->name, "$is_set) \n" "if (!", arg->name, "$is_set) \n"
"USAGE_ERR(\"Invalid argument for '--", flag, "'\\n\", usage);\n", "USAGE_ERR(\"Invalid argument for '--", flag, "'\\n\", usage);\n",
@ -3037,7 +3037,7 @@ CORD compile_cli_arg_call(env_t *env, CORD fn_name, type_t *fn_type)
} }
case TextType: { case TextType: {
code = CORD_all(code, "else if (pop_flag(argv, &i, \"", flag, "\", &flag)) {\n", code = CORD_all(code, "else if (pop_flag(argv, &i, \"", flag, "\", &flag)) {\n",
"$", arg->name, " = CORD_to_const_char_star(flag);\n", "$", arg->name, " = flag;\n",
arg->name, "$is_set = yes;\n" arg->name, "$is_set = yes;\n"
"}\n"); "}\n");
break; break;
@ -3046,7 +3046,7 @@ CORD compile_cli_arg_call(env_t *env, CORD fn_name, type_t *fn_type)
if (Match(t, ArrayType)->item_type->tag != TextType) if (Match(t, ArrayType)->item_type->tag != TextType)
compiler_err(NULL, NULL, NULL, "Main function has unsupported argument type: %T (only arrays of Text are supported)", t); compiler_err(NULL, NULL, NULL, "Main function has unsupported argument type: %T (only arrays of Text are supported)", t);
code = CORD_all(code, "else if (pop_flag(argv, &i, \"", flag, "\", &flag)) {\n", code = CORD_all(code, "else if (pop_flag(argv, &i, \"", flag, "\", &flag)) {\n",
"$", arg->name, " = Text$split(CORD_to_const_char_star(flag), \",\");\n", "$", arg->name, " = Text$split(flag, \",\");\n",
arg->name, "$is_set = yes;\n" arg->name, "$is_set = yes;\n"
"}\n"); "}\n");
break; break;
@ -3054,7 +3054,7 @@ CORD compile_cli_arg_call(env_t *env, CORD fn_name, type_t *fn_type)
case BigIntType: { case BigIntType: {
CORD type_name = type_to_cord(t); CORD type_name = type_to_cord(t);
code = CORD_all(code, "else if (pop_flag(argv, &i, \"", flag, "\", &flag)) {\n", code = CORD_all(code, "else if (pop_flag(argv, &i, \"", flag, "\", &flag)) {\n",
"if (flag == CORD_EMPTY)\n" "if (flag.length == 0)\n"
"USAGE_ERR(\"No value provided for '--", flag, "'\\n\", usage);\n" "USAGE_ERR(\"No value provided for '--", flag, "'\\n\", usage);\n"
"$", arg->name, " = ", type_name, "$from_text(flag, &", arg->name, "$is_set);\n" "$", arg->name, " = ", type_name, "$from_text(flag, &", arg->name, "$is_set);\n"
"if (!", arg->name, "$is_set)\n" "if (!", arg->name, "$is_set)\n"
@ -3065,11 +3065,11 @@ CORD compile_cli_arg_call(env_t *env, CORD fn_name, type_t *fn_type)
case IntType: case NumType: { case IntType: case NumType: {
CORD type_name = type_to_cord(t); CORD type_name = type_to_cord(t);
code = CORD_all(code, "else if (pop_flag(argv, &i, \"", flag, "\", &flag)) {\n", code = CORD_all(code, "else if (pop_flag(argv, &i, \"", flag, "\", &flag)) {\n",
"if (flag == CORD_EMPTY)\n" "if (flag.length == 0)\n"
"USAGE_ERR(\"No value provided for '--", flag, "'\\n\", usage);\n" "USAGE_ERR(\"No value provided for '--", flag, "'\\n\", usage);\n"
"CORD invalid = CORD_EMPTY;\n", "Text_t invalid = Text(\"\");\n",
"$", arg->name, " = ", type_name, "$from_text(flag, &invalid);\n" "$", arg->name, " = ", type_name, "$from_text(flag, &invalid);\n"
"if (invalid != CORD_EMPTY)\n" "if (invalid.length != 0)\n"
"USAGE_ERR(\"Invalid value provided for '--", flag, "'\\n\", usage);\n", "USAGE_ERR(\"Invalid value provided for '--", flag, "'\\n\", usage);\n",
arg->name, "$is_set = yes;\n" arg->name, "$is_set = yes;\n"
"}\n"); "}\n");
@ -3097,7 +3097,7 @@ CORD compile_cli_arg_call(env_t *env, CORD fn_name, type_t *fn_type)
code, "$", arg->name, " = (array_t){};\n" code, "$", arg->name, " = (array_t){};\n"
"for (; i < argc; i++) {\n" "for (; i < argc; i++) {\n"
"if (argv[i]) {\n" "if (argv[i]) {\n"
"CORD arg = CORD_from_char_star(argv[i]);\n" "Text_t arg = Text$from_str(argv[i]);\n"
"Array$insert(&$", arg->name, ", &arg, 0, $ArrayInfo(&$Text));\n" "Array$insert(&$", arg->name, ", &arg, 0, $ArrayInfo(&$Text));\n"
"argv[i] = NULL;\n" "argv[i] = NULL;\n"
"}\n" "}\n"
@ -3110,13 +3110,20 @@ CORD compile_cli_arg_call(env_t *env, CORD fn_name, type_t *fn_type)
code, code,
"if (i < argc) {"); "if (i < argc) {");
if (t->tag == TextType) { if (t->tag == TextType) {
code = CORD_all(code, "$", arg->name, " = CORD_from_char_star(argv[i]);\n"); code = CORD_all(code, "$", arg->name, " = Text$from_str(argv[i]);\n");
} else if (t->tag == BoolType || t->tag == BigIntType) {
code = CORD_all(
code,
"bool success = false;\n",
"$", arg->name, " = ", type_to_cord(t), "$from_text(Text$from_str(argv[i]), &success)", ";\n"
"if (!success)\n"
"USAGE_ERR(\"Unable to parse this argument as a ", type_to_cord(t), ": \", CORD_from_char_star(argv[i]));\n");
} else { } else {
code = CORD_all( code = CORD_all(
code, code,
"CORD invalid;\n", "Text_t invalid = Text(\"\");\n",
"$", arg->name, " = ", type_to_cord(t), "$from_text(argv[i], &invalid)", ";\n" "$", arg->name, " = ", type_to_cord(t), "$from_text(Text$from_str(argv[i]), &invalid)", ";\n"
"if (invalid != CORD_EMPTY)\n" "if (invalid.length != 0)\n"
"USAGE_ERR(\"Unable to parse this argument as a ", type_to_cord(t), ": \", CORD_from_char_star(argv[i]));\n"); "USAGE_ERR(\"Unable to parse this argument as a ", type_to_cord(t), ": \", CORD_from_char_star(argv[i]));\n");
} }
code = CORD_all( code = CORD_all(
@ -3132,7 +3139,7 @@ CORD compile_cli_arg_call(env_t *env, CORD fn_name, type_t *fn_type)
code = CORD_all(code, "for (; i < argc; i++) {\n" code = CORD_all(code, "for (; i < argc; i++) {\n"
"if (argv[i])\nUSAGE_ERR(\"Unexpected argument: \", Text$quoted(argv[i], false), \"\\n\", usage);\n}\n"); "if (argv[i])\nUSAGE_ERR(\"Unexpected argument: \", CORD_quoted(argv[i]), \"\\n\", usage);\n}\n");
code = CORD_all(code, fn_name, "("); code = CORD_all(code, fn_name, "(");
for (arg_t *arg = fn_info->args; arg; arg = arg->next) { for (arg_t *arg = fn_info->args; arg; arg = arg->next) {