X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_cons.c;h=c7d8382f79d19c1d563516997fee1dce9b3dad18;hb=29c890b4599b3bbdbd09a5915ea68a63f4e0a9ac;hp=855079b8b483022040a5124bef3b4ea0c77cf09e;hpb=6e5c1308ce33a864095eae02e7db18b0e043ab6e;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_cons.c b/src/lisp/ao_lisp_cons.c
index 855079b8..c7d8382f 100644
--- a/src/lisp/ao_lisp_cons.c
+++ b/src/lisp/ao_lisp_cons.c
@@ -49,6 +49,8 @@ static void cons_move(void *addr)
 
 		(void) ao_lisp_poly_move(&cons->car, 1);
 		cdr = ao_lisp_poly_cons(cons->cdr);
+		if (!cdr)
+			break;
 		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);
@@ -64,14 +66,29 @@ const struct ao_lisp_type ao_lisp_cons_type = {
 	.move = cons_move,
 };
 
+static ao_poly	cons_car;
+static struct ao_lisp_cons *cons_cdr;
+static int been_here;
+
 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;
+
+	if (!been_here) {
+		ao_lisp_root_add(&ao_lisp_cons_type, &cons_cdr);
+		ao_lisp_root_poly_add(&cons_car);
+		been_here = 1;
+	}
+	cons_car = car;
+	cons_cdr = cdr;
+	cons = ao_lisp_alloc(sizeof (struct ao_lisp_cons));
 	if (!cons)
 		return NULL;
-	cons->car = car;
-	cons->cdr = ao_lisp_cons_poly(cdr);
+	cons->car = cons_car;
+	cons->cdr = ao_lisp_cons_poly(cons_cdr);
+	cons_car = AO_LISP_NIL;
+	cons_cdr = NULL;
 	return cons;
 }
 
@@ -101,3 +118,14 @@ ao_lisp_cons_patom(ao_poly c)
 		cons = ao_lisp_poly_cons(cons->cdr);
 	}
 }
+
+int
+ao_lisp_cons_length(struct ao_lisp_cons *cons)
+{
+	int	len = 0;
+	while (cons) {
+		len++;
+		cons = ao_lisp_poly_cons(cons->cdr);
+	}
+	return len;
+}