#include "ao_lisp.h"
-#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);
- cons = ao_lisp_poly_cons(cons->cdr);
- if (!cons)
+ ao_poly cdr = cons->cdr;
+
+ ao_lisp_poly_mark(cons->car, 1);
+ if (!cdr)
+ break;
+ if (ao_lisp_poly_type(cdr) != AO_LISP_CONS) {
+ ao_lisp_poly_mark(cdr, 1);
break;
- if (ao_lisp_mark_memory(cons, sizeof (struct ao_lisp_cons)))
+ }
+ cons = ao_lisp_poly_cons(cdr);
+ if (ao_lisp_mark_memory(&ao_lisp_cons_type, cons))
break;
}
}
{
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;
-
- 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;
- cdr = ao_lisp_poly_cons(cons->cdr);
- cdr = ao_lisp_move_memory(cdr, sizeof (struct ao_lisp_cons));
+ ao_poly cdr;
+ struct ao_lisp_cons *c;
+ 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 = cons->cdr;
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);
- cons = cdr;
+ if (ao_lisp_poly_type(cdr) != AO_LISP_CONS) {
+ (void) ao_lisp_poly_move(&cons->cdr, 1);
+ break;
+ }
+ c = ao_lisp_poly_cons(cdr);
+ ret = ao_lisp_move_memory(&ao_lisp_cons_type, (void **) &c);
+ if (c != ao_lisp_poly_cons(cons->cdr))
+ cons->cdr = ao_lisp_cons_poly(c);
+ 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 = c;
}
- DBG("move cons end\n");
- DBG_OUT();
}
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)
+ao_lisp_cons_cons(ao_poly car, ao_poly cdr)
{
- struct ao_lisp_cons *cons = ao_lisp_alloc(sizeof (struct ao_lisp_cons));
- if (!cons)
- return NULL;
+ 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_poly_stash(1, cdr);
+ cons = ao_lisp_alloc(sizeof (struct ao_lisp_cons));
+ car = ao_lisp_poly_fetch(0);
+ cdr = ao_lisp_poly_fetch(1);
+ if (!cons)
+ return NULL;
+ }
cons->car = car;
- cons->cdr = ao_lisp_cons_poly(cdr);
+ cons->cdr = cdr;
return cons;
}
+struct ao_lisp_cons *
+ao_lisp_cons_cdr(struct ao_lisp_cons *cons)
+{
+ ao_poly cdr = cons->cdr;
+ if (cdr == AO_LISP_NIL)
+ return NULL;
+ if (ao_lisp_poly_type(cdr) != AO_LISP_CONS) {
+ (void) ao_lisp_error(AO_LISP_INVALID, "improper list");
+ return NULL;
+ }
+ return ao_lisp_poly_cons(cdr);
+}
+
+ao_poly
+ao_lisp__cons(ao_poly car, ao_poly cdr)
+{
+ return ao_lisp_cons_poly(ao_lisp_cons_cons(car, cdr));
+}
+
+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)
+ao_lisp_cons_write(ao_poly c)
{
struct ao_lisp_cons *cons = ao_lisp_poly_cons(c);
int first = 1;
while (cons) {
if (!first)
printf(" ");
- ao_lisp_poly_print(cons->car);
- cons = ao_lisp_poly_cons(cons->cdr);
- first = 0;
+ ao_lisp_poly_write(cons->car);
+ c = cons->cdr;
+ if (ao_lisp_poly_type(c) == AO_LISP_CONS) {
+ cons = ao_lisp_poly_cons(c);
+ first = 0;
+ } else {
+ printf(" . ");
+ ao_lisp_poly_write(c);
+ cons = NULL;
+ }
}
printf(")");
}
+
+void
+ao_lisp_cons_display(ao_poly c)
+{
+ struct ao_lisp_cons *cons = ao_lisp_poly_cons(c);
+
+ while (cons) {
+ ao_lisp_poly_display(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;
+}