X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_cons.c;h=cd8a8d1d03b9920716fece9c834e101f3d70b55f;hb=7da6bfc195fad97e3afc576c609897c131fd4d8c;hp=4929b91cf73dfcaeb0964d46928c6b53d22c13fb;hpb=3366efb139653939f053c1fe4aba352ba3b66c94;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_cons.c b/src/lisp/ao_lisp_cons.c
index 4929b91c..cd8a8d1d 100644
--- a/src/lisp/ao_lisp_cons.c
+++ b/src/lisp/ao_lisp_cons.c
@@ -21,7 +21,7 @@ static void cons_mark(void *addr)
 	struct ao_lisp_cons	*cons = addr;
 
 	for (;;) {
-		ao_lisp_poly_mark(cons->car);
+		ao_lisp_poly_mark(cons->car, 1);
 		cons = ao_lisp_poly_cons(cons->cdr);
 		if (!cons)
 			break;
@@ -44,10 +44,17 @@ static void cons_move(void *addr)
 		return;
 
 	for (;;) {
-		(void) ao_lisp_poly_move(&cons->car);
-		if (ao_lisp_poly_move(&cons->cdr))
+		struct ao_lisp_cons	*cdr;
+		int			ret;
+
+		(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 = ao_lisp_poly_cons(cons->cdr);
+		cons = cdr;
 	}
 }
 
@@ -60,7 +67,13 @@ const struct ao_lisp_type ao_lisp_cons_type = {
 struct ao_lisp_cons *
 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));
+	struct ao_lisp_cons	*cons;
+
+	ao_lisp_root_add(&ao_lisp_cons_type, &cdr);
+	ao_lisp_root_poly_add(&car);
+	cons = ao_lisp_alloc(sizeof (struct ao_lisp_cons));
+	ao_lisp_root_clear(&car);
+	ao_lisp_root_clear(&cdr);
 	if (!cons)
 		return NULL;
 	cons->car = car;
@@ -83,3 +96,14 @@ ao_lisp_cons_print(ao_poly c)
 	}
 	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);
+	}
+}