#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;
{
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)))
+ if (ao_lisp_mark_memory(&ao_lisp_atom_type, atom))
break;
}
- DBG ("\tatom done\n");
}
static void atom_move(void *addr)
{
struct ao_lisp_atom *atom = addr;
+ int ret;
- 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;
+ struct ao_lisp_atom *next = ao_lisp_poly_atom(atom->next);
- next = ao_lisp_poly_atom(atom->next);
- next = ao_lisp_move_memory(next, atom_size(next));
if (!next)
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);
+ ret = ao_lisp_move_memory(&ao_lisp_atom_type, (void **) &next);
+ if (next != ao_lisp_poly_atom(atom->next))
+ atom->next = ao_lisp_atom_poly(next);
+ if (ret)
+ break;
atom = next;
}
- DBG("\tatom move end\n");
}
const struct ao_lisp_type ao_lisp_atom_type = {
.mark = atom_mark,
.size = atom_size,
.move = atom_move,
+ .name = "atom"
};
struct ao_lisp_atom *ao_lisp_atoms;
return atom;
}
#endif
+ ao_lisp_string_stash(0, name);
atom = ao_lisp_alloc(name_size(name));
+ name = ao_lisp_string_fetch(0);
if (atom) {
atom->type = AO_LISP_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);
}
return atom;
}
-static struct ao_lisp_frame *globals;
+ao_poly *
+ao_lisp_atom_ref(ao_poly atom)
+{
+ ao_poly *ref;
+ struct ao_lisp_frame *frame;
+
+ for (frame = ao_lisp_frame_current; frame; frame = ao_lisp_poly_frame(frame->prev)) {
+ ref = ao_lisp_frame_ref(frame, atom);
+ if (ref)
+ return ref;
+ }
+ return ao_lisp_frame_ref(ao_lisp_frame_global, atom);
+}
ao_poly
ao_lisp_atom_get(ao_poly atom)
{
- struct ao_lisp_frame *frame = globals;
+ ao_poly *ref = ao_lisp_atom_ref(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(atom);
+
+ if (!ref)
+ return ao_lisp_error(AO_LISP_UNDEFINED, "undefined atom %s", ao_lisp_poly_atom(atom)->name);
+ *ref = val;
return val;
}
+ao_poly
+ao_lisp_atom_def(ao_poly atom, ao_poly val)
+{
+ ao_poly *ref = ao_lisp_atom_ref(atom);
+
+ if (ref) {
+ if (ao_lisp_frame_current)
+ return ao_lisp_error(AO_LISP_REDEFINED, "attempt to redefine atom %s", ao_lisp_poly_atom(atom)->name);
+ *ref = val;
+ return val;
+ }
+ return ao_lisp_frame_add(ao_lisp_frame_current ? ao_lisp_frame_current : ao_lisp_frame_global, atom, val);
+}
+
void
-ao_lisp_atom_print(ao_poly a)
+ao_lisp_atom_write(ao_poly a)
{
struct ao_lisp_atom *atom = ao_lisp_poly_atom(a);
printf("%s", atom->name);