update Releasing with changes discovered in 1.8.3 release process

[fw/altos] / src / scheme / ao_scheme.h

diff --git a/src/scheme/ao_scheme.h b/src/scheme/ao_scheme.h
index 4589f8a5af07e8a21f95c35e8911df1c42394109..2fa1ed60e52b0907f9e49770261df64d0745c589 100644 (file)
--- a/src/scheme/ao_scheme.h
+++ b/src/scheme/ao_scheme.h
@@ -31,7 +31,7 @@
 typedef uint16_t       ao_poly;
 typedef int16_t                ao_signed_poly;
 
-#ifdef AO_SCHEME_SAVE
+#if AO_SCHEME_SAVE
 
 struct ao_scheme_os_save {
        ao_poly         atoms;
@@ -77,6 +77,9 @@ extern uint8_t ao_scheme_const[AO_SCHEME_POOL_CONST] __attribute__((aligned(4)))
 #ifndef AO_SCHEME_POOL
 #define AO_SCHEME_POOL 3072
 #endif
+#ifndef AO_SCHEME_POOL_EXTRA
+#define AO_SCHEME_POOL_EXTRA 0
+#endif
 extern uint8_t         ao_scheme_pool[AO_SCHEME_POOL + AO_SCHEME_POOL_EXTRA] __attribute__((aligned(4)));
 #endif
 
@@ -101,7 +104,8 @@ extern uint8_t              ao_scheme_pool[AO_SCHEME_POOL + AO_SCHEME_POOL_EXTRA] __attribut
 #define AO_SCHEME_BOOL         10
 #define AO_SCHEME_BIGINT       11
 #define AO_SCHEME_FLOAT                12
-#define AO_SCHEME_NUM_TYPE     13
+#define AO_SCHEME_VECTOR       13
+#define AO_SCHEME_NUM_TYPE     14
 
 /* Leave two bits for types to use as they please */
 #define AO_SCHEME_OTHER_TYPE_MASK      0x3f
@@ -189,6 +193,13 @@ struct ao_scheme_float {
        float                   value;
 };
 
+struct ao_scheme_vector {
+       uint8_t                 type;
+       uint8_t                 pad1;
+       uint16_t                length;
+       ao_poly                 vals[];
+};
+
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 static inline uint32_t
 ao_scheme_int_bigint(int32_t i) {
@@ -497,11 +508,23 @@ ao_scheme_poly_float(ao_poly poly)
 float
 ao_scheme_poly_number(ao_poly p);
 
+static inline ao_poly
+ao_scheme_vector_poly(struct ao_scheme_vector *v)
+{
+       return ao_scheme_poly(v, AO_SCHEME_OTHER);
+}
+
+static inline struct ao_scheme_vector *
+ao_scheme_poly_vector(ao_poly poly)
+{
+       return ao_scheme_ref(poly);
+}
+
 /* memory functions */
 
-extern int ao_scheme_collects[2];
-extern int ao_scheme_freed[2];
-extern int ao_scheme_loops[2];
+extern uint64_t ao_scheme_collects[2];
+extern uint64_t ao_scheme_freed[2];
+extern uint64_t ao_scheme_loops[2];
 
 /* returns 1 if the object was already marked */
 int
@@ -611,6 +634,9 @@ ao_scheme_cons_display(ao_poly);
 int
 ao_scheme_cons_length(struct ao_scheme_cons *cons);
 
+struct ao_scheme_cons *
+ao_scheme_cons_copy(struct ao_scheme_cons *cons);
+
 /* string */
 extern const struct ao_scheme_type ao_scheme_string_type;
 
@@ -677,6 +703,32 @@ void
 ao_scheme_bigint_write(ao_poly i);
 
 extern const struct ao_scheme_type     ao_scheme_bigint_type;
+
+/* vector */
+
+void
+ao_scheme_vector_write(ao_poly v);
+
+void
+ao_scheme_vector_display(ao_poly v);
+
+struct ao_scheme_vector *
+ao_scheme_vector_alloc(uint16_t length, ao_poly fill);
+
+ao_poly
+ao_scheme_vector_get(ao_poly v, ao_poly i);
+
+ao_poly
+ao_scheme_vector_set(ao_poly v, ao_poly i, ao_poly p);
+
+struct ao_scheme_vector *
+ao_scheme_list_to_vector(struct ao_scheme_cons *cons);
+
+struct ao_scheme_cons *
+ao_scheme_vector_to_list(struct ao_scheme_vector *vector);
+
+extern const struct ao_scheme_type     ao_scheme_vector_type;
+
 /* prim */
 void
 ao_scheme_poly_write(ao_poly p);
@@ -745,6 +797,7 @@ char *
 ao_scheme_args_name(uint8_t args);
 
 /* read */
+extern int                     ao_scheme_read_list;
 extern struct ao_scheme_cons   *ao_scheme_read_cons;
 extern struct ao_scheme_cons   *ao_scheme_read_cons_tail;
 extern struct ao_scheme_cons   *ao_scheme_read_stack;