aboutsummaryrefslogtreecommitdiff
path: root/std/rand
diff options
context:
space:
mode:
authorMatthew D. Steele <mdsteele@alum.mit.edu>2018-08-03 11:44:39 -0400
committerAndrew Kelley <superjoe30@gmail.com>2018-08-03 11:44:39 -0400
commitc2a08d7c516899b4c794bd6c3fc07ddb22d5876a (patch)
treed5c286e30ac12b3c4d775c3c4a830b4f2bb1da79 /std/rand
parent298abbcff86629273f24891d243fb6e503392e8f (diff)
downloadzig-c2a08d7c516899b4c794bd6c3fc07ddb22d5876a.tar.gz
zig-c2a08d7c516899b4c794bd6c3fc07ddb22d5876a.zip
Fix the start-less-than-end assertion in std.rand.Random.range (#1325)
The function returns a value in [start, end), but was asserting start <= end instead of start < end. With this fix, range(1, 1) will now assertion error instead of dividing by zero.
Diffstat (limited to 'std/rand')
-rw-r--r--std/rand/index.zig9
1 files changed, 5 insertions, 4 deletions
diff --git a/std/rand/index.zig b/std/rand/index.zig
index 7daa558f13..2cbff049ea 100644
--- a/std/rand/index.zig
+++ b/std/rand/index.zig
@@ -30,7 +30,7 @@ pub const DefaultCsprng = Isaac64;
pub const Random = struct {
fillFn: fn (r: *Random, buf: []u8) void,
- /// Read random bytes into the specified buffer until fill.
+ /// Read random bytes into the specified buffer until full.
pub fn bytes(r: *Random, buf: []u8) void {
r.fillFn(r, buf);
}
@@ -48,10 +48,10 @@ pub const Random = struct {
}
}
- /// Get a random unsigned integer with even distribution between `start`
- /// inclusive and `end` exclusive.
+ /// Return a random integer with even distribution between `start`
+ /// inclusive and `end` exclusive. `start` must be less than `end`.
pub fn range(r: *Random, comptime T: type, start: T, end: T) T {
- assert(start <= end);
+ assert(start < end);
if (T.is_signed) {
const uint = @IntType(false, T.bit_count);
if (start >= 0 and end >= 0) {
@@ -664,6 +664,7 @@ test "Random range" {
testRange(&prng.random, -4, 3);
testRange(&prng.random, -4, -1);
testRange(&prng.random, 10, 14);
+ // TODO: test that prng.random.range(1, 1) causes an assertion error
}
fn testRange(r: *Random, start: i32, end: i32) void {