Put brackets around ipv6 addresses in `inet6 present`

[factor.git] / vm / generic_arrays.hpp

diff --git a/vm/generic_arrays.hpp b/vm/generic_arrays.hpp
index d97ed1a8a50ad6953324ad04c1fa49253db85a9d..49ba31370c4542478434c6bb22053d44b8500b48 100644 (file)
--- a/vm/generic_arrays.hpp
+++ b/vm/generic_arrays.hpp
@@ -13,7 +13,7 @@ template <typename Array> cell array_size(Array* array) {
   return array_size<Array>(array_capacity(array));
 }
 
-/* Allocates memory */
+// Allocates memory
 template <typename Array>
 Array* factor_vm::allot_uninitialized_array(cell capacity) {
   Array* array = allot<Array>(array_size<Array>(capacity));
@@ -23,10 +23,11 @@ Array* factor_vm::allot_uninitialized_array(cell capacity) {
 
 template <typename Array>
 bool factor_vm::reallot_array_in_place_p(Array* array, cell capacity) {
-  return nursery.contains_p(array) && capacity <= array_capacity(array);
+  return data->nursery->contains_p(array) &&
+      capacity <= array_capacity(array);
 }
 
-/* Allocates memory (sometimes) */
+// Allocates memory (sometimes)
 template <typename Array>
 Array* factor_vm::reallot_array(Array* array_, cell capacity) {
   data_root<Array> array(array_, this);
@@ -37,19 +38,18 @@ Array* factor_vm::reallot_array(Array* array_, cell capacity) {
   if (reallot_array_in_place_p(array.untagged(), capacity)) {
     array->capacity = tag_fixnum(capacity);
     return array.untagged();
-  } else {
-    cell to_copy = array_capacity(array.untagged());
-    if (capacity < to_copy)
-      to_copy = capacity;
+  }
+  cell to_copy = array_capacity(array.untagged());
+  if (capacity < to_copy)
+    to_copy = capacity;
 
-    Array* new_array = allot_uninitialized_array<Array>(capacity);
+  Array* new_array = allot_uninitialized_array<Array>(capacity);
 
-    memcpy(new_array + 1, array.untagged() + 1, to_copy * Array::element_size);
-    memset((char*)(new_array + 1) + to_copy * Array::element_size, 0,
-           (capacity - to_copy) * Array::element_size);
+  memcpy(new_array + 1, array.untagged() + 1, to_copy * Array::element_size);
+  memset((char*)(new_array + 1) + to_copy * Array::element_size, 0,
+         (capacity - to_copy) * Array::element_size);
 
-    return new_array;
-  }
+  return new_array;
 }
 
 }