Put brackets around ipv6 addresses in `inet6 present`

[factor.git] / vm / arrays.hpp

diff --git a/vm/arrays.hpp b/vm/arrays.hpp
old mode 100755 (executable)
new mode 100644 (file)
index 3abd784..6be877b
--- a/vm/arrays.hpp
+++ b/vm/arrays.hpp
@@ -1,34 +1,32 @@
-namespace factor
-{
+namespace factor {
 
-inline 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 void factor_vm::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);
 }
 
 struct growable_array {
-       cell count;
-       gc_root<array> elements;
+  cell count;
+  data_root<array> elements;
 
-       growable_array(factor_vm *myvm, cell capacity = 10) : count(0), elements(myvm->allot_array(capacity,F),myvm) {}
+  // Allocates memory
+  growable_array(factor_vm* parent, cell capacity = 10)
+      : count(0),
+        elements(parent->allot_array(capacity, false_object), parent) {}
 
-       void add(cell elt);
-       void trim();
+  void reallot_array(cell count);
+  void add(cell elt);
+  void append(array* elts);
+  void trim();
 };
 
 }