Commit 20080c9cc9ac4f6bb8f7bf566a3cff800bd5e064
2024-07-24T16:25:37
wip call
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 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108
diff --git a/libkc3/env.c b/libkc3/env.c
index 3984a70..2e0e516 100644
--- a/libkc3/env.c
+++ b/libkc3/env.c
@@ -74,7 +74,6 @@ bool env_call_get (s_env *env, s_call *call)
s_tag tag_module_name;
s_tag tag_operator;
s_tag tag_special_operator;
- s_tag tag_sym;
s_tag tag_symbol;
s_tag tag_symbol_value;
s_tag tag_var;
@@ -84,7 +83,6 @@ bool env_call_get (s_env *env, s_call *call)
tag_init_sym( &tag_module_name, call->ident.module);
tag_init_sym( &tag_operator, &g_sym_operator);
tag_init_sym( &tag_special_operator, &g_sym_special_operator);
- tag_init_sym( &tag_sym, call->ident.sym);
tag_init_sym( &tag_symbol, &g_sym_symbol);
tag_init_sym( &tag_symbol_value, &g_sym_symbol_value);
tag_init_var( &tag_var, &g_sym_Tag);
@@ -376,7 +374,8 @@ s_tag * env_defoperator (s_env *env, const s_sym * const *name,
facts_add_tags(&env->facts, &tag_module_name, &tag_operator,
&tag_ident);
facts_replace_tags(&env->facts, &tag_ident, &tag_is_a, &tag_operator);
- facts_replace_tags(&env->facts, &tag_ident, &tag_sym_sym, &tag_sym);
+ facts_replace_tags(&env->facts, &tag_ident, &tag_sym_sym,
+ &tag_sym_value);
facts_replace_tags(&env->facts, &tag_ident, &tag_arity_sym,
&tag_arity_u8);
facts_replace_tags(&env->facts, &tag_ident, &tag_symbol_value,
@@ -523,14 +522,19 @@ bool env_eval_block (s_env *env, const s_block *block, s_tag *dest)
bool env_eval_call (s_env *env, const s_call *call, s_tag *dest)
{
- s_call c;
+ s_call c = {0};
bool result;
assert(env);
assert(call);
assert(dest);
(void) call;
call_init_copy(&c, call);
- env_eval_call_resolve(env, &c);
+ if (! env_eval_call_resolve(env, &c)) {
+ err_write_1("env_eval_call: env_eval_call_resolve: ");
+ err_inspect_ident(&c.ident);
+ err_write_1("\n");
+ return false;
+ }
if (c.cfn)
result = env_eval_call_cfn(env, &c, dest);
else if (c.fn)
@@ -709,39 +713,40 @@ bool env_eval_call_fn_args (s_env *env, const s_fn *fn,
bool env_eval_call_resolve (s_env *env, s_call *call)
{
bool b;
+ s_call tmp;
s_ident tmp_ident;
const s_tag *value;
assert(env);
assert(call);
- if (call->ident.module == NULL &&
- (value = env_frames_get(env, call->ident.sym))) {
+ tmp = *call;
+ if (tmp.ident.module == NULL &&
+ (value = env_frames_get(env, tmp.ident.sym))) {
if (value->type == TAG_CFN) {
- call->cfn = cfn_new_copy(&value->data.cfn);
+ tmp.cfn = cfn_new_copy(&value->data.cfn);
+ *call = tmp;
return true;
}
else if (value->type == TAG_FN) {
- call->fn = fn_new_copy(&value->data.fn);
+ tmp.fn = fn_new_copy(&value->data.fn);
+ *call = tmp;
return true;
}
}
- ident_init_copy(&tmp_ident, &call->ident);
- if (! env_ident_resolve_module(env, &tmp_ident, &call->ident) ||
- ! env_module_ensure_loaded(env, call->ident.module) ||
- ! env_module_has_ident(env, call->ident.module, &call->ident,
+ if (! env_ident_resolve_module(env, &tmp.ident, &tmp.ident) ||
+ ! env_module_ensure_loaded(env, tmp.ident.module) ||
+ ! env_module_has_ident(env, tmp.ident.module, &tmp.ident,
&b) ||
! b ||
! env_call_get(env, call)) {
- ident_init_copy(&call->ident, &tmp_ident);
- call->ident.module = &g_sym_KC3;
- if (! env_module_ensure_loaded(env, call->ident.module) ||
- ! env_module_has_ident(env, call->ident.module, &call->ident,
+ tmp.ident.module = &g_sym_KC3;
+ if (! env_module_ensure_loaded(env, tmp.ident.module) ||
+ ! env_module_has_ident(env, tmp.ident.module, &tmp.ident,
&b) ||
! b ||
- ! env_call_get(env, call)) {
- ident_init_copy(&call->ident, &tmp_ident);
+ ! env_call_get(env, &tmp))
return false;
- }
}
+ *call = tmp;
return true;
}