projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lisp: add length, pack, unpack and flush
[fw/altos]
/
src
/
lisp
/
ao_lisp_cons.c
diff --git
a/src/lisp/ao_lisp_cons.c
b/src/lisp/ao_lisp_cons.c
index f8a34ed4914a1e0073116f964bd08b7c47f0ccad..b75ffaa0d611ffa5427e7b191d4d68d996e74534 100644
(file)
--- 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))
#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 (;;) {
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;
cons = ao_lisp_poly_cons(cons->cdr);
if (!cons)
break;
@@
-55,25
+40,22
@@
static void cons_move(void *addr)
{
struct ao_lisp_cons *cons = 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;
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_poly_cons(cons->cdr);
- cdr = ao_lisp_move_memory(cdr, sizeof (struct ao_lisp_cons));
- if (!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;
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;
}
cons = cdr;
}
- DBG("move cons end\n");
- DBG_OUT();
}
const struct ao_lisp_type ao_lisp_cons_type = {
}
const struct ao_lisp_type ao_lisp_cons_type = {
@@
-85,7
+67,13
@@
const struct ao_lisp_type ao_lisp_cons_type = {
struct ao_lisp_cons *
ao_lisp_cons_cons(ao_poly car, struct ao_lisp_cons *cdr)
{
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;
+
+ ao_lisp_root_add(&ao_lisp_cons_type, &cdr);
+ ao_lisp_root_poly_add(&car);
+ cons = ao_lisp_alloc(sizeof (struct ao_lisp_cons));
+ ao_lisp_root_clear(&car);
+ ao_lisp_root_clear(&cdr);
if (!cons)
return NULL;
cons->car = car;
if (!cons)
return NULL;
cons->car = car;
@@
-108,3
+96,25
@@
ao_lisp_cons_print(ao_poly c)
}
printf(")");
}
}
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;
+}