Put brackets around ipv6 addresses in `inet6 present`

[factor.git] / vm / strings.cpp

diff --git a/vm/strings.cpp b/vm/strings.cpp
index 8280b48ca35f10acb26a7109b72971d6becc0c31..bcde346294c19ddeacda45650a5e3136bd1fb832 100644 (file)
--- a/vm/strings.cpp
+++ b/vm/strings.cpp
@@ -2,7 +2,7 @@
 
 namespace factor {
 
-/* Allocates memory */
+// Allocates memory
 string* factor_vm::allot_string_internal(cell capacity) {
   string* str = allot<string>(string_size(capacity));
 
@@ -13,7 +13,7 @@ string* factor_vm::allot_string_internal(cell capacity) {
   return str;
 }
 
-/* Allocates memory */
+// Allocates memory
 void factor_vm::fill_string(string* str_, cell start, cell capacity,
                             cell fill) {
   data_root<string> str(str_, this);
@@ -39,14 +39,14 @@ void factor_vm::fill_string(string* str_, cell start, cell capacity,
   }
 }
 
-/* Allocates memory */
+// Allocates memory
 string* factor_vm::allot_string(cell capacity, cell fill) {
   data_root<string> str(allot_string_internal(capacity), this);
   fill_string(str.untagged(), 0, capacity, fill);
   return str.untagged();
 }
 
-/* Allocates memory */
+// Allocates memory
 void factor_vm::primitive_string() {
   cell initial = to_cell(ctx->pop());
   cell length = unbox_array_size();
@@ -54,13 +54,13 @@ void factor_vm::primitive_string() {
 }
 
 bool factor_vm::reallot_string_in_place_p(string* str, cell capacity) {
-  return nursery.contains_p(str) &&
+  return data->nursery->contains_p(str) &&
          (!to_boolean(str->aux) ||
-          nursery.contains_p(untag<byte_array>(str->aux))) &&
+          data->nursery->contains_p(untag<byte_array>(str->aux))) &&
          capacity <= string_capacity(str);
 }
 
-/* Allocates memory */
+// Allocates memory
 string* factor_vm::reallot_string(string* str_, cell capacity) {
   data_root<string> str(str_, this);
 
@@ -97,10 +97,10 @@ string* factor_vm::reallot_string(string* str_, cell capacity) {
   }
 }
 
-/* Allocates memory */
+// Allocates memory
 void factor_vm::primitive_resize_string() {
   data_root<string> str(ctx->pop(), this);
-  str.untag_check(this);
+  check_tagged(str);
   cell capacity = unbox_array_size();
   ctx->push(tag<string>(reallot_string(str.untagged(), capacity)));
 }