X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_atom.c;h=5c6d5a67dc72bac26d4abb1afd14a955e7165136;hb=417161dbb36323b5a6572859dedad02ca92fc65c;hp=ea04741e2b2c01c7201f85cc49e0fc99af7102dd;hpb=77db0e8162cd01c2b42737b3d71b38cea942484f;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_atom.c b/src/lisp/ao_lisp_atom.c
index ea04741e..5c6d5a67 100644
--- 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,14 +89,14 @@ ao_lisp_atom_intern(char *name)
 	return atom;
 }
 
-static struct ao_lisp_frame	*ao_lisp_frame_global;
-struct ao_lisp_frame		*ao_lisp_frame_current;
+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, 0);
+		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);
 	}
@@ -154,7 +134,7 @@ ao_lisp_atom_get(ao_poly atom)
 #endif
 	if (ref)
 		return *ref;
-	return AO_LISP_NIL;
+	return ao_lisp_error(AO_LISP_UNDEFINED, "undefined atom %s", ao_lisp_poly_atom(atom)->name);
 }
 
 ao_poly