Commit 1b26694418693fb6ba9bee9eedd8c906fb9e588b
2024-04-12T10:58:35
wip env_eval_fn
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 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400
diff --git a/libc3/env.c b/libc3/env.c
index 7a5840c..5f561d0 100644
--- a/libc3/env.c
+++ b/libc3/env.c
@@ -23,6 +23,7 @@
#include "call.h"
#include "cfn.h"
#include "compare.h"
+#include "complex.h"
#include "data.h"
#include "env.h"
#include "error.h"
@@ -419,7 +420,79 @@ bool env_eval_call_fn (s_env *env, const s_call *call, s_tag *dest)
assert(env);
assert(call);
assert(dest);
- return env_eval_fn_call(env, call->fn, call->arguments, dest);
+ return env_eval_call_fn_args(env, call->fn, call->arguments, dest);
+}
+
+bool env_eval_call_fn_args (s_env *env, const s_fn *fn,
+ const s_list *arguments, s_tag *dest)
+{
+ s_list *args = NULL;
+ const s_list *args_final = NULL;
+ s_fn_clause *clause;
+ s_frame frame;
+ s_tag tag;
+ s_list *tmp = NULL;
+ assert(env);
+ assert(fn);
+ assert(dest);
+ clause = fn->clauses;
+ if (arguments) {
+ if (fn->macro || fn->special_operator)
+ args_final = arguments;
+ else {
+ if (! env_eval_call_arguments(env, arguments, &args)) {
+ env->frame = frame_clean(&frame);
+ return false;
+ }
+ args_final = args;
+ }
+ while (clause) {
+ frame_init(&frame, env->frame);
+ env->frame = &frame;
+ if (env_eval_equal_list(env, fn->macro || fn->special_operator,
+ clause->pattern, args_final, &tmp))
+ break;
+ env->frame = frame_clean(&frame);
+ clause = clause->next_clause;
+ }
+ if (! clause) {
+ err_puts("env_eval_fn_call: no clause matching.\nTried clauses :\n");
+ clause = fn->clauses;
+ while (clause) {
+ err_inspect_fn_pattern(clause->pattern);
+ err_puts("\n");
+ clause = clause->next_clause;
+ }
+ err_puts("\nArguments :\n");
+ err_inspect_fn_pattern(args);
+ err_puts("\n");
+ list_delete_all(args);
+ return false;
+ }
+ }
+ else {
+ frame_init(&frame, env->frame);
+ env->frame = &frame;
+ }
+ if (! env_eval_block(env, &clause->algo, &tag)) {
+ list_delete_all(args);
+ list_delete_all(tmp);
+ env->frame = frame_clean(&frame);
+ return false;
+ }
+ list_delete_all(args);
+ list_delete_all(tmp);
+ env->frame = frame_clean(&frame);
+ if (fn->macro) {
+ if (! env_eval_tag(env, &tag, dest)) {
+ tag_clean(&tag);
+ return false;
+ }
+ tag_clean(&tag);
+ }
+ else
+ *dest = tag;
+ return true;
}
bool env_eval_call_resolve (s_env *env, s_call *call)
@@ -764,76 +837,56 @@ bool env_eval_equal_tuple (s_env *env, bool macro, const s_tuple *a,
return true;
}
-bool env_eval_fn_call (s_env *env, const s_fn *fn,
- const s_list *arguments, s_tag *dest)
+bool env_eval_fn (s_env *env, const s_fn *fn, s_tag *dest)
{
- s_list *args = NULL;
- const s_list *args_final = NULL;
- s_fn_clause *clause;
- s_frame frame;
- s_tag tag;
- s_list *tmp = NULL;
+ uw i;
+ s_fn_clause *src_clause;
+ s_list *src_pattern;
+ s_fn tmp = {0};
+ s_fn_clause **tmp_clause;
+ s_list **tmp_pattern;
assert(env);
assert(fn);
assert(dest);
- clause = fn->clauses;
- if (arguments) {
- if (fn->macro || fn->special_operator)
- args_final = arguments;
- else {
- if (! env_eval_call_arguments(env, arguments, &args)) {
- env->frame = frame_clean(&frame);
- return false;
- }
- args_final = args;
- }
- while (clause) {
- frame_init(&frame, env->frame);
- env->frame = &frame;
- if (env_eval_equal_list(env, fn->macro || fn->special_operator,
- clause->pattern, args_final, &tmp))
- break;
- env->frame = frame_clean(&frame);
- clause = clause->next_clause;
- }
- if (! clause) {
- err_puts("env_eval_fn_call: no clause matching.\nTried clauses :\n");
- clause = fn->clauses;
- while (clause) {
- err_inspect_fn_pattern(clause->pattern);
- err_puts("\n");
- clause = clause->next_clause;
- }
- err_puts("\nArguments :\n");
- err_inspect_fn_pattern(args);
- err_puts("\n");
- list_delete_all(args);
- return false;
+ tmp_clause = &tmp.clauses;
+ src_clause = fn->clauses;
+ while (src_clause) {
+ *tmp_clause = fn_clause_new(NULL);
+ if (! *tmp_clause)
+ goto ko;
+ (*tmp_clause)->arity = src_clause->arity;
+ tmp_pattern = &(*tmp_clause)->pattern;
+ src_pattern = src_clause->pattern;
+ while (src_pattern) {
+ *tmp_pattern = list_new(NULL);
+ if (! *tmp_pattern)
+ goto ko;
+ if (! env_eval_fn_tag(env, &src_pattern->tag,
+ &(*tmp_pattern)->tag))
+ goto ko;
+ tmp_pattern = &(*tmp_pattern)->next.data.list;
+ src_pattern = list_next(src_pattern);
}
- }
- else {
- frame_init(&frame, env->frame);
- env->frame = &frame;
- }
- if (! env_eval_block(env, &clause->algo, &tag)) {
- list_delete_all(args);
- list_delete_all(tmp);
- env->frame = frame_clean(&frame);
- return false;
- }
- list_delete_all(args);
- list_delete_all(tmp);
- env->frame = frame_clean(&frame);
- if (fn->macro) {
- if (! env_eval_tag(env, &tag, dest)) {
- tag_clean(&tag);
- return false;
+ if (! block_init(&(*tmp_clause)->algo, src_clause->algo.count))
+ goto ko;
+ i = 0;
+ while (i < src_clause->algo.count) {
+ if (! env_eval_fn_tag(env, src_clause->algo.tag + i,
+ (*tmp_clause)->algo.tag + i))
+ goto ko;
+ i++;
}
- tag_clean(&tag);
+ tmp_clause = &(*tmp_clause)->next_clause;
+ src_clause = src_clause->next_clause;
}
- else
- *dest = tag;
+ tmp.macro = fn->macro;
+ tmp.special_operator = fn->special_operator;
+ dest->type = TAG_FN;
+ dest->data.fn = tmp;
return true;
+ ko:
+ fn_clean(&tmp);
+ return false;
}
bool env_eval_ident (s_env *env, const s_ident *ident, s_tag *dest)
@@ -1022,6 +1075,24 @@ bool env_eval_quote_call (s_env *env, const s_call *call, s_tag *dest)
return false;
}
+bool env_eval_quote_complex (s_env *env, const s_complex *c,
+ s_tag *dest)
+{
+ s_tag tmp = {0};
+ assert(env);
+ assert(c);
+ assert(dest);
+ tmp.type = TAG_COMPLEX;
+ tmp.data.complex = complex_new();
+ if (! env_eval_quote_tag(env, &c->x, &tmp.data.complex->x) ||
+ ! env_eval_quote_tag(env, &c->y, &tmp.data.complex->y)) {
+ complex_delete(tmp.data.complex);
+ return false;
+ }
+ *dest = tmp;
+ return true;
+}
+
bool env_eval_quote_list (s_env *env, const s_list *list, s_tag *dest)
{
s_list *next;
@@ -1139,6 +1210,8 @@ bool env_eval_quote_tag (s_env *env, const s_tag *tag, s_tag *dest)
return env_eval_quote_block(env, &tag->data.block, dest);
case TAG_CALL:
return env_eval_quote_call(env, &tag->data.call, dest);
+ case TAG_COMPLEX:
+ return env_eval_quote_complex(env, tag->data.complex, dest);
case TAG_LIST:
return env_eval_quote_list(env, tag->data.list, dest);
case TAG_MAP:
@@ -1155,7 +1228,6 @@ bool env_eval_quote_tag (s_env *env, const s_tag *tag, s_tag *dest)
case TAG_BOOL:
case TAG_CFN:
case TAG_CHARACTER:
- case TAG_COMPLEX:
case TAG_F32:
case TAG_F64:
case TAG_F128:
@@ -1319,75 +1391,6 @@ bool env_eval_struct (s_env *env, const s_struct *s, s_tag *dest)
return false;
}
-bool env_eval_fn (s_env *env, const s_fn *fn, s_tag *dest)
-{
- uw i;
- s_block *src_block;
- s_fn_clause *src_clause;
- s_list *src_pattern;
- s_tag *src_tag;
- s_tag tmp = {0};
- s_block *tmp_block;
- s_fn_clause **tmp_clause;
- s_fn *tmp_fn;
- s_list **tmp_pattern;
- s_tag *tmp_tag;
- assert(env);
- assert(fn);
- assert(dest);
- (void) env;
- tmp.type = TAG_FN;
- tmp_fn = &tmp.data.fn;
- src_clause = fn->clauses;
- tmp_clause = &tmp_fn->clauses;
- while (src_clause) {
- *tmp_clause = fn_clause_new(NULL);
- src_pattern = src_clause->pattern;
- tmp_pattern = &(*tmp_clause)->pattern;
- while (src_pattern) {
- *tmp_pattern = list_new(NULL);
- if (! env_eval_fn_tag(env, &src_pattern->tag,
- &(*tmp_pattern)->tag))
- goto ko;
- src_pattern = list_next(src_pattern);
- tmp_pattern = &(*tmp_pattern)->next.data.list;
- }
- src_block = &src_clause->algo;
- tmp_block = &(*tmp_clause)->algo;
- if (! block_init(tmp_block, src_block->count))
- goto ko;
- tmp_block->short_form = src_block->short_form;
- i = 0;
- while (i < src_block->count) {
- src_tag = src_block->tag + i;
- tmp_tag = tmp_block->tag + i;
- if (! env_eval_fn_tag(env, src_tag, tmp_tag))
- goto ko;
- i++;
- }
- src_clause = src_clause->next_clause;
- tmp_clause = &(*tmp_clause)->next_clause;
- }
- tmp_fn->macro = fn->macro;
- tmp_fn->special_operator = fn->special_operator;
- *dest = tmp;
- return true;
- ko:
- fn_clean(&tmp.data.fn);
- return false;
-}
-
-bool env_eval_fn_tag (s_env *env, const s_tag *tag, s_tag *dest)
-{
- assert(env);
- assert(tag);
- assert(dest);
- (void) env;
- if (! tag_init_copy(dest, tag))
- return false;
- return true;
-}
-
bool env_eval_tag (s_env *env, const s_tag *tag, s_tag *dest)
{
assert(env);
diff --git a/libc3/env.h b/libc3/env.h
index acdb0f8..27786ea 100644
--- a/libc3/env.h
+++ b/libc3/env.h
@@ -51,6 +51,9 @@ bool env_eval_call_cfn (s_env *env, const s_call *call,
s_tag *dest);
bool env_eval_call_fn (s_env *env, const s_call *call,
s_tag *dest);
+bool env_eval_call_fn_args (s_env *env, const s_fn *fn,
+ const s_list *arguments,
+ s_tag *dest);
bool env_eval_call_resolve (s_env *env, s_call *call);
bool env_eval_complex (s_env *env, const s_complex *c,
s_tag *dest);
@@ -73,8 +76,33 @@ bool env_eval_equal_tuple (s_env *env, bool macro,
bool env_eval_fn (s_env *env, const s_fn *fn, s_tag *dest);
bool env_eval_fn_tag (s_env *env, const s_tag *tag,
s_tag *dest);
-bool env_eval_fn_call (s_env *env, const s_fn *fn,
- const s_list *arguments, s_tag *dest);
+bool env_eval_fn_tag_array (s_env *env, const s_array *array,
+ s_tag *dest);
+bool env_eval_fn_tag_block (s_env *env, const s_block *block,
+ s_tag *dest);
+bool env_eval_fn_tag_call (s_env *env, const s_call *call,
+ s_tag *dest);
+bool env_eval_fn_tag_complex (s_env *env, const s_complex *c,
+ s_tag *dest);
+bool env_eval_fn_tag_ident (s_env *env, const s_ident *ident,
+ s_tag *dest);
+bool env_eval_fn_tag_list (s_env *env, const s_list *list,
+ s_tag *dest);
+bool env_eval_fn_tag_map (s_env *env, const s_map *map,
+ s_tag *dest);
+bool env_eval_fn_tag_quote (s_env *env, const s_quote *quote,
+ s_tag *dest);
+bool env_eval_fn_tag_str (s_env *env, const s_str *str,
+ s_tag *dest);
+bool env_eval_fn_tag_struct (s_env *env, const s_struct *s,
+ s_tag *dest);
+bool env_eval_fn_tag_tag (s_env *env, const s_tag *tag,
+ s_tag *dest);
+bool env_eval_fn_tag_tuple (s_env *env, const s_tuple *tuple,
+ s_tag *dest);
+bool env_eval_fn_tag_unquote (s_env *env,
+ const s_unquote *unquote,
+ s_tag *dest);
bool env_eval_ident (s_env *env, const s_ident *ident,
s_tag *dest);
bool env_eval_ident_is_bound (s_env *env,
@@ -93,6 +121,8 @@ bool env_eval_quote_block (s_env *env, const s_block *block,
s_tag *dest);
bool env_eval_quote_call (s_env *env, const s_call *call,
s_tag *dest);
+bool env_eval_quote_complex (s_env *env, const s_complex *c,
+ s_tag *dest);
bool env_eval_quote_list (s_env *env, const s_list *list,
s_tag *dest);
bool env_eval_quote_map (s_env *env, const s_map *map,
diff --git a/libc3/eval.c b/libc3/eval.c
index f0cd387..8908a61 100644
--- a/libc3/eval.c
+++ b/libc3/eval.c
@@ -20,5 +20,5 @@ bool eval_tag (const s_tag *tag, s_tag *dest)
bool eval_fn_call (const s_fn *fn, const s_list *args, s_tag *dest)
{
- return env_eval_fn_call(&g_c3_env, fn, args, dest);
+ return env_eval_call_fn_args(&g_c3_env, fn, args, dest);
}