altos/lisp: Split out read debug, add memory validation

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

diff --git a/src/lisp/ao_lisp_cons.c b/src/lisp/ao_lisp_cons.c
index 9379597ca82eb88ed6ae2866f2a11358cb4d7f6e..06e9d361e65630bf7b35d66ca2fef0eb4416db4e 100644 (file)
--- a/src/lisp/ao_lisp_cons.c
+++ b/src/lisp/ao_lisp_cons.c
@@ -105,6 +105,19 @@ ao_lisp_cons_cons(ao_poly car, ao_poly cdr)
        return cons;
 }
 
+struct ao_lisp_cons *
+ao_lisp_cons_cdr(struct ao_lisp_cons *cons)
+{
+       ao_poly cdr = cons->cdr;
+       if (cdr == AO_LISP_NIL)
+               return NULL;
+       if (ao_lisp_poly_type(cdr) != AO_LISP_CONS) {
+               (void) ao_lisp_error(AO_LISP_INVALID, "improper list");
+               return NULL;
+       }
+       return ao_lisp_poly_cons(cdr);
+}
+
 ao_poly
 ao_lisp__cons(ao_poly car, ao_poly cdr)
 {
@@ -114,6 +127,9 @@ ao_lisp__cons(ao_poly car, ao_poly cdr)
 void
 ao_lisp_cons_free(struct ao_lisp_cons *cons)
 {
+#if DBG_FREE_CONS
+       ao_lisp_cons_check(cons);
+#endif
        while (cons) {
                ao_poly cdr = cons->cdr;
                cons->cdr = ao_lisp_cons_poly(ao_lisp_cons_free_list);