refactor: migrate rand and arbitrary

array/array.mbt

@@ -310,15 +310,6 @@ pub fn[A, B] zip_to_iter2(self : Array[A], other : Array[B]) -> Iter2[A, B] {
   })
 }
 
-///|
-pub impl[X : @quickcheck.Arbitrary] @quickcheck.Arbitrary for Array[X] with arbitrary(
-  size,
-  rs
-) {
-  let len = if size == 0 { 0 } else { rs.next_positive_int() % size }
-  Array::makei(len, fn(x) { X::arbitrary(x, rs) })
-}
-
 ///|
 /// Join an array of strings using the provided `separator`.
 ///

array/fixedarray.mbt

@@ -1240,12 +1240,3 @@ test "FixedArray::join" {
   let fixed_array_empty : FixedArray[String] = []
   inspect(fixed_array_empty.join(","), content="")
 }
-
-///|
-pub impl[X : @quickcheck.Arbitrary] @quickcheck.Arbitrary for FixedArray[X] with arbitrary(
-  size,
-  rs
-) {
-  let len = if size == 0 { 0 } else { rs.next_positive_int() % size }
-  FixedArray::makei(len, fn(x) { X::arbitrary(x, rs) })
-}

array/moon.pkg.json

@@ -2,15 +2,14 @@
   "import": [
     "moonbitlang/core/builtin",
     "moonbitlang/core/bytes",
-    "moonbitlang/core/string",
-    "moonbitlang/core/quickcheck",
-    "moonbitlang/core/quickcheck/splitmix"
+    "moonbitlang/core/string"
   ],
   "test-import": [
     "moonbitlang/core/char",
     "moonbitlang/core/test",
     "moonbitlang/core/random",
-    "moonbitlang/core/json"
+    "moonbitlang/core/json",
+    "moonbitlang/core/quickcheck"
   ],
   "targets": {
     "array_js.mbt": ["js"],

array/view.mbt

@@ -486,11 +486,3 @@ pub impl[A : Hash] Hash for View[A] with hash_combine(self, hasher) {
     hasher.combine(e)
   }
 }
-
-///|
-pub impl[A : @quickcheck.Arbitrary] @quickcheck.Arbitrary for View[A] with arbitrary(
-  size,
-  rs
-) {
-  Array::arbitrary(size, rs)[:]
-}

bigint/bigint.mbt

@@ -51,15 +51,6 @@ pub impl @json.FromJson for BigInt with from_json(json, path) {
   BigInt::from_string(s)
 }
 
-///|
-pub impl @quickcheck.Arbitrary for BigInt with arbitrary(size, rs) {
-  if size == 0 {
-    0
-  } else {
-    rs.next_int64() |> BigInt::from_int64
-  }
-}
-
 ///|
 /// Tests equality between a `BigInt` and an `Int` value.
 ///

bigint/moon.pkg.json

@@ -4,8 +4,6 @@
     "moonbitlang/core/char",
     "moonbitlang/core/uint",
     "moonbitlang/core/json",
-    "moonbitlang/core/quickcheck",
-    "moonbitlang/core/quickcheck/splitmix",
     "moonbitlang/core/string"
   ],
   "targets": {

option/moon.pkg.json

@@ -2,7 +2,7 @@
   "import": [
     "moonbitlang/core/builtin",
     "moonbitlang/core/quickcheck",
-    "moonbitlang/core/quickcheck/splitmix"
+    "moonbitlang/core/random"
   ],
   "targets": {
     "panic_test.mbt": ["not", "native", "llvm"]

priority_queue/moon.pkg.json

@@ -3,7 +3,7 @@
     "moonbitlang/core/builtin",
     "moonbitlang/core/array",
     "moonbitlang/core/quickcheck",
-    "moonbitlang/core/quickcheck/splitmix"
+    "moonbitlang/core/random"
   ],
   "test-import": ["moonbitlang/core/random"],
   "targets": {

quickcheck/arbitrary.mbt

@@ -18,7 +18,7 @@ pub(open) trait Arbitrary {
   // `arbitrary` function takes a random number generator and a number that 
   // determines the size of the generated value as arguments, and returns a
   // randomly generated value of certain type.
-  arbitrary(Int, @splitmix.RandomState) -> Self
+  arbitrary(Int, &@random.Source) -> Self
 }
 
 ///|
@@ -124,13 +124,38 @@ pub impl[X : Arbitrary] Arbitrary for Iter[X] with arbitrary(size, rs) {
 }
 
 ///|
-pub fn[T : Arbitrary] gen(size? : Int, state? : @splitmix.RandomState) -> T {
+pub impl[X : Arbitrary] Arbitrary for Array[X] with arbitrary(size, rs) {
+  let len = if size == 0 { 0 } else { rs.next_positive_int() % size }
+  Array::makei(len, fn(x) { X::arbitrary(x, rs) })
+}
+
+///|
+pub impl[X : Arbitrary] Arbitrary for FixedArray[X] with arbitrary(size, rs) {
+  let len = if size == 0 { 0 } else { rs.next_positive_int() % size }
+  FixedArray::makei(len, fn(x) { X::arbitrary(x, rs) })
+}
+
+///|
+pub impl[A : Arbitrary] Arbitrary for @array.View[A] with arbitrary(size, rs) {
+  (Arbitrary::arbitrary(size, rs) : Array[A])[:]
+}
+
+///|
+pub impl Arbitrary for @bigint.BigInt with arbitrary(size, rs) {
+  let len = if size == 0 { 0 } else { rs.next_positive_int() % size }
+  rs.next_bigint(len)
+}
+
+///|
+pub fn[T : Arbitrary] gen(size? : Int, state? : &@random.Source) -> T {
   let size = match size {
     None => 0
     Some(x) => x
   }
   let state = match state {
-    None => @splitmix.RandomState::default()
+    None => {
+      @splitmix.RandomState::default() as &@random.Source
+    }
     Some(x) => x
   }
   Arbitrary::arbitrary(size, state)

quickcheck/moon.pkg.json

@@ -1,14 +1,15 @@
 {
   "import": [
     "moonbitlang/core/quickcheck/splitmix",
+    "moonbitlang/core/array",
     "moonbitlang/core/builtin",
-    "moonbitlang/core/char"
+    "moonbitlang/core/char",
+    "moonbitlang/core/random",
+    "moonbitlang/core/bigint"
   ],
   "test-import": [
-    "moonbitlang/core/array",
-    "moonbitlang/core/bigint",
     "moonbitlang/core/float",
     "moonbitlang/core/double",
     "moonbitlang/core/tuple"
   ]
-}
+}

quickcheck/splitmix/moon.pkg.json

@@ -1,3 +1,6 @@
 {
-  "import": ["moonbitlang/core/builtin"]
+  "import": [
+    "moonbitlang/core/builtin",
+    "moonbitlang/core/random"
+  ]
 }

quickcheck/splitmix/random.mbt

@@ -18,6 +18,13 @@ struct RandomState {
   gamma : UInt64
 } derive(Show, Default)
 
+///|
+pub impl @random.Source for RandomState with next(self) {
+  let { seed, gamma } = self
+  self.seed = seed + gamma
+  mix64(self.seed)
+}
+
 ///|
 let golden_gamma : UInt64 = 0x9e3779b97f4a7c15
 

random/source.mbt

@@ -0,0 +1,51 @@
+///|
+pub fn next_uint64(self : &Source) -> UInt64 {
+  Rand(self).uint64()
+}
+
+///|
+pub fn next_uint(self : &Source) -> UInt {
+  Rand(self).uint()
+}
+
+///|
+pub fn next_int64(self : &Source) -> Int64 {
+  Rand(self).uint64().reinterpret_as_int64()
+}
+
+///|
+pub fn next_two_uint(self : &Source) -> (UInt, UInt) {
+  let u1 = Rand(self).uint()
+  let u2 = Rand(self).uint()
+  (u1, u2)
+}
+
+///|
+pub fn next_int(self : &Source) -> Int {
+  Rand(self).uint().reinterpret_as_int()
+}
+
+///|
+pub fn next_positive_int(self : &Source) -> Int {
+  Rand(self).int()
+}
+
+///|
+pub fn next_float(self : &Source) -> Float {
+  Rand(self).float()
+}
+
+///|
+pub fn next_double(self : &Source) -> Double {
+  Rand(self).double()
+}
+
+///|
+pub fn next_bigint(self : &Source, bits : Int) -> @bigint.BigInt {
+  Rand(self).bigint(bits)
+}
+
+///|
+pub fn split(self : &Source) -> &Source {
+  self
+}

tuple/moon.pkg.json

@@ -2,7 +2,7 @@
   "import": [
     "moonbitlang/core/builtin",
     "moonbitlang/core/quickcheck",
-    "moonbitlang/core/quickcheck/splitmix"
+    "moonbitlang/core/random"
   ],
   "test-import": [
     "moonbitlang/core/char"