improvement over Random module

Author: bobzhang

jscomp/core/lam_dispatch_primitive.ml

@@ -434,7 +434,6 @@ let translate loc (prim_name : string)
     (*                       Js_of_lam_array.make_array NA Pgenarray [] *)
     (*                      ] *)
     | "caml_sys_time"
-    | "caml_sys_random_seed"
     | "caml_sys_getenv"
     | "caml_sys_system_command" 
     | "caml_sys_getcwd" (* check browser or nodejs *)

jscomp/runtime/caml_sys.ml

@@ -49,7 +49,6 @@ let os_type : unit -> string = [%raw{|function(_){
 }|}]
 (* TODO: improve [js_pass_scope] to avoid remove unused n here *)
 
-external now : unit -> float = "" [@@bs.val "Date.now"]
 
 
 (* let caml_initial_time = now ()  *. 0.001 *)
@@ -65,14 +64,6 @@ let caml_sys_time () =
   else uptime [%raw{|process|}] ()
 
 
-external random : unit -> float = "Math.random" [@@bs.val]
-
-let caml_sys_random_seed () : nativeint array = 
-   [|
-     Caml_nativeint_extern.of_float 
-     ((Caml_nativeint_extern.to_float (Caml_nativeint_extern.logxor (Caml_nativeint_extern.of_float (now ()))
-                             0xffffffffn)) *. random ()) |]
-
 
 
 (*

jscomp/runtime/caml_sys.mli

@@ -30,8 +30,6 @@ val caml_sys_time : unit -> float
 
 val os_type : unit -> string 
 
-val caml_sys_random_seed : unit -> nativeint array
-
 val caml_sys_system_command : string -> int
 
 val caml_sys_getcwd : unit -> string 

jscomp/runtime/release.ninja

@@ -53,7 +53,7 @@ build runtime/caml_splice_call.cmj : cc_cmi runtime/caml_splice_call.ml | runtim
 build runtime/caml_splice_call.cmi : cc runtime/caml_splice_call.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_string.cmj : cc_cmi runtime/caml_string.ml | runtime/caml_string.cmi runtime/caml_string_extern.cmj
 build runtime/caml_string.cmi : cc runtime/caml_string.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_sys.cmj : cc_cmi runtime/caml_sys.ml | runtime/caml_array_extern.cmj runtime/caml_nativeint_extern.cmj runtime/caml_sys.cmi runtime/caml_undefined_extern.cmj runtime/js.cmj
+build runtime/caml_sys.cmj : cc_cmi runtime/caml_sys.ml | runtime/caml_array_extern.cmj runtime/caml_sys.cmi runtime/caml_undefined_extern.cmj runtime/js.cmj
 build runtime/caml_sys.cmi : cc runtime/caml_sys.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj : cc runtime/caml_array_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj : cc runtime/caml_exceptions.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj

jscomp/stdlib-406/random.ml

@@ -25,7 +25,9 @@
    passes all the Diehard tests.
 *)
 
-external random_seed: unit -> int array = "caml_sys_random_seed"
+let random_seed: unit -> int array = fun _ -> 
+  let seed :int = [%raw "Math.floor(Math.random()*0x7fff_ffff)"] in
+  [|seed|]
 
 module State = struct
 
@@ -124,12 +126,12 @@ module State = struct
     then invalid_arg "Random.int64"
     else int64aux s bound
 
-
+#if 0 then
   let nativeint =
     if Nativeint.size = 32
     then fun s bound -> Nativeint.of_int32 (int32 s (Nativeint.to_int32 bound))
     else fun s bound -> Int64.to_nativeint (int64 s (Int64.of_nativeint bound))
-
+#end
 
   (* Returns a float 0 <= x <= 1 with at most 60 bits of precision. *)
   let rawfloat s =
@@ -166,7 +168,9 @@ let default = {
 let bits () = State.bits default
 let int bound = State.int default bound
 let int32 bound = State.int32 default bound
+#if 0 then
 let nativeint bound = State.nativeint default bound
+#end
 let int64 bound = State.int64 default bound
 let float scale = State.float default scale
 let bool () = State.bool default

jscomp/stdlib-406/random.mli

@@ -45,11 +45,11 @@ val int : int -> int
 val int32 : Int32.t -> Int32.t
 (** [Random.int32 bound] returns a random integer between 0 (inclusive)
      and [bound] (exclusive).  [bound] must be greater than 0. *)
-
+#if 0 then
 val nativeint : Nativeint.t -> Nativeint.t
 (** [Random.nativeint bound] returns a random integer between 0 (inclusive)
      and [bound] (exclusive).  [bound] must be greater than 0. *)
-
+#end
 val int64 : Int64.t -> Int64.t
 (** [Random.int64 bound] returns a random integer between 0 (inclusive)
      and [bound] (exclusive).  [bound] must be greater than 0. *)
@@ -90,7 +90,9 @@ module State : sig
   val bits : t -> int
   val int : t -> int -> int
   val int32 : t -> Int32.t -> Int32.t
+#if 0 then  
   val nativeint : t -> Nativeint.t -> Nativeint.t
+#end  
   val int64 : t -> Int64.t -> Int64.t
   val float : t -> float -> float
   val bool : t -> bool

jscomp/stdlib-406/release.ninja

@@ -91,8 +91,8 @@ build stdlib-406/printf.cmj : cc_cmi stdlib-406/printf.ml | stdlib-406/buffer.cm
 build stdlib-406/printf.cmi : cc stdlib-406/printf.mli | stdlib-406/buffer.cmi stdlib-406/pervasives.cmj others
 build stdlib-406/queue.cmj : cc_cmi stdlib-406/queue.ml | stdlib-406/queue.cmi others
 build stdlib-406/queue.cmi : cc stdlib-406/queue.mli | stdlib-406/pervasives.cmj others
-build stdlib-406/random.cmj : cc_cmi stdlib-406/random.ml | stdlib-406/array.cmj stdlib-406/char.cmj stdlib-406/digest.cmj stdlib-406/int32.cmj stdlib-406/int64.cmj stdlib-406/nativeint.cmj stdlib-406/pervasives.cmj stdlib-406/random.cmi stdlib-406/string.cmj others
-build stdlib-406/random.cmi : cc stdlib-406/random.mli | stdlib-406/int32.cmi stdlib-406/int64.cmi stdlib-406/nativeint.cmi stdlib-406/pervasives.cmj others
+build stdlib-406/random.cmj : cc_cmi stdlib-406/random.ml | stdlib-406/array.cmj stdlib-406/char.cmj stdlib-406/digest.cmj stdlib-406/int32.cmj stdlib-406/int64.cmj stdlib-406/pervasives.cmj stdlib-406/random.cmi stdlib-406/string.cmj others
+build stdlib-406/random.cmi : cc stdlib-406/random.mli | stdlib-406/int32.cmi stdlib-406/int64.cmi stdlib-406/pervasives.cmj others
 build stdlib-406/scanf.cmj : cc_cmi stdlib-406/scanf.ml | stdlib-406/buffer.cmj stdlib-406/bytes.cmj stdlib-406/camlinternalFormat.cmj stdlib-406/camlinternalFormatBasics.cmj stdlib-406/list.cmj stdlib-406/pervasives.cmj stdlib-406/printf.cmj stdlib-406/scanf.cmi stdlib-406/string.cmj others
 build stdlib-406/scanf.cmi : cc stdlib-406/scanf.mli | stdlib-406/pervasives.cmi stdlib-406/pervasives.cmj others
 build stdlib-406/set.cmj : cc_cmi stdlib-406/set.ml | stdlib-406/list.cmj stdlib-406/set.cmi others

lib/es6/caml_sys.js

@@ -35,10 +35,6 @@ function caml_sys_time(param) {
   }
 }
 
-function caml_sys_random_seed(param) {
-  return [((Date.now() | 0) ^ 4294967295) * Math.random() | 0];
-}
-
 function caml_sys_system_command(_cmd) {
   return 127;
 }
@@ -98,7 +94,6 @@ export {
   caml_sys_getenv ,
   caml_sys_time ,
   os_type ,
-  caml_sys_random_seed ,
   caml_sys_system_command ,
   caml_sys_getcwd ,
   caml_sys_get_argv ,

lib/es6/random.js

@@ -1,16 +1,17 @@
 
 
 import * as $$Array from "./array.js";
-import * as Curry from "./curry.js";
 import * as Int32 from "./int32.js";
 import * as Int64 from "./int64.js";
 import * as Digest from "./digest.js";
-import * as Caml_sys from "./caml_sys.js";
-import * as Nativeint from "./nativeint.js";
 import * as Caml_array from "./caml_array.js";
 import * as Caml_int64 from "./caml_int64.js";
 import * as Caml_string from "./caml_string.js";
 
+function random_seed(param) {
+  return [(Math.floor(Math.random()*0x7fff_ffff))];
+}
+
 function assign(st1, st2) {
   $$Array.blit(st2.st, 0, st1.st, 0, 55);
   st1.idx = st2.idx;
@@ -52,7 +53,7 @@ function make(seed) {
 }
 
 function make_self_init(param) {
-  return make(Caml_sys.caml_sys_random_seed(undefined));
+  return make(random_seed(undefined));
 }
 
 function copy(s) {
@@ -132,10 +133,6 @@ function int64(s, bound) {
   };
 }
 
-var nativeint = Nativeint.size === 32 ? int32 : (function (s, bound) {
-      return Caml_int64.to_int32(int64(s, Caml_int64.of_int32(bound)));
-    });
-
 function rawfloat(s) {
   var r1 = bits(s);
   var r2 = bits(s);
@@ -223,10 +220,6 @@ function int32$1(bound) {
   return int32($$default, bound);
 }
 
-function nativeint$1(bound) {
-  return Curry._2(nativeint, $$default, bound);
-}
-
 function int64$1(bound) {
   return int64($$default, bound);
 }
@@ -248,7 +241,7 @@ function init(seed) {
 }
 
 function self_init(param) {
-  return full_init$1(Caml_sys.caml_sys_random_seed(undefined));
+  return full_init$1(random_seed(undefined));
 }
 
 function get_state(param) {
@@ -266,7 +259,6 @@ var State = {
   bits: bits,
   $$int: $$int,
   int32: int32,
-  nativeint: nativeint,
   int64: int64,
   $$float: $$float,
   bool: bool
@@ -279,7 +271,6 @@ export {
   bits$1 as bits,
   $$int$1 as $$int,
   int32$1 as int32,
-  nativeint$1 as nativeint,
   int64$1 as int64,
   $$float$1 as $$float,
   bool$1 as bool,

lib/js/caml_sys.js

@@ -35,10 +35,6 @@ function caml_sys_time(param) {
   }
 }
 
-function caml_sys_random_seed(param) {
-  return [((Date.now() | 0) ^ 4294967295) * Math.random() | 0];
-}
-
 function caml_sys_system_command(_cmd) {
   return 127;
 }
@@ -97,7 +93,6 @@ function caml_sys_file_exists(_s) {
 exports.caml_sys_getenv = caml_sys_getenv;
 exports.caml_sys_time = caml_sys_time;
 exports.os_type = os_type;
-exports.caml_sys_random_seed = caml_sys_random_seed;
 exports.caml_sys_system_command = caml_sys_system_command;
 exports.caml_sys_getcwd = caml_sys_getcwd;
 exports.caml_sys_get_argv = caml_sys_get_argv;