X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_cons.c;h=c7d8382f79d19c1d563516997fee1dce9b3dad18;hb=c8d2b9acf4b118f36a114de2af4db42ae04426ed;hp=f8a34ed4914a1e0073116f964bd08b7c47f0ccad;hpb=71bf5774083e7f0d87ea609a73d6cfb7f60de9d9;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_cons.c b/src/lisp/ao_lisp_cons.c
index f8a34ed4..c7d8382f 100644
--- a/src/lisp/ao_lisp_cons.c
+++ b/src/lisp/ao_lisp_cons.c
@@ -16,27 +16,12 @@
 
 #define OFFSET(a)	((int) ((uint8_t *) (a) - ao_lisp_const))
 
-#if 0
-static int cons_depth;
-#define DBG(...)	do { int d; for (d = 0; d < cons_depth; d++) printf ("  "); printf(__VA_ARGS__); } while(0)
-#define DBG_IN()	(cons_depth++)
-#define DBG_OUT()	(cons_depth--)
-#define DBG_PR(c)	ao_lisp_cons_print(ao_lisp_cons_poly(c))
-#define DBG_PRP(p)	ao_lisp_poly_print(p)
-#else
-#define DBG(...)
-#define DBG_IN()
-#define DBG_OUT()
-#define DBG_PR(c)
-#define DBG_PRP(p)
-#endif
-
 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;
@@ -55,25 +40,24 @@ static void cons_move(void *addr)
 {
 	struct ao_lisp_cons	*cons = addr;
 
-	DBG_IN();
-	DBG("move cons start %d\n", OFFSET(cons));
+	if (!cons)
+		return;
+
 	for (;;) {
 		struct ao_lisp_cons	*cdr;
-		ao_poly			car;
+		int			ret;
 
-		car = ao_lisp_poly_move(cons->car);
-		DBG(" moved car %d -> %d\n", OFFSET(ao_lisp_ref(cons->car)), OFFSET(ao_lisp_ref(car)));
-		cons->car = 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;
-		DBG(" moved cdr %d -> %d\n", OFFSET(ao_lisp_poly_cons(cons->cdr)), OFFSET(cdr));
-		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;
 	}
-	DBG("move cons end\n");
-	DBG_OUT();
 }
 
 const struct ao_lisp_type ao_lisp_cons_type = {
@@ -82,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;
 }
 
@@ -108,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;
+}