Merge pull request #867 from zig-lang/rand-overhaul

Rewrite Rand functions
ziglang · Mar 29, 2018 · b80398b · b80398b
2 parents 9df2a6a + ccadcbc
commit b80398b
Show file tree

Hide file tree

Showing 9 changed files with 740 additions and 837 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -509,7 +509,7 @@ set(ZIG_STD_FILES
     "os/windows/index.zig"
     "os/windows/util.zig"
     "os/zen.zig"
-    "rand.zig"
+    "rand/index.zig"
     "sort.zig"
     "special/bootstrap.zig"
     "special/bootstrap_lib.zig"

diff --git a/example/guess_number/main.zig b/example/guess_number/main.zig
@@ -2,7 +2,6 @@ const builtin = @import("builtin");
 const std = @import("std");
 const io = std.io;
 const fmt = std.fmt;
-const Rand = std.rand.Rand;
 const os = std.os;
 
 pub fn main() !void {
@@ -14,15 +13,15 @@ pub fn main() !void {
 
     try stdout.print("Welcome to the Guess Number Game in Zig.\n");
 
-    var seed_bytes: [@sizeOf(usize)]u8 = undefined;
+    var seed_bytes: [@sizeOf(u64)]u8 = undefined;
     os.getRandomBytes(seed_bytes[0..]) catch |err| {
         std.debug.warn("unable to seed random number generator: {}", err);
         return err;
     };
-    const seed = std.mem.readInt(seed_bytes, usize, builtin.Endian.Big);
-    var rand = Rand.init(seed);
+    const seed = std.mem.readInt(seed_bytes, u64, builtin.Endian.Big);
+    var prng = std.rand.DefaultPrng.init(seed);
 
-    const answer = rand.range(u8, 0, 100) + 1;
+    const answer = prng.random.range(u8, 0, 100) + 1;
 
     while (true) {
         try stdout.print("\nGuess a number between 1 and 100: ");

diff --git a/src/parser.hpp b/src/parser.hpp
@@ -16,7 +16,6 @@ ATTRIBUTE_PRINTF(2, 3)
 void ast_token_error(Token *token, const char *format, ...);
 
 
-// This function is provided by generated code, generated by parsergen.cpp
 AstNode * ast_parse(Buf *buf, ZigList<Token> *tokens, ImportTableEntry *owner, ErrColor err_color);
 
 void ast_print(AstNode *node, int indent);

diff --git a/std/index.zig b/std/index.zig
@@ -26,7 +26,7 @@ pub const math = @import("math/index.zig");
 pub const mem = @import("mem.zig");
 pub const net = @import("net.zig");
 pub const os = @import("os/index.zig");
-pub const rand = @import("rand.zig");
+pub const rand = @import("rand/index.zig");
 pub const sort = @import("sort.zig");
 pub const unicode = @import("unicode.zig");
 pub const zig = @import("zig/index.zig");
@@ -58,7 +58,7 @@ test "std" {
     _ = @import("heap.zig");
     _ = @import("net.zig");
     _ = @import("os/index.zig");
-    _ = @import("rand.zig");
+    _ = @import("rand/index.zig");
     _ = @import("sort.zig");
     _ = @import("unicode.zig");
     _ = @import("zig/index.zig");

diff --git a/std/io_test.zig b/std/io_test.zig
@@ -1,16 +1,16 @@
 const std = @import("index.zig");
 const io = std.io;
 const allocator = std.debug.global_allocator;
-const Rand = std.rand.Rand;
+const DefaultPrng = std.rand.DefaultPrng;
 const assert = std.debug.assert;
 const mem = std.mem;
 const os = std.os;
 const builtin = @import("builtin");
 
 test "write a file, read it, then delete it" {
     var data: [1024]u8 = undefined;
-    var rng = Rand.init(1234);
-    rng.fillBytes(data[0..]);
+    var prng = DefaultPrng.init(1234);
+    prng.random.bytes(data[0..]);
     const tmp_file_name = "temp_test_file.txt";
     {
         var file = try os.File.openWrite(allocator, tmp_file_name);

diff --git a/std/rand.zig b/std/rand.zig