Commit e375fa40b584b8572f14d5ff5733856f88619b11
2023-10-19T13:43:10
wip segv
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
diff --git a/lib/c3/0.1/c3.facts b/lib/c3/0.1/c3.facts
index 30dc597..1daf5cf 100644
--- a/lib/c3/0.1/c3.facts
+++ b/lib/c3/0.1/c3.facts
@@ -171,9 +171,3 @@ replace {C3.operator23, :cfn, cfn Tag "tag_equal" (Tag, Tag, Result)}
replace {C3.operator23, :operator_precedence, 13}
replace {C3.operator23, :operator_associativity, :right}
replace {C3.break, :cfn, cfn Void "c3_break" ()}
-replace {C3.first, :fn, fn {
- ((a | _b)) { a }
- ({a, _b}) { a }
- ({a, _b, _c}) { a }
- ({a, _b, _c, _d}) { a }
-}}
diff --git a/libc3/env.c b/libc3/env.c
index fcf9c82..28609ac 100644
--- a/libc3/env.c
+++ b/libc3/env.c
@@ -757,19 +757,25 @@ s_ident * env_operator_call_ident (s_env *env, const s_ident *op,
s_tag tag_arity;
s_tag tag_arity_u8;
s_tag tag_ident;
+ s_tag tag_is_a;
+ s_tag tag_module;
s_tag tag_module_name;
s_tag tag_operator;
s_tag tag_sym;
s_tag tag_symbol;
- dest->module = op->module;
+ s_ident tmp;
+ tmp = *op;
+ ident_resolve_module(&tmp, env);
tag_init_1( &tag_arity, ":arity");
tag_init_u8( &tag_arity_u8, arity);
tag_init_var(&tag_ident);
- tag_init_sym(&tag_module_name, op->module);
- tag_init_sym(&tag_sym, op->sym);
+ tag_init_1( &tag_is_a, ":is_a");
+ tag_init_1( &tag_module, ":module");
+ tag_init_sym(&tag_module_name, tmp.module);
+ tag_init_sym(&tag_sym, tmp.sym);
tag_init_1( &tag_symbol, ":symbol");
facts_with(&env->facts, &cursor, (t_facts_spec) {
- &tag_module_name,
+ &tag_module_name, &tag_is_a, &tag_module,
&tag_operator, &tag_ident, NULL, /* module exports operator */
&tag_ident, &tag_symbol, &tag_sym,
&tag_arity, &tag_arity_u8,
@@ -781,9 +787,10 @@ s_ident * env_operator_call_ident (s_env *env, const s_ident *op,
return dest;
}
}
- warnx("operator %s not found in module %s",
- op->sym->str.ptr.ps8,
- op->module->str.ptr.ps8);
+ warnx("env_operator_call_ident: operator %s/%d not found in module %s",
+ tmp.sym->str.ptr.ps8,
+ arity,
+ tmp.module->str.ptr.ps8);
facts_with_cursor_clean(&cursor);
return NULL;
}