altos/lisp: Add non-cons cdr support

[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 6cbcb92cb401624cb3f2653da3da0f1f7a763534..5a960873222500a9834a15b99bf6260211ac11ba 100644 (file)
--- a/src/lisp/ao_lisp_builtin.c
+++ b/src/lisp/ao_lisp_builtin.c
@@ -86,7 +86,14 @@ 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,
+#if 0
+       [builtin_symbolp] = _ao_lisp_atom_symbolp,
+       [builtin_listp] = _ao_lisp_atom_listp,
+       [builtin_stringp] = _ao_lisp_atom_stringp,
+       [builtin_numberp] = _ao_lisp_atom_numberp,
+#endif
 };
 
 static char *
@@ -117,9 +124,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
@@ -185,11 +190,9 @@ ao_lisp_cons(struct ao_lisp_cons *cons)
        ao_poly car, cdr;
        if(!ao_lisp_check_argc(_ao_lisp_atom_cons, cons, 2, 2))
                return AO_LISP_NIL;
-       if (!ao_lisp_check_argt(_ao_lisp_atom_cons, cons, 1, AO_LISP_CONS, 1))
-               return AO_LISP_NIL;
        car = ao_lisp_arg(cons, 0);
        cdr = ao_lisp_arg(cons, 1);
-       return ao_lisp_cons_poly(ao_lisp_cons_cons(car, ao_lisp_poly_cons(cdr)));
+       return ao_lisp__cons(car, cdr);
 }
 
 ao_poly
@@ -242,14 +245,12 @@ ao_lisp_set(struct ao_lisp_cons *cons)
 ao_poly
 ao_lisp_setq(struct ao_lisp_cons *cons)
 {
-       struct ao_lisp_cons     *expand = 0;
        if (!ao_lisp_check_argc(_ao_lisp_atom_setq, cons, 2, 2))
                return AO_LISP_NIL;
-       expand = ao_lisp_cons_cons(_ao_lisp_atom_set,
-                                  ao_lisp_cons_cons(ao_lisp_cons_poly(ao_lisp_cons_cons(_ao_lisp_atom_quote,
-                                                                      ao_lisp_cons_cons(cons->car, NULL))),
-                                                    ao_lisp_poly_cons(cons->cdr)));
-       return ao_lisp_cons_poly(expand);
+       return ao_lisp__cons(_ao_lisp_atom_set,
+                            ao_lisp__cons(ao_lisp__cons(_ao_lisp_atom_quote,
+                                                        ao_lisp__cons(cons->car, AO_LISP_NIL)),
+                                          cons->cdr));
 }
 
 ao_poly
@@ -562,6 +563,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,
@@ -599,5 +609,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,
 };