Merge branch 'branch-1.7' into debian

1 files changed, 143 insertions, 0 deletions

diff --git a/src/lisp/ao_lisp_cons.c b/src/lisp/ao_lisp_cons.c
new file mode 100644
index 00000000..d2b60c9a
--- /dev/null
+++ b/src/lisp/ao_lisp_cons.c
@@ -0,0 +1,143 @@
+/*
+ * Copyright © 2016 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+#include "ao_lisp.h"
+
+static void cons_mark(void *addr)
+{
+	struct ao_lisp_cons	*cons = addr;
+
+	for (;;) {
+		ao_lisp_poly_mark(cons->car, 1);
+		cons = ao_lisp_poly_cons(cons->cdr);
+		if (!cons)
+			break;
+		if (ao_lisp_mark_memory(&ao_lisp_cons_type, cons))
+			break;
+	}
+}
+
+static int cons_size(void *addr)
+{
+	(void) addr;
+	return sizeof (struct ao_lisp_cons);
+}
+
+static void cons_move(void *addr)
+{
+	struct ao_lisp_cons	*cons = addr;
+
+	if (!cons)
+		return;
+
+	for (;;) {
+		struct ao_lisp_cons	*cdr;
+		int			ret;
+
+		MDBG_MOVE("cons_move start %d (%d, %d)\n",
+			  MDBG_OFFSET(cons), MDBG_OFFSET(ao_lisp_ref(cons->car)), MDBG_OFFSET(ao_lisp_ref(cons->cdr)));
+		(void) ao_lisp_poly_move(&cons->car, 1);
+		cdr = ao_lisp_poly_cons(cons->cdr);
+		if (!cdr)
+			break;
+		ret = ao_lisp_move_memory(&ao_lisp_cons_type, (void **) &cdr);
+		if (cdr != ao_lisp_poly_cons(cons->cdr))
+			cons->cdr = ao_lisp_cons_poly(cdr);
+		MDBG_MOVE("cons_move end %d (%d, %d)\n",
+			  MDBG_OFFSET(cons), MDBG_OFFSET(ao_lisp_ref(cons->car)), MDBG_OFFSET(ao_lisp_ref(cons->cdr)));
+		if (ret)
+			break;
+		cons = cdr;
+	}
+}
+
+const struct ao_lisp_type ao_lisp_cons_type = {
+	.mark = cons_mark,
+	.size = cons_size,
+	.move = cons_move,
+	.name = "cons",
+};
+
+struct ao_lisp_cons *ao_lisp_cons_free_list;
+
+struct ao_lisp_cons *
+ao_lisp_cons_cons(ao_poly car, struct ao_lisp_cons *cdr)
+{
+	struct ao_lisp_cons	*cons;
+
+	if (ao_lisp_cons_free_list) {
+		cons = ao_lisp_cons_free_list;
+		ao_lisp_cons_free_list = ao_lisp_poly_cons(cons->cdr);
+	} else {
+		ao_lisp_poly_stash(0, car);
+		ao_lisp_cons_stash(0, cdr);
+		cons = ao_lisp_alloc(sizeof (struct ao_lisp_cons));
+		car = ao_lisp_poly_fetch(0);
+		cdr = ao_lisp_cons_fetch(0);
+		if (!cons)
+			return NULL;
+	}
+	cons->car = car;
+	cons->cdr = ao_lisp_cons_poly(cdr);
+	return cons;
+}
+
+void
+ao_lisp_cons_free(struct ao_lisp_cons *cons)
+{
+	while (cons) {
+		ao_poly cdr = cons->cdr;
+		cons->cdr = ao_lisp_cons_poly(ao_lisp_cons_free_list);
+		ao_lisp_cons_free_list = cons;
+		cons = ao_lisp_poly_cons(cdr);
+	}
+}
+
+void
+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(" ");
+		ao_lisp_poly_print(cons->car);
+		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);
+	}
+}
+
+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;
+}