X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_cons.c;h=855079b8b483022040a5124bef3b4ea0c77cf09e;hb=417161dbb36323b5a6572859dedad02ca92fc65c;hp=60cbb2f35cd1ae5d95bcf1e3eed72e6eeb12cd0c;hpb=56d46ceaa1413415f25e47e81036426132f99924;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_cons.c b/src/lisp/ao_lisp_cons.c
index 60cbb2f3..855079b8 100644
--- a/src/lisp/ao_lisp_cons.c
+++ b/src/lisp/ao_lisp_cons.c
@@ -14,13 +14,15 @@
 
 #include "ao_lisp.h"
 
+#define OFFSET(a)	((int) ((uint8_t *) (a) - ao_lisp_const))
+
 static void cons_mark(void *addr)
 {
 	struct ao_lisp_cons	*cons = addr;
 
 	for (;;) {
-		ao_lisp_poly_mark(cons->car);
-		cons = cons->cdr;
+		ao_lisp_poly_mark(cons->car, 1);
+		cons = ao_lisp_poly_cons(cons->cdr);
 		if (!cons)
 			break;
 		if (ao_lisp_mark_memory(cons, sizeof (struct ao_lisp_cons)))
@@ -38,47 +40,64 @@ static void cons_move(void *addr)
 {
 	struct ao_lisp_cons	*cons = addr;
 
+	if (!cons)
+		return;
+
 	for (;;) {
 		struct ao_lisp_cons	*cdr;
+		int			ret;
 
-		cons->car = ao_lisp_poly_move(cons->car);
-		cdr = ao_lisp_move_memory(cons->cdr, sizeof (struct ao_lisp_cons));
-		if (!cdr)
+		(void) ao_lisp_poly_move(&cons->car, 1);
+		cdr = ao_lisp_poly_cons(cons->cdr);
+		ret = ao_lisp_move_memory((void **) &cdr, sizeof (struct ao_lisp_cons));
+		if (cdr != ao_lisp_poly_cons(cons->cdr))
+			cons->cdr = ao_lisp_cons_poly(cdr);
+		if (ret)
 			break;
-		cons->cdr = cdr;
 		cons = cdr;
 	}
 }
 
-const struct ao_lisp_mem_type ao_lisp_cons_type = {
+const struct ao_lisp_type ao_lisp_cons_type = {
 	.mark = cons_mark,
 	.size = cons_size,
 	.move = cons_move,
 };
 
 struct ao_lisp_cons *
-ao_lisp_cons(ao_lisp_poly car, struct ao_lisp_cons *cdr)
+ao_lisp_cons_cons(ao_poly car, struct ao_lisp_cons *cdr)
 {
 	struct ao_lisp_cons	*cons = ao_lisp_alloc(sizeof (struct ao_lisp_cons));
 	if (!cons)
 		return NULL;
 	cons->car = car;
-	cons->cdr = cdr;
+	cons->cdr = ao_lisp_cons_poly(cdr);
 	return cons;
 }
 
 void
-ao_lisp_cons_print(struct ao_lisp_cons *cons)
+ao_lisp_cons_print(ao_poly c)
 {
+	struct ao_lisp_cons *cons = ao_lisp_poly_cons(c);
 	int	first = 1;
 	printf("(");
 	while (cons) {
 		if (!first)
 			printf(" ");
-		fflush(stdout);
 		ao_lisp_poly_print(cons->car);
-		cons = cons->cdr;
+		cons = ao_lisp_poly_cons(cons->cdr);
 		first = 0;
 	}
 	printf(")");
 }
+
+void
+ao_lisp_cons_patom(ao_poly c)
+{
+	struct ao_lisp_cons *cons = ao_lisp_poly_cons(c);
+
+	while (cons) {
+		ao_lisp_poly_patom(cons->car);
+		cons = ao_lisp_poly_cons(cons->cdr);
+	}
+}