altos/scheme: Add start/end args to vector->list

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

diff --git a/src/scheme/ao_scheme_vector.c b/src/scheme/ao_scheme_vector.c
index ff2067e25ba440fcbda5735421107f65817969a6..083823f3097a1a6318ce267c9bf7dc82b8aa0e08 100644 (file)
--- a/src/scheme/ao_scheme_vector.c
+++ b/src/scheme/ao_scheme_vector.c
@@ -73,39 +73,27 @@ ao_scheme_vector_alloc(uint16_t length, ao_poly fill)
 }
 
 void
-ao_scheme_vector_write(ao_poly v)
+ao_scheme_vector_write(ao_poly v, bool write)
 {
        struct ao_scheme_vector *vector = ao_scheme_poly_vector(v);
        unsigned int i;
+       int was_marked = 0;
 
        ao_scheme_print_start();
-       if (ao_scheme_print_mark_addr(vector))
+       was_marked = ao_scheme_print_mark_addr(vector);
+       if (was_marked) {
                printf ("...");
-       else {
+       } else {
                printf("#(");
                for (i = 0; i < vector->length; i++) {
                        if (i != 0)
                                printf(" ");
-                       ao_scheme_poly_write(vector->vals[i]);
+                       ao_scheme_poly_write(vector->vals[i], write);
                }
                printf(")");
        }
-       ao_scheme_print_stop();
-}
-
-void
-ao_scheme_vector_display(ao_poly v)
-{
-       struct ao_scheme_vector *vector = ao_scheme_poly_vector(v);
-       unsigned int i;
-
-       ao_scheme_print_start();
-       if (ao_scheme_print_mark_addr(vector))
-               printf ("...");
-       else {
-               for (i = 0; i < vector->length; i++)
-                       ao_scheme_poly_display(vector->vals[i]);
-       }
+       if (ao_scheme_print_stop() && !was_marked)
+               ao_scheme_print_clear_addr(vector);
 }
 
 static int32_t
@@ -157,9 +145,9 @@ ao_scheme_list_to_vector(struct ao_scheme_cons *cons)
        if (ao_scheme_exception)
                return NULL;
 
-       ao_scheme_cons_stash(0, cons);
+       ao_scheme_cons_stash(cons);
        vector = ao_scheme_vector_alloc(length, AO_SCHEME_NIL);
-       cons = ao_scheme_cons_fetch(0);
+       cons = ao_scheme_cons_fetch();
        if (!vector)
                return NULL;
        i = 0;
@@ -171,16 +159,22 @@ ao_scheme_list_to_vector(struct ao_scheme_cons *cons)
 }
 
 struct ao_scheme_cons *
-ao_scheme_vector_to_list(struct ao_scheme_vector *vector)
+ao_scheme_vector_to_list(struct ao_scheme_vector *vector, int start, int end)
 {
-       unsigned int            i;
+       int                     i;
        uint16_t                length = vector->length;
        struct ao_scheme_cons   *cons = NULL;
 
-       for (i = length; i-- > 0;) {
-               ao_scheme_poly_stash(2, ao_scheme_vector_poly(vector));
+       if (end == -1)
+               end = length;
+       if (start < 0)
+               start = 0;
+       if (end > length)
+               end = length;
+       for (i = end; i-- > start;) {
+               ao_scheme_vector_stash(vector);
                cons = ao_scheme_cons_cons(vector->vals[i], ao_scheme_cons_poly(cons));
-               vector = ao_scheme_poly_vector(ao_scheme_poly_fetch(2));
+               vector = ao_scheme_vector_fetch();
                if (!cons)
                        return NULL;
        }