altos/lisp: Clean up OS integration bits, add defun

[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 65282142cdb4ca64e85a8fad5c22642b575c358b..5c6d5a67dc72bac26d4abb1afd14a955e7165136 100644 (file)
--- a/src/lisp/ao_lisp_atom.c
+++ b/src/lisp/ao_lisp_atom.c
@@ -34,12 +34,8 @@ static void atom_mark(void *addr)
 {
        struct ao_lisp_atom     *atom = addr;
 
-       if (atom->next == AO_LISP_ATOM_CONST)
-               return;
-
        for (;;) {
-               ao_lisp_poly_mark(atom->val);
-               atom = atom->next;
+               atom = ao_lisp_poly_atom(atom->next);
                if (!atom)
                        break;
                if (ao_lisp_mark_memory(atom, atom_size(atom)))
@@ -51,57 +47,113 @@ static void atom_move(void *addr)
 {
        struct ao_lisp_atom     *atom = addr;
 
-       if (atom->next == AO_LISP_ATOM_CONST)
-               return;
-
        for (;;) {
-               struct ao_lisp_atom     *next;
-
-               atom->val = ao_lisp_poly_move(atom->val);
-               next = ao_lisp_move_memory(atom->next, atom_size(atom->next));
-               if (!next)
+               if (ao_lisp_poly_move(&atom->next, 0))
                        break;
-               atom->next = next;
-               atom = next;
+               atom = ao_lisp_poly_atom(atom->next);
        }
 }
 
-const struct ao_lisp_mem_type ao_lisp_atom_type = {
+const struct ao_lisp_type ao_lisp_atom_type = {
        .mark = atom_mark,
        .size = atom_size,
        .move = atom_move,
 };
 
-struct ao_lisp_atom    *atoms;
+struct ao_lisp_atom    *ao_lisp_atoms;
 
 struct ao_lisp_atom *
 ao_lisp_atom_intern(char *name)
 {
        struct ao_lisp_atom     *atom;
-       int                     b;
 
-       for (atom = atoms; atom; atom = atom->next) {
+       for (atom = ao_lisp_atoms; atom; atom = ao_lisp_poly_atom(atom->next)) {
+               if (!strcmp(atom->name, name))
+                       return atom;
+       }
+#ifdef ao_builtin_atoms
+       for (atom = ao_lisp_poly_atom(ao_builtin_atoms); atom; atom = ao_lisp_poly_atom(atom->next)) {
                if (!strcmp(atom->name, name))
                        return atom;
        }
-       for (b = 0; ao_lisp_builtins[b]; b++)
-               if (!strcmp(ao_lisp_builtins[b]->name, name))
-                       return (struct ao_lisp_atom *) ao_lisp_builtins[b];
-       if (!atoms)
-               ao_lisp_root_add(&ao_lisp_atom_type, (void **) &atoms);
+#endif
        atom = ao_lisp_alloc(name_size(name));
        if (atom) {
                atom->type = AO_LISP_ATOM;
-               atom->next = atoms;
-               atoms = atom;
+               atom->next = ao_lisp_atom_poly(ao_lisp_atoms);
+               if (!ao_lisp_atoms)
+                       ao_lisp_root_add(&ao_lisp_atom_type, &ao_lisp_atoms);
+               ao_lisp_atoms = atom;
                strcpy(atom->name, name);
-               atom->val = AO_LISP_NIL;
        }
        return atom;
 }
 
+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)
+{
+       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 (!ref)
+               ref = ao_lisp_frame_ref(ao_lisp_poly_frame(ao_builtin_frame), atom);
+#endif
+       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)
+{
+       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;
+}
+
 void
-ao_lisp_atom_print(struct ao_lisp_atom *a)
+ao_lisp_atom_print(ao_poly a)
 {
-       fputs(a->name, stdout);
+       struct ao_lisp_atom *atom = ao_lisp_poly_atom(a);
+       printf("%s", atom->name);
 }