altos/lisp: Eliminate compiler warning about array bounds at -O3

[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 c6ca0a975f0d1077a133a3de7b0087dc4dac53f0..236176e76baffc91fc0bfeeedc9c78511b6d465d 100644 (file)
--- a/src/lisp/ao_lisp_poly.c
+++ b/src/lisp/ao_lisp_poly.c
@@ -14,34 +14,91 @@
 
 #include "ao_lisp.h"
 
-/*
+#if 0
+#define DBG(...) printf (__VA_ARGS__)
+#else
+#define DBG(...)
+#endif
 
-static const struct ao_lisp_builtin builtin_plus = {
-       .type = AO_LISP_BUILTIN,
-       .func = ao_lisp_plus,
-       .name = "+"
+struct ao_lisp_funcs {
+       void (*print)(ao_poly);
+       void (*patom)(ao_poly);
 };
 
-static const struct ao_lisp_atom atom_plus = {
-       .type = AO_LISP_ATOM,
-       .val = AO_LISP_OTHER_POLY(&builtin_plus),
-       .next = AO_LISP_ATOM_CONST,
-       .name = "plus"
+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,
+       },
+       [AO_LISP_STRING] = {
+               .print = ao_lisp_string_print,
+               .patom = ao_lisp_string_patom,
+       },
+       [AO_LISP_INT] = {
+               .print = ao_lisp_int_print,
+               .patom = ao_lisp_int_print,
+       },
+       [AO_LISP_ATOM] = {
+               .print = ao_lisp_atom_print,
+               .patom = ao_lisp_atom_print,
+       },
+       [AO_LISP_BUILTIN] = {
+               .print = ao_lisp_builtin_print,
+               .patom = ao_lisp_builtin_print,
+       },
+       [AO_LISP_FRAME] = {
+               .print = ao_lisp_frame_print,
+               .patom = ao_lisp_frame_print,
+       },
+       [AO_LISP_LAMBDA] = {
+               .print = ao_lisp_lambda_print,
+               .patom = ao_lisp_lambda_print,
+       },
 };
 
-static const struct ao_lisp_builtin builtin_minus = {
-       .type = AO_LISP_BUILTIN,
-       .func = ao_lisp_minus
-};
+static const struct ao_lisp_funcs *
+funcs(ao_poly p)
+{
+       uint8_t type = ao_lisp_poly_type(p);
 
-static const struct ao_lisp_builtin builtin_times = {
-       .type = AO_LISP_BUILTIN,
-       .func = ao_lisp_times
-};
+       if (type < AO_LISP_NUM_TYPE)
+               return &ao_lisp_funcs[type];
+       return NULL;
+}
 
+void
+ao_lisp_poly_print(ao_poly p)
+{
+       const struct ao_lisp_funcs *f = funcs(p);
 
-const struct ao_lisp_atom const *ao_lisp_builtins[] = {
-       &atom_plus,
-       0
-};
-*/
+       if (f && f->print)
+               f->print(p);
+}
+
+void
+ao_lisp_poly_patom(ao_poly p)
+{
+       const struct ao_lisp_funcs *f = funcs(p);
+
+       if (f && f->patom)
+               f->patom(p);
+}
+
+void *
+ao_lisp_ref(ao_poly poly) {
+       if (poly == AO_LISP_NIL)
+               return NULL;
+       if (poly & AO_LISP_CONST)
+               return (void *) (ao_lisp_const + (poly & AO_LISP_REF_MASK) - 4);
+       return (void *) (ao_lisp_pool + (poly & AO_LISP_REF_MASK) - 4);
+}
+
+ao_poly
+ao_lisp_poly(const void *addr, ao_poly type) {
+       const uint8_t   *a = addr;
+       if (a == NULL)
+               return AO_LISP_NIL;
+       if (AO_LISP_IS_CONST(a))
+               return AO_LISP_CONST | (a - ao_lisp_const + 4) | type;
+       return (a - ao_lisp_pool + 4) | type;
+}