altos/scheme: fix parsing of vector followed by list

[fw/altos] / src / scheme / ao_scheme_frame.c

diff --git a/src/scheme/ao_scheme_frame.c b/src/scheme/ao_scheme_frame.c
index 46f941e68cb7530b1891a6c7c731b178ba528ff2..9ae5bb7293e95b09eeddf41e5534d7044be25880 100644 (file)
--- a/src/scheme/ao_scheme_frame.c
+++ b/src/scheme/ao_scheme_frame.c
@@ -86,8 +86,6 @@ frame_mark(void *addr)
                struct ao_scheme_frame_vals     *vals = ao_scheme_poly_frame_vals(frame->vals);
 
                MDBG_MOVE("frame mark %d\n", MDBG_OFFSET(frame));
-               if (!AO_SCHEME_IS_POOL(frame))
-                       break;
                if (!ao_scheme_mark_memory(&ao_scheme_frame_vals_type, vals))
                        frame_vals_mark(vals);
                frame = ao_scheme_poly_frame(frame->prev);
@@ -110,9 +108,6 @@ frame_move(void *addr)
                int                             ret;
 
                MDBG_MOVE("frame move %d\n", MDBG_OFFSET(frame));
-               if (!AO_SCHEME_IS_POOL(frame))
-                       break;
-
                vals = ao_scheme_poly_frame_vals(frame->vals);
                if (!ao_scheme_move_memory(&ao_scheme_frame_vals_type, (void **) &vals))
                        frame_vals_move(vals);
@@ -158,12 +153,13 @@ ao_scheme_frame_write(ao_poly p, bool write)
 {
        struct ao_scheme_frame          *frame = ao_scheme_poly_frame(p);
        struct ao_scheme_frame          *clear = frame;
-       struct ao_scheme_frame_vals     *vals = ao_scheme_poly_frame_vals(frame->vals);
        int                             f;
        int                             written = 0;
 
        ao_scheme_print_start();
        while (frame) {
+               struct ao_scheme_frame_vals     *vals = ao_scheme_poly_frame_vals(frame->vals);
+
                if (written != 0)
                        printf(", ");
                if (ao_scheme_print_mark_addr(frame)) {
@@ -255,9 +251,9 @@ ao_scheme_frame_new(int num)
                frame->num = 0;
                frame->prev = AO_SCHEME_NIL;
                frame->vals = AO_SCHEME_NIL;
-               ao_scheme_frame_stash(0, frame);
+               ao_scheme_frame_stash(frame);
                vals = ao_scheme_frame_vals_new(num);
-               frame = ao_scheme_frame_fetch(0);
+               frame = ao_scheme_frame_fetch();
                if (!vals)
                        return NULL;
                frame->vals = ao_scheme_frame_vals_poly(vals);
@@ -301,9 +297,9 @@ ao_scheme_frame_realloc(struct ao_scheme_frame *frame, int new_num)
 
        if (new_num == frame->num)
                return frame;
-       ao_scheme_frame_stash(0, frame);
+       ao_scheme_frame_stash(frame);
        new_vals = ao_scheme_frame_vals_new(new_num);
-       frame = ao_scheme_frame_fetch(0);
+       frame = ao_scheme_frame_fetch();
        if (!new_vals)
                return NULL;
        vals = ao_scheme_poly_frame_vals(frame->vals);
@@ -336,11 +332,11 @@ ao_scheme_frame_add(struct ao_scheme_frame *frame, ao_poly atom, ao_poly val)
 
        if (!ref) {
                int f = frame->num;
-               ao_scheme_poly_stash(0, atom);
-               ao_scheme_poly_stash(1, val);
+               ao_scheme_poly_stash(atom);
+               ao_scheme_poly_stash(val);
                frame = ao_scheme_frame_realloc(frame, f + 1);
-               val = ao_scheme_poly_fetch(1);
-               atom = ao_scheme_poly_fetch(0);
+               val = ao_scheme_poly_fetch();
+               atom = ao_scheme_poly_fetch();
                if (!frame)
                        return AO_SCHEME_NIL;
                ao_scheme_frame_bind(frame, frame->num - 1, atom, val);