altos/lisp: Finish first pass through r7rs

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

diff --git a/src/lisp/ao_lisp_poly.c b/src/lisp/ao_lisp_poly.c
index 9717fd73131b30712bf7a033f874417b8016034c..7e4c98d22dfc6369696051206783ec9397d4bcd4 100644 (file)
--- a/src/lisp/ao_lisp_poly.c
+++ b/src/lisp/ao_lisp_poly.c
@@ -14,45 +14,47 @@
 
 #include "ao_lisp.h"
 
-#if 0
-#define DBG(...) printf (__VA_ARGS__)
-#else
-#define DBG(...)
-#endif
-
 struct ao_lisp_funcs {
-       void (*print)(ao_poly);
-       void (*patom)(ao_poly);
+       void (*write)(ao_poly);
+       void (*display)(ao_poly);
 };
 
 static const struct ao_lisp_funcs ao_lisp_funcs[AO_LISP_NUM_TYPE] = {
        [AO_LISP_CONS] = {
-               .print = ao_lisp_cons_print,
-               .patom = ao_lisp_cons_patom,
+               .write = ao_lisp_cons_write,
+               .display = ao_lisp_cons_display,
        },
        [AO_LISP_STRING] = {
-               .print = ao_lisp_string_print,
-               .patom = ao_lisp_string_patom,
+               .write = ao_lisp_string_write,
+               .display = ao_lisp_string_display,
        },
        [AO_LISP_INT] = {
-               .print = ao_lisp_int_print,
-               .patom = ao_lisp_int_print,
+               .write = ao_lisp_int_write,
+               .display = ao_lisp_int_write,
        },
        [AO_LISP_ATOM] = {
-               .print = ao_lisp_atom_print,
-               .patom = ao_lisp_atom_print,
+               .write = ao_lisp_atom_write,
+               .display = ao_lisp_atom_write,
        },
        [AO_LISP_BUILTIN] = {
-               .print = ao_lisp_builtin_print,
-               .patom = ao_lisp_builtin_print,
+               .write = ao_lisp_builtin_write,
+               .display = ao_lisp_builtin_write,
        },
        [AO_LISP_FRAME] = {
-               .print = ao_lisp_frame_print,
-               .patom = ao_lisp_frame_print,
+               .write = ao_lisp_frame_write,
+               .display = ao_lisp_frame_write,
        },
        [AO_LISP_LAMBDA] = {
-               .print = ao_lisp_lambda_print,
-               .patom = ao_lisp_lambda_print,
+               .write = ao_lisp_lambda_write,
+               .display = ao_lisp_lambda_write,
+       },
+       [AO_LISP_STACK] = {
+               .write = ao_lisp_stack_write,
+               .display = ao_lisp_stack_write,
+       },
+       [AO_LISP_BOOL] = {
+               .write = ao_lisp_bool_write,
+               .display = ao_lisp_bool_write,
        },
 };
 
@@ -67,21 +69,21 @@ funcs(ao_poly p)
 }
 
 void
-ao_lisp_poly_print(ao_poly p)
+ao_lisp_poly_write(ao_poly p)
 {
        const struct ao_lisp_funcs *f = funcs(p);
 
-       if (f && f->print)
-               f->print(p);
+       if (f && f->write)
+               f->write(p);
 }
 
 void
-ao_lisp_poly_patom(ao_poly p)
+ao_lisp_poly_display(ao_poly p)
 {
        const struct ao_lisp_funcs *f = funcs(p);
 
-       if (f && f->patom)
-               f->patom(p);
+       if (f && f->display)
+               f->display(p);
 }
 
 void *
@@ -89,8 +91,8 @@ ao_lisp_ref(ao_poly poly) {
        if (poly == AO_LISP_NIL)
                return NULL;
        if (poly & AO_LISP_CONST)
-               return (void *) (AO_LISP_CONST_BASE + (poly & AO_LISP_REF_MASK));
-       return (void *) (AO_LISP_POOL_BASE + (poly & AO_LISP_REF_MASK));
+               return (void *) (ao_lisp_const + (poly & AO_LISP_REF_MASK) - 4);
+       return (void *) (ao_lisp_pool + (poly & AO_LISP_REF_MASK) - 4);
 }
 
 ao_poly
@@ -99,6 +101,6 @@ ao_lisp_poly(const void *addr, ao_poly type) {
        if (a == NULL)
                return AO_LISP_NIL;
        if (AO_LISP_IS_CONST(a))
-               return AO_LISP_CONST | (a - AO_LISP_CONST_BASE) | type;
-       return (a - AO_LISP_POOL_BASE) | type;
+               return AO_LISP_CONST | (a - ao_lisp_const + 4) | type;
+       return (a - ao_lisp_pool + 4) | type;
 }