Commit 7c2ab2a72006b14975eab4f7bd0a51a846674a4e
2023-11-30T13:48:49
wip tests
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83
diff --git a/libc3/c3.c b/libc3/c3.c
index 58d6d84..ba49061 100644
--- a/libc3/c3.c
+++ b/libc3/c3.c
@@ -47,7 +47,7 @@ void c3_exit (sw code)
exit((int) code);
}
-s_env * c3_init (s_env *env, sw argc, s8 **argv)
+s_env * c3_init (s_env *env, int argc, s8 **argv)
{
if (! env)
env = &g_c3_env;
diff --git a/libc3/c3_main.h b/libc3/c3_main.h
index d6c83d3..12d3ed7 100644
--- a/libc3/c3_main.h
+++ b/libc3/c3_main.h
@@ -26,7 +26,7 @@ extern const s8 *g_c3_license;
extern sw g_c3_exit_code;
/* stack-allocation compatible functions */
-s_env * c3_init (s_env *env, sw argc, s8 **argv);
+s_env * c3_init (s_env *env, int argc, s8 **argv);
void c3_clean (s_env *env);
/* debug */
diff --git a/libc3/env.c b/libc3/env.c
index 655aad3..36f0827 100644
--- a/libc3/env.c
+++ b/libc3/env.c
@@ -50,7 +50,7 @@ s_env g_c3_env;
static bool env_eval_array_cast (s_env *env, s_array *tmp,
const s_tag *tag, u8 *data, uw size);
-static s_env * env_init_args (s_env *env, sw argc, s8 **argv);
+static s_env * env_init_args (s_env *env, int argc, s8 **argv);
void env_clean (s_env *env)
{
@@ -737,7 +737,7 @@ bool env_eval_tuple (s_env *env, const s_tuple *tuple, s_tag *dest)
return true;
}
-s_env * env_init (s_env *env, sw argc, s8 **argv)
+s_env * env_init (s_env *env, int argc, s8 **argv)
{
s_str path;
assert(env);
@@ -775,7 +775,7 @@ s_env * env_init (s_env *env, sw argc, s8 **argv)
return env;
}
-s_env * env_init_args (s_env *env, sw argc, s8 **argv)
+s_env * env_init_args (s_env *env, int argc, s8 **argv)
{
s8 a[PATH_MAX];
s_buf buf;
diff --git a/libc3/env.h b/libc3/env.h
index db6fc4b..635e46c 100644
--- a/libc3/env.h
+++ b/libc3/env.h
@@ -19,7 +19,7 @@ extern s_env g_c3_env;
/* Stack allocation compatible functions, call env_clean after use. */
void env_clean (s_env *env);
-s_env * env_init (s_env *env, sw argc, s8 **argv);
+s_env * env_init (s_env *env, int argc, s8 **argv);
/* Modifiers. */
bool env_eval_array (s_env *env, const s_array *array,
diff --git a/libc3/sym.c b/libc3/sym.c
index ac6abfd..cecdb79 100644
--- a/libc3/sym.c
+++ b/libc3/sym.c
@@ -26,7 +26,7 @@ static s_sym_list * g_sym_list = NULL;
const s_sym * sym_1 (const s8 *p)
{
s_str stra;
- str_init_copy_1(&stra, NULL, p);
+ str_init_1(&stra, NULL, p);
return str_to_sym(&stra);
}