max/uclisp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add mapcar builtin, more tests, fixes

Browse Source
This commit is contained in:
Max Regan
2022-11-05 20:47:33 -04:00
parent f9ace289f1
commit 4da62ad2da
7 changed files with 144 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/evaluate.c
View File

@@ -15,6 +15,7 @@ struct ucl_object *ucl_evaluate_builtin_form(struct ucl_state *state, struct ucl
FOREACH_LIST(list, iter, item) {
struct ucl_object *obj = ucl_evaluate(state, item);
UCL_RET_IF_ERROR(obj);
ucl_list_append(evaluated_list, obj);
};
@@ -47,20 +48,7 @@ struct ucl_object *ucl_evaluate_special_form(struct ucl_state *state, struct ucl
// TODO: Recursively eval args
const char *fun_sym = ucl_car(list)->symbol;
struct ucl_object *fun = ucl_state_get(state, ucl_car(list)->symbol);
struct ucl_object *args = ucl_cdr(list);
struct ucl_object *result = NULL;
result = fun->special(state, args);
return result;
}
struct ucl_object *ucl_evaluate_lisp_form(struct ucl_state *state, struct ucl_object *list) {
// TODO: Recursively eval args
const char *fun_sym = ucl_car(list)->symbol;
struct ucl_object *fun = ucl_state_get(state, ucl_car(list)->symbol);
struct ucl_object *fun = ucl_state_get(state, fun_sym);
struct ucl_object *args = ucl_cdr(list);
struct ucl_object *result = NULL;
@@ -74,11 +62,7 @@ struct ucl_object *ucl_evaluate_list(struct ucl_state *state, struct ucl_object
return list;
}
struct ucl_object *fun_sym = ucl_car(list);
if (fun_sym->type != UCL_TYPE_SYMBOL) {
return ucl_error_create("Unknown function symbol");
}
struct ucl_object *fun = ucl_state_get(state, fun_sym->symbol);
struct ucl_object *fun = ucl_evaluate(state, ucl_car(list));
UCL_RET_IF_ERROR(fun);
if (fun->type == UCL_TYPE_SPECIAL) {