-namespace factor
-{
+namespace factor {
-inline static cell array_nth(array *array, cell slot)
-{
-#ifdef FACTOR_DEBUG
- assert(slot < array_capacity(array));
- assert(array->h.hi_tag() == ARRAY_TYPE);
-#endif
- return array->data()[slot];
+inline cell array_nth(array* array, cell slot) {
+ FACTOR_ASSERT(slot < array_capacity(array));
+ FACTOR_ASSERT(array->type() == ARRAY_TYPE);
+ return array->data()[slot];
}
-inline static void set_array_nth(array *array, cell slot, cell value)
-{
-#ifdef FACTOR_DEBUG
- assert(slot < array_capacity(array));
- assert(array->h.hi_tag() == ARRAY_TYPE);
- check_tagged_pointer(value);
-#endif
- array->data()[slot] = value;
- write_barrier(array);
+inline void factor_vm::set_array_nth(array* array, cell slot, cell value) {
+ FACTOR_ASSERT(slot < array_capacity(array));
+ FACTOR_ASSERT(array->type() == ARRAY_TYPE);
+ cell* slot_ptr = &array->data()[slot];
+ *slot_ptr = value;
+ write_barrier(slot_ptr);
}
-array *allot_array(cell capacity, cell fill);
-
-cell allot_array_1(cell obj);
-cell allot_array_2(cell v1, cell v2);
-cell allot_array_4(cell v1, cell v2, cell v3, cell v4);
-
-PRIMITIVE(array);
-PRIMITIVE(resize_array);
-
struct growable_array {
- cell count;
- gc_root<array> elements;
-
- growable_array(cell capacity = 10) : count(0), elements(allot_array(capacity,F)) {}
-
- void add(cell elt);
- void trim();
+ cell count;
+ data_root<array> elements;
+
+ // Allocates memory
+ growable_array(factor_vm* parent, cell capacity = 10)
+ : count(0),
+ elements(parent->allot_array(capacity, false_object), parent) {}
+
+ void reallot_array(cell count);
+ void add(cell elt);
+ void append(array* elts);
+ void trim();
};
}