VM: Refactor byte_arrays to Factor style

diff --git a/vm/byte_arrays.cpp b/vm/byte_arrays.cpp
index 907cf3ee631cd3067d54ccec5f7f6ca365c78513..486d1bb806777a9ed532c9cec7f7a728aafe1f6e 100644 (file)
--- a/vm/byte_arrays.cpp
+++ b/vm/byte_arrays.cpp
@@ -1,76 +1,67 @@
 #include "master.hpp"
 
-namespace factor
-{
+namespace factor {
 
 /* Allocates memory */
-byte_array *factor_vm::allot_byte_array(cell size)
-{
-       byte_array *array = allot_uninitialized_array<byte_array>(size);
-       memset(array + 1,0,size);
-       return array;
+byte_array* factor_vm::allot_byte_array(cell size) {
+  byte_array* array = allot_uninitialized_array<byte_array>(size);
+  memset(array + 1, 0, size);
+  return array;
 }
 
 /* Allocates memory */
-void factor_vm::primitive_byte_array()
-{
-       cell size = unbox_array_size();
-       ctx->push(tag<byte_array>(allot_byte_array(size)));
+void factor_vm::primitive_byte_array() {
+  cell size = unbox_array_size();
+  ctx->push(tag<byte_array>(allot_byte_array(size)));
 }
 
 /* Allocates memory */
-void factor_vm::primitive_uninitialized_byte_array()
-{
-       cell size = unbox_array_size();
-       ctx->push(tag<byte_array>(allot_uninitialized_array<byte_array>(size)));
+void factor_vm::primitive_uninitialized_byte_array() {
+  cell size = unbox_array_size();
+  ctx->push(tag<byte_array>(allot_uninitialized_array<byte_array>(size)));
 }
 
 /* Allocates memory */
-void factor_vm::primitive_resize_byte_array()
-{
-       data_root<byte_array> array(ctx->pop(),this);
-       array.untag_check(this);
-       cell capacity = unbox_array_size();
-       ctx->push(tag<byte_array>(reallot_array(array.untagged(),capacity)));
+void factor_vm::primitive_resize_byte_array() {
+  data_root<byte_array> array(ctx->pop(), this);
+  array.untag_check(this);
+  cell capacity = unbox_array_size();
+  ctx->push(tag<byte_array>(reallot_array(array.untagged(), capacity)));
 }
 
 /* Allocates memory */
-void growable_byte_array::grow_bytes(cell len)
-{
-       count += len;
-       if(count >= array_capacity(elements.untagged()))
-               elements = elements.parent->reallot_array(elements.untagged(),count * 2);
+void growable_byte_array::grow_bytes(cell len) {
+  count += len;
+  if (count >= array_capacity(elements.untagged()))
+    elements = elements.parent->reallot_array(elements.untagged(), count * 2);
 }
 
 /* Allocates memory */
-void growable_byte_array::append_bytes(void *elts, cell len)
-{
-       cell old_count = count;
-       grow_bytes(len);
-       memcpy(&elements->data<u8>()[old_count],elts,len);
+void growable_byte_array::append_bytes(void* elts, cell len) {
+  cell old_count = count;
+  grow_bytes(len);
+  memcpy(&elements->data<u8>()[old_count], elts, len);
 }
 
 /* Allocates memory */
-void growable_byte_array::append_byte_array(cell byte_array_)
-{
-       data_root<byte_array> byte_array(byte_array_,elements.parent);
+void growable_byte_array::append_byte_array(cell byte_array_) {
+  data_root<byte_array> byte_array(byte_array_, elements.parent);
 
-       cell len = array_capacity(byte_array.untagged());
-       cell new_size = count + len;
-       factor_vm *parent = elements.parent;
-       if(new_size >= array_capacity(elements.untagged()))
-               elements = parent->reallot_array(elements.untagged(),new_size * 2);
+  cell len = array_capacity(byte_array.untagged());
+  cell new_size = count + len;
+  factor_vm* parent = elements.parent;
+  if (new_size >= array_capacity(elements.untagged()))
+    elements = parent->reallot_array(elements.untagged(), new_size * 2);
 
-       memcpy(&elements->data<u8>()[count],byte_array->data<u8>(),len);
+  memcpy(&elements->data<u8>()[count], byte_array->data<u8>(), len);
 
-       count += len;
+  count += len;
 }
 
 /* Allocates memory */
-void growable_byte_array::trim()
-{
-       factor_vm *parent = elements.parent;
-       elements = parent->reallot_array(elements.untagged(),count);
+void growable_byte_array::trim() {
+  factor_vm* parent = elements.parent;
+  elements = parent->reallot_array(elements.untagged(), count);
 }
 
 }

diff --git a/vm/byte_arrays.hpp b/vm/byte_arrays.hpp
index 555c7561ff4a3367d2f1d51d048e0a98fdcde629..3a388f0dd69158e84434cdc33d94ff0c484d1442 100644 (file)
--- a/vm/byte_arrays.hpp
+++ b/vm/byte_arrays.hpp
@@ -1,25 +1,25 @@
-namespace factor
-{
+namespace factor {
 
 struct growable_byte_array {
-       cell count;
-       data_root<byte_array> elements;
+  cell count;
+  data_root<byte_array> elements;
 
-       explicit growable_byte_array(factor_vm *parent,cell capacity = 40) : count(0), elements(parent->allot_byte_array(capacity),parent) { }
+  explicit growable_byte_array(factor_vm* parent, cell capacity = 40)
+      : count(0), elements(parent->allot_byte_array(capacity), parent) {}
 
-       void grow_bytes(cell len);
-       void append_bytes(void *elts, cell len);
-       void append_byte_array(cell elts);
+  void grow_bytes(cell len);
+  void append_bytes(void* elts, cell len);
+  void append_byte_array(cell elts);
 
-       void trim();
+  void trim();
 };
 
 /* Allocates memory */
-template<typename Type> byte_array *factor_vm::byte_array_from_value(Type *value)
-{
-       byte_array *data = allot_uninitialized_array<byte_array>(sizeof(Type));
-       memcpy(data->data<char>(),value,sizeof(Type));
-       return data;
+template <typename Type>
+byte_array* factor_vm::byte_array_from_value(Type* value) {
+  byte_array* data = allot_uninitialized_array<byte_array>(sizeof(Type));
+  memcpy(data->data<char>(), value, sizeof(Type));
+  return data;
 }
 
 }