X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_cons.c;h=c7d8382f79d19c1d563516997fee1dce9b3dad18;hb=dba374516ed396633659dec571b6a44b03da8ad1;hp=65908e30a610ea0f2b706eb17e314a9db1b2866d;hpb=d2408e72d1e0d3459918601712b09860ab17e200;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_cons.c b/src/lisp/ao_lisp_cons.c
index 65908e30..c7d8382f 100644
--- a/src/lisp/ao_lisp_cons.c
+++ b/src/lisp/ao_lisp_cons.c
@@ -14,12 +14,14 @@
 
 #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);
+		ao_lisp_poly_mark(cons->car, 1);
 		cons = ao_lisp_poly_cons(cons->cdr);
 		if (!cons)
 			break;
@@ -38,15 +40,22 @@ 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);
+		(void) ao_lisp_poly_move(&cons->car, 1);
 		cdr = ao_lisp_poly_cons(cons->cdr);
-		cdr = ao_lisp_move_memory(cdr, sizeof (struct ao_lisp_cons));
 		if (!cdr)
 			break;
-		cons->cdr = ao_lisp_cons_poly(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;
 	}
 }
@@ -57,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;
 }
 
@@ -83,3 +107,25 @@ 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);
+	}
+}
+
+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;
+}