rand: simplify rand.PRNG, move to optional types for error handling (#13570)

vlib/rand/wyrand/wyrand.v

@@ -3,7 +3,6 @@
 // that can be found in the LICENSE file.
 module wyrand
 
-import math.bits
 import rand.seed
 import rand.constants
 import hash
@@ -58,195 +57,3 @@ pub fn (mut rng WyRandRNG) u64() u64 {
 	}
 	return 0
 }
-
-// u32n returns a pseudorandom `u32` less than `max`.
-[inline]
-pub fn (mut rng WyRandRNG) u32n(max u32) u32 {
-	if max == 0 {
-		eprintln('max must be positive integer')
-		exit(1)
-	}
-	// Check SysRNG in system_rng.c.v for explanation
-	bit_len := bits.len_32(max)
-	if bit_len == 32 {
-		for {
-			value := rng.u32()
-			if value < max {
-				return value
-			}
-		}
-	} else {
-		mask := (u32(1) << (bit_len + 1)) - 1
-		for {
-			value := rng.u32() & mask
-			if value < max {
-				return value
-			}
-		}
-	}
-	return u32(0)
-}
-
-// u64n returns a pseudorandom `u64` less than `max`.
-[inline]
-pub fn (mut rng WyRandRNG) u64n(max u64) u64 {
-	if max == 0 {
-		eprintln('max must be positive integer')
-		exit(1)
-	}
-	bit_len := bits.len_64(max)
-	if bit_len == 64 {
-		for {
-			value := rng.u64()
-			if value < max {
-				return value
-			}
-		}
-	} else {
-		mask := (u64(1) << (bit_len + 1)) - 1
-		for {
-			value := rng.u64() & mask
-			if value < max {
-				return value
-			}
-		}
-	}
-	return u64(0)
-}
-
-// u32n returns a pseudorandom `u32` value that is guaranteed to be in range `[min, max)`.
-[inline]
-pub fn (mut rng WyRandRNG) u32_in_range(min u32, max u32) u32 {
-	if max <= min {
-		eprintln('max must be greater than min')
-		exit(1)
-	}
-	return min + rng.u32n(max - min)
-}
-
-// u64n returns a pseudorandom `u64` value that is guaranteed to be in range `[min, max)`.
-[inline]
-pub fn (mut rng WyRandRNG) u64_in_range(min u64, max u64) u64 {
-	if max <= min {
-		eprintln('max must be greater than min')
-		exit(1)
-	}
-	return min + rng.u64n(max - min)
-}
-
-// int returns a (possibly negative) pseudorandom 32-bit `int`.
-[inline]
-pub fn (mut rng WyRandRNG) int() int {
-	return int(rng.u32())
-}
-
-// i64 returns a (possibly negative) pseudorandom 64-bit `i64`.
-[inline]
-pub fn (mut rng WyRandRNG) i64() i64 {
-	return i64(rng.u64())
-}
-
-// int31 returns a positive pseudorandom 31-bit `int`.
-[inline]
-pub fn (mut rng WyRandRNG) int31() int {
-	return int(rng.u32() & constants.u31_mask) // Set the 32nd bit to 0.
-}
-
-// int63 returns a positive pseudorandom 63-bit `i64`.
-[inline]
-pub fn (mut rng WyRandRNG) int63() i64 {
-	return i64(rng.u64() & constants.u63_mask) // Set the 64th bit to 0.
-}
-
-// intn returns a pseudorandom `int` in range `[0, max)`.
-[inline]
-pub fn (mut rng WyRandRNG) intn(max int) int {
-	if max <= 0 {
-		eprintln('max has to be positive.')
-		exit(1)
-	}
-	return int(rng.u32n(u32(max)))
-}
-
-// i64n returns a pseudorandom int that lies in `[0, max)`.
-[inline]
-pub fn (mut rng WyRandRNG) i64n(max i64) i64 {
-	if max <= 0 {
-		eprintln('max has to be positive.')
-		exit(1)
-	}
-	return i64(rng.u64n(u64(max)))
-}
-
-// int_in_range returns a pseudorandom `int` in range `[min, max)`.
-[inline]
-pub fn (mut rng WyRandRNG) int_in_range(min int, max int) int {
-	if max <= min {
-		eprintln('max must be greater than min')
-		exit(1)
-	}
-	// This supports negative ranges like [-10, -5) because the difference is positive
-	return min + rng.intn(max - min)
-}
-
-// i64_in_range returns a pseudorandom `i64` in range `[min, max)`.
-[inline]
-pub fn (mut rng WyRandRNG) i64_in_range(min i64, max i64) i64 {
-	if max <= min {
-		eprintln('max must be greater than min')
-		exit(1)
-	}
-	return min + rng.i64n(max - min)
-}
-
-// f32 returns a pseudorandom `f32` value in range `[0, 1)`.
-[inline]
-pub fn (mut rng WyRandRNG) f32() f32 {
-	return f32(rng.u32()) / constants.max_u32_as_f32
-}
-
-// f64 returns a pseudorandom `f64` value in range `[0, 1)`.
-[inline]
-pub fn (mut rng WyRandRNG) f64() f64 {
-	return f64(rng.u64()) / constants.max_u64_as_f64
-}
-
-// f32n returns a pseudorandom `f32` value in range `[0, max)`.
-[inline]
-pub fn (mut rng WyRandRNG) f32n(max f32) f32 {
-	if max <= 0 {
-		eprintln('max has to be positive.')
-		exit(1)
-	}
-	return rng.f32() * max
-}
-
-// f64n returns a pseudorandom `f64` value in range `[0, max)`.
-[inline]
-pub fn (mut rng WyRandRNG) f64n(max f64) f64 {
-	if max <= 0 {
-		eprintln('max has to be positive.')
-		exit(1)
-	}
-	return rng.f64() * max
-}
-
-// f32_in_range returns a pseudorandom `f32` in range `[min, max)`.
-[inline]
-pub fn (mut rng WyRandRNG) f32_in_range(min f32, max f32) f32 {
-	if max <= min {
-		eprintln('max must be greater than min')
-		exit(1)
-	}
-	return min + rng.f32n(max - min)
-}
-
-// i64_in_range returns a pseudorandom `i64` in range `[min, max)`.
-[inline]
-pub fn (mut rng WyRandRNG) f64_in_range(min f64, max f64) f64 {
-	if max <= min {
-		eprintln('max must be greater than min')
-		exit(1)
-	}
-	return min + rng.f64n(max - min)
-}