altos/lisp: macros appear to work now

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

diff --git a/src/lisp/ao_lisp_atom.c b/src/lisp/ao_lisp_atom.c
index e5d28c3ba2801bf86ec8f4f74d9c33d4353c1b71..5c6d5a67dc72bac26d4abb1afd14a955e7165136 100644 (file)
--- a/src/lisp/ao_lisp_atom.c
+++ b/src/lisp/ao_lisp_atom.c
@@ -17,12 +17,6 @@
 
 #include "ao_lisp.h"
 
-#if 0
-#define DBG(...)       printf(__VA_ARGS__)
-#else
-#define DBG(...)
-#endif
-
 static int name_size(char *name)
 {
        return sizeof(struct ao_lisp_atom) + strlen(name) + 1;
@@ -40,38 +34,24 @@ static void atom_mark(void *addr)
 {
        struct ao_lisp_atom     *atom = addr;
 
-       DBG ("\tatom start %s\n", atom->name);
        for (;;) {
                atom = ao_lisp_poly_atom(atom->next);
                if (!atom)
                        break;
-               DBG("\t\tatom mark %s %d\n", atom->name, (uint8_t *) atom - ao_lisp_const);
                if (ao_lisp_mark_memory(atom, atom_size(atom)))
                        break;
        }
-       DBG ("\tatom done\n");
 }
 
 static void atom_move(void *addr)
 {
        struct ao_lisp_atom     *atom = addr;
 
-       DBG("\tatom move start %s %d next %s %d\n",
-           atom->name, ((uint8_t *) atom - ao_lisp_const),
-           atom->next ? ao_lisp_poly_atom(atom->next)->name : "(none)",
-           atom->next ? ((uint8_t *) ao_lisp_poly_atom(atom->next) - ao_lisp_const) : 0);
        for (;;) {
-               struct ao_lisp_atom     *next;
-
-               next = ao_lisp_poly_atom(atom->next);
-               next = ao_lisp_move_memory(next, atom_size(next));
-               if (!next)
+               if (ao_lisp_poly_move(&atom->next, 0))
                        break;
-               DBG("\t\tatom move %s %d->%d\n", next->name, ((uint8_t *) ao_lisp_poly_atom(atom->next) - ao_lisp_const), ((uint8_t *) next - ao_lisp_const));
-               atom->next = ao_lisp_atom_poly(next);
-               atom = next;
+               atom = ao_lisp_poly_atom(atom->next);
        }
-       DBG("\tatom move end\n");
 }
 
 const struct ao_lisp_type ao_lisp_atom_type = {
@@ -109,31 +89,65 @@ ao_lisp_atom_intern(char *name)
        return atom;
 }
 
-static struct ao_lisp_frame    *globals;
+struct ao_lisp_frame   *ao_lisp_frame_global;
+struct ao_lisp_frame   *ao_lisp_frame_current;
+
+static void
+ao_lisp_atom_init(void)
+{
+       if (!ao_lisp_frame_global) {
+               ao_lisp_frame_global = ao_lisp_frame_new(0);
+               ao_lisp_root_add(&ao_lisp_frame_type, &ao_lisp_frame_global);
+               ao_lisp_root_add(&ao_lisp_frame_type, &ao_lisp_frame_current);
+       }
+}
+
+static ao_poly *
+ao_lisp_atom_ref(struct ao_lisp_frame *frame, ao_poly atom)
+{
+       ao_poly *ref;
+       ao_lisp_atom_init();
+       while (frame) {
+               ref = ao_lisp_frame_ref(frame, atom);
+               if (ref)
+                       return ref;
+               frame = ao_lisp_poly_frame(frame->next);
+       }
+       if (ao_lisp_frame_global) {
+               ref = ao_lisp_frame_ref(ao_lisp_frame_global, atom);
+               if (ref)
+                       return ref;
+       }
+       return NULL;
+}
 
 ao_poly
 ao_lisp_atom_get(ao_poly atom)
 {
-       struct ao_lisp_frame    *frame = globals;
+       ao_poly *ref = ao_lisp_atom_ref(ao_lisp_frame_current, atom);
+
+       if (!ref && ao_lisp_frame_global)
+               ref = ao_lisp_frame_ref(ao_lisp_frame_global, atom);
 #ifdef ao_builtin_frame
-       if (!frame)
-               frame = ao_lisp_poly_frame(ao_builtin_frame);
+       if (!ref)
+               ref = ao_lisp_frame_ref(ao_lisp_poly_frame(ao_builtin_frame), atom);
 #endif
-       return ao_lisp_frame_get(frame, atom);
+       if (ref)
+               return *ref;
+       return ao_lisp_error(AO_LISP_UNDEFINED, "undefined atom %s", ao_lisp_poly_atom(atom)->name);
 }
 
 ao_poly
 ao_lisp_atom_set(ao_poly atom, ao_poly val)
 {
-       if (!ao_lisp_frame_set(globals, atom, val)) {
-               globals = ao_lisp_frame_add(globals, atom, val);
-               if (!globals->next) {
-                       ao_lisp_root_add(&ao_lisp_frame_type, &globals);
-#ifdef ao_builtin_frame
-                       globals->next = ao_builtin_frame;
-#endif
-               }
-       }
+       ao_poly *ref = ao_lisp_atom_ref(ao_lisp_frame_current, atom);
+
+       if (!ref && ao_lisp_frame_global)
+               ref = ao_lisp_frame_ref(ao_lisp_frame_global, atom);
+       if (ref)
+               *ref = val;
+       else
+               ao_lisp_frame_global = ao_lisp_frame_add(ao_lisp_frame_global, atom, val);
        return val;
 }