Commit eb306d97b40f35e773a55670d8e36e13936017a3
2023-02-11T09:35:05
wip
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 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132
diff --git a/libc3/env.c b/libc3/env.c
index 2945bb7..18e86d1 100644
--- a/libc3/env.c
+++ b/libc3/env.c
@@ -77,32 +77,32 @@ s_tag * env_eval_call (s_env *env, const s_call *call, s_tag *dest)
s_facts_with_cursor cursor;
s_tag *result;
s_tag tag_fn;
- s_tag tag_function;
s_tag tag_ident;
s_tag tag_is_a;
s_tag tag_macro;
s_tag tag_module;
s_tag tag_module_name;
s_tag tag_sym;
+ s_tag tag_symbol;
s_tag tag_var_fn;
assert(env);
assert(call);
assert(dest);
call_copy(call, &c);
ident_resolve_module(&c.ident, env);
- tag_init_ident(&tag_ident, &c.ident);
tag_init_1( &tag_fn, ":fn");
- tag_init_1( &tag_function, ":function");
+ tag_init_ident(&tag_ident, &c.ident);
tag_init_1( &tag_is_a, ":is-a");
tag_init_1( &tag_macro, ":macro");
tag_init_1( &tag_module, ":module");
tag_init_sym( &tag_module_name, c.ident.module_name);
tag_init_sym( &tag_sym, call->ident.sym);
+ tag_init_1( &tag_symbol, ":symbol");
tag_init_var( &tag_var_fn);
facts_with(&env->facts, &cursor, (t_facts_spec) {
&tag_module_name,
&tag_is_a, &tag_module, /* module exists */
- &tag_function, &tag_ident, NULL, /* module exports symbol */
+ &tag_symbol, &tag_ident, NULL, /* module exports symbol */
&tag_ident, &tag_fn, &tag_var_fn,
NULL, NULL });
if (! facts_with_cursor_next(&cursor))
@@ -153,11 +153,21 @@ s_tag * env_eval_call_fn (s_env *env, const s_call *call, s_tag *dest)
assert(fn);
frame_init(&frame, env->frame);
env->frame = &frame;
- args = env_eval_call_arguments(env, call->arguments);
- if (env_eval_equal_list(env, fn->pattern, args, &tmp)) {
- env_eval_progn(env, fn->algo, dest);
+ if (call->arguments) {
+ if (! (args = env_eval_call_arguments(env, call->arguments)))
+ return NULL;
+ if (! env_eval_equal_list(env, fn->pattern, args, &tmp)) {
+ list_delete_all(args);
+ return NULL;
+ }
+ }
+ if (! env_eval_progn(env, fn->algo, dest)) {
+ list_delete_all(args);
list_delete_all(tmp);
+ return NULL;
}
+ list_delete_all(args);
+ list_delete_all(tmp);
env->frame = frame_clean(&frame);
return dest;
}
@@ -215,12 +225,12 @@ bool env_eval_equal_tag (s_env *env, const s_tag *a, const s_tag *b,
if (b->type.type == TAG_IDENT)
warnx("TAG_IDENT = TAG_IDENT");
tag_copy(b, dest);
- frame_binding_new(env->frame, a->data.ident.sym, dest);
+ frame_binding_new(env->frame, a->data.ident.sym, b);
return true;
}
if (b->type.type == TAG_IDENT) {
tag_copy(a, dest);
- frame_binding_new(env->frame, b->data.ident.sym, dest);
+ frame_binding_new(env->frame, b->data.ident.sym, a);
return true;
}
if (a->type.type != b->type.type) {
diff --git a/libc3/frame.c b/libc3/frame.c
index 3283e49..cccdff2 100644
--- a/libc3/frame.c
+++ b/libc3/frame.c
@@ -18,7 +18,8 @@
#include "frame.h"
#include "list.h"
-void frame_binding_new (s_frame *frame, const s_sym *name, s_tag *value)
+void frame_binding_new (s_frame *frame, const s_sym *name,
+ const s_tag *value)
{
frame->bindings = binding_new(name, value, frame->bindings);
}
diff --git a/libc3/frame.h b/libc3/frame.h
index 3ee0890..607a3fb 100644
--- a/libc3/frame.h
+++ b/libc3/frame.h
@@ -28,7 +28,8 @@ void frame_delete (s_frame *frame);
void frame_delete_all (s_frame *frame);
/* modifiers */
-void frame_binding_new(s_frame *frame, const s_sym *name, s_tag *value);
+void frame_binding_new(s_frame *frame, const s_sym *name,
+ const s_tag *value);
/* observers */
const s_tag * frame_get (s_frame *frame, const s_sym *sym);
diff --git a/test/ic3/function_call.in b/test/ic3/function_call.in
deleted file mode 100644
index a6db9d7..0000000
--- a/test/ic3/function_call.in
+++ /dev/null
@@ -1,17 +0,0 @@
-a = fn {
- (u8 x) { 8 * x }
- (s8 x) { -8 * x }
- (u16 x) { 16 * x }
- (s16 x) {
- -16 * x
- }
-}
-
-a(1)
-a(2)
-a(-1)
-a(-2)
-a(1000)
-a(2000)
-a(-1000)
-a(-2000)