altos/lisp: Add builtin 'collect'

[fw/altos] / src / lisp / ao_lisp_builtin.c

diff --git a/src/lisp/ao_lisp_builtin.c b/src/lisp/ao_lisp_builtin.c
index e4b7ef5219ab897aa73d3330cbd278769bb0334d..7cd131f54d3984daf594486cb246678e784372b3 100644 (file)
--- a/src/lisp/ao_lisp_builtin.c
+++ b/src/lisp/ao_lisp_builtin.c
@@ -86,6 +86,8 @@ static const ao_poly builtin_names[] = {
        [builtin_led] = _ao_lisp_atom_led,
        [builtin_save] = _ao_lisp_atom_save,
        [builtin_restore] = _ao_lisp_atom_restore,
+       [builtin_call_cc] = _ao_lisp_atom_call2fcc,
+       [builtin_collect] = _ao_lisp_atom_collect,
 
 };
 
@@ -106,6 +108,7 @@ static const ao_poly ao_lisp_args_atoms[] = {
 char *
 ao_lisp_args_name(uint8_t args)
 {
+       args &= AO_LISP_FUNC_MASK;
        if (args < sizeof ao_lisp_args_atoms / sizeof ao_lisp_args_atoms[0])
                return ao_lisp_poly_atom(ao_lisp_args_atoms[args])->name;
        return "(unknown)";
@@ -116,9 +119,7 @@ void
 ao_lisp_builtin_print(ao_poly b)
 {
        struct ao_lisp_builtin *builtin = ao_lisp_poly_builtin(b);
-       printf("[builtin %s %s]",
-              ao_lisp_args_name(builtin->args),
-              ao_lisp_builtin_name(builtin->func));
+       printf("%s", ao_lisp_builtin_name(builtin->func));
 }
 
 ao_poly
@@ -212,9 +213,9 @@ ao_lisp_last(struct ao_lisp_cons *cons)
 ao_poly
 ao_lisp_length(struct ao_lisp_cons *cons)
 {
-       if (!ao_lisp_check_argc(_ao_lisp_atom_last, cons, 1, 1))
+       if (!ao_lisp_check_argc(_ao_lisp_atom_length, cons, 1, 1))
                return AO_LISP_NIL;
-       if (!ao_lisp_check_argt(_ao_lisp_atom_last, cons, 0, AO_LISP_CONS, 1))
+       if (!ao_lisp_check_argt(_ao_lisp_atom_length, cons, 0, AO_LISP_CONS, 1))
                return AO_LISP_NIL;
        return ao_lisp_int_poly(ao_lisp_cons_length(ao_lisp_poly_cons(ao_lisp_arg(cons, 0))));
 }
@@ -561,6 +562,15 @@ ao_lisp_do_read(struct ao_lisp_cons *cons)
        return ao_lisp_read();
 }
 
+ao_poly
+ao_lisp_do_collect(struct ao_lisp_cons *cons)
+{
+       int     free;
+       (void) cons;
+       free = ao_lisp_collect(AO_LISP_COLLECT_FULL);
+       return ao_lisp_int_poly(free);
+}
+
 const ao_lisp_func_t ao_lisp_builtins[] = {
        [builtin_eval] = ao_lisp_do_eval,
        [builtin_read] = ao_lisp_do_read,
@@ -598,5 +608,7 @@ const ao_lisp_func_t ao_lisp_builtins[] = {
        [builtin_delay] = ao_lisp_delay,
        [builtin_save] = ao_lisp_save,
        [builtin_restore] = ao_lisp_restore,
+       [builtin_call_cc] = ao_lisp_call_cc,
+       [builtin_collect] = ao_lisp_do_collect,
 };