removed global functions from arrays.cpp

diff --git a/vm/arrays.cpp b/vm/arrays.cpp
index 8d964c4d215739ea8148dfb00717cb49e0adafae..62992c4e7c072d66e550833e848cd44f5b22c874 100644 (file)
--- a/vm/arrays.cpp
+++ b/vm/arrays.cpp
@@ -23,10 +23,6 @@ array *factorvm::allot_array(cell capacity, cell fill_)
        return new_array.untagged();
 }
 
-array *allot_array(cell capacity, cell fill_)
-{
-       return vm->allot_array(capacity,fill_);
-}
 
 /* push a new array on the stack */
 inline void factorvm::vmprim_array()
@@ -49,10 +45,6 @@ cell factorvm::allot_array_1(cell obj_)
        return a.value();
 }
 
-cell allot_array_1(cell obj_)
-{
-       return vm->allot_array_1(obj_);
-}
 
 cell factorvm::allot_array_2(cell v1_, cell v2_)
 {
@@ -64,10 +56,6 @@ cell factorvm::allot_array_2(cell v1_, cell v2_)
        return a.value();
 }
 
-cell allot_array_2(cell v1_, cell v2_)
-{
-       return vm->allot_array_2(v1_,v2_);
-}
 
 cell factorvm::allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_)
 {
@@ -83,10 +71,6 @@ cell factorvm::allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_)
        return a.value();
 }
 
-cell allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_)
-{
-       return vm->allot_array_4(v1_,v2_,v3_,v4_);
-}
 
 inline void factorvm::vmprim_resize_array()
 {

diff --git a/vm/arrays.hpp b/vm/arrays.hpp
index 282474ade85ffbc6a8e84d66f3ddd7d166316563..e3eaccfba34d53382bbfc30af5455bf4e1b6430a 100755 (executable)
--- a/vm/arrays.hpp
+++ b/vm/arrays.hpp
@@ -10,16 +10,6 @@ inline cell array_nth(array *array, cell slot)
        return array->data()[slot];
 }
 
-
-
-
-
-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);
 

diff --git a/vm/inlineimpls.hpp b/vm/inlineimpls.hpp
index 241c958b2cd4dbc88cd6da3cc87ca3ed8c1e3bcb..3932177a722b7a875bb31f021830104cca29f988 100644 (file)
--- a/vm/inlineimpls.hpp
+++ b/vm/inlineimpls.hpp
@@ -347,7 +347,7 @@ struct growable_array {
        cell count;
        gc_root<array> elements;
 
-       growable_array(factorvm *myvm, cell capacity = 10) : count(0), elements(allot_array(capacity,F),myvm) {}
+       growable_array(factorvm *myvm, cell capacity = 10) : count(0), elements(myvm->allot_array(capacity,F),myvm) {}
 
        void add(cell elt);
        void trim();