Commit b7513c9e093ab37372646e72be46c01d83b662b4
2023-09-10T19:47:16
fix env_eval_equal_tag and ident_get
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 109 110
diff --git a/libc3/env.c b/libc3/env.c
index e573986..2907e34 100644
--- a/libc3/env.c
+++ b/libc3/env.c
@@ -319,14 +319,22 @@ bool env_eval_equal_tag (s_env *env, const s_tag *a, const s_tag *b,
}
if (is_unbound_a) {
env_eval_tag(env, b, dest);
- frame_binding_new(env->frame, a->data.ident.sym, b);
+ frame_binding_new(env->frame, a->data.ident.sym, dest);
return true;
}
+ else {
+ env_eval_tag(env, a, &tmp_a);
+ a = &tmp_a;
+ }
if (is_unbound_b) {
env_eval_tag(env, a, dest);
- frame_binding_new(env->frame, b->data.ident.sym, a);
+ frame_binding_new(env->frame, b->data.ident.sym, dest);
return true;
}
+ else {
+ env_eval_tag(env, b, &tmp_b);
+ b = &tmp_b;
+ }
switch (a->type) {
case TAG_F32:
case TAG_F64:
diff --git a/libc3/ident.c b/libc3/ident.c
index 1641321..3f57c10 100644
--- a/libc3/ident.c
+++ b/libc3/ident.c
@@ -68,7 +68,7 @@ s_tag * ident_get (const s_ident *ident, s_facts *facts, s_tag *dest)
s_tag tag_ident;
s_tag tag_is_a;
s_tag tag_macro;
- s_tag tag_module_name;
+ s_tag tag_module;
s_tag tag_special_operator;
s_tag tag_sym;
s_tag tag_symbol;
@@ -85,16 +85,19 @@ s_tag * ident_get (const s_ident *ident, s_facts *facts, s_tag *dest)
tag_init_1( &tag_macro, ":macro");
tag_init_1( &tag_special_operator, ":special_operator");
tag_init_sym( &tag_sym, ident->sym);
+ tag_init_sym( &tag_module, module);
tag_init_1( &tag_symbol, ":symbol");
tag_init_var( &tag_var);
facts_with(facts, &cursor, (t_facts_spec) {
- &tag_module_name,
+ &tag_module,
&tag_symbol, &tag_ident, /* module exports symbol */
NULL, NULL });
if (! facts_with_cursor_next(&cursor)) {
- /*warnx("symbol %s not found in module %s",
+ /*
+ warnx("symbol %s not found in module %s",
ident->sym->str.ptr.ps8,
- module->str.ptr.ps8);*/
+ module->str.ptr.ps8);
+ */
facts_with_cursor_clean(&cursor);
return NULL;
}
@@ -104,7 +107,7 @@ s_tag * ident_get (const s_ident *ident, s_facts *facts, s_tag *dest)
NULL, NULL });
if (facts_with_cursor_next(&cursor)) {
if (tag_var.type != TAG_CFN) {
- warnx("%s.%s is not a C function",
+ warnx("%s.%s :cfn is not a C function",
module->str.ptr.ps8,
ident->sym->str.ptr.ps8);
facts_with_cursor_clean(&cursor);
@@ -118,7 +121,7 @@ s_tag * ident_get (const s_ident *ident, s_facts *facts, s_tag *dest)
NULL, NULL });
if (facts_with_cursor_next(&cursor)) {
if (tag_var.type != TAG_FN) {
- warnx("%s.%s is not a function",
+ warnx("%s.%s :fn is not a function",
module->str.ptr.ps8,
ident->sym->str.ptr.ps8);
facts_with_cursor_clean(&cursor);
@@ -127,8 +130,12 @@ s_tag * ident_get (const s_ident *ident, s_facts *facts, s_tag *dest)
facts_with_cursor_clean(&cursor);
}
}
- if (tag_var.type == TAG_VAR)
+ if (tag_var.type == TAG_VAR) {
+ /*
+ warnx("Neither fn nor cfn");
+ */
return NULL;
+ }
facts_with(facts, &cursor, (t_facts_spec) {
&tag_ident, &tag_is_a, &tag_macro, NULL, NULL });
if (facts_with_cursor_next(&cursor)) {
diff --git a/libc3/tag.c b/libc3/tag.c
index 3ccab16..f0bcffb 100644
--- a/libc3/tag.c
+++ b/libc3/tag.c
@@ -3020,6 +3020,8 @@ bool tag_or (const s_tag *a, const s_tag *b)
s_tag * tag_paren (const s_tag *tag, s_tag *dest)
{
+ assert(tag);
+ assert(dest);
return tag_copy(tag, dest);
}