Switch around some of the logic for array:random() and array:shuffle()

to use Int$random() and return values

1 files changed, 4 insertions, 3 deletions

diff --git a/builtins/array.c b/builtins/array.c
index 3b1b7c6d..9b0e4206 100644
--- a/builtins/array.c
+++ b/builtins/array.c
@@ -13,6 +13,7 @@
 #include "array.h"
 #include "functions.h"
 #include "halfsiphash.h"
+#include "integers.h"
 #include "types.h"
 #include "util.h"
 
@@ -160,7 +161,7 @@ public void Array$shuffle(array_t *arr, int64_t padded_item_size)
 
     char tmp[padded_item_size];
     for (int64_t i = arr->length-1; i > 1; i--) {
-        int32_t j = arc4random_uniform(i+1);
+        int64_t j = Int$random(0, i);
         memcpy(tmp, arr->data + i*padded_item_size, padded_item_size);
         memcpy((void*)arr->data + i*padded_item_size, arr->data + j*padded_item_size, padded_item_size);
         memcpy((void*)arr->data + j*padded_item_size, tmp, padded_item_size);
@@ -171,7 +172,7 @@ public void *Array$random(array_t arr)
 {
     if (arr.length == 0)
         return NULL; // fail("Cannot get a random item from an empty array!");
-    uint32_t index = arc4random_uniform(arr.length);
+    int64_t index = Int$random(0, arr.length-1);
     return arr.data + arr.stride*index;
 }
 
@@ -203,7 +204,7 @@ public array_t Array$sample(array_t arr, int64_t n, array_t weights, int64_t pad
 
     if (total == 0.0) {
         for (int64_t i = 0; i < n; i++) {
-            uint32_t index = arc4random_uniform(arr.length);
+            int64_t index = Int$random(0, arr.length-1);
             memcpy(selected.data + i*padded_item_size, arr.data + arr.stride*index, padded_item_size);
         }
     } else {