Move gen_res53 to mersenne.rs

coolreader18 · coolreader18 · commit a762bf89d97f · 2020-02-03T18:27:35.000-06:00
diff --git a/vm/src/stdlib/random.rs b/vm/src/stdlib/random.rs
@@ -77,7 +77,7 @@ impl PyRandom {
 
     #[pymethod]
     fn random(&self) -> f64 {
-        gen_res53(&mut *self.rng.borrow_mut())
+        mersenne::gen_res53(&mut *self.rng.borrow_mut())
     }
 
     #[pymethod]
@@ -127,12 +127,3 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
         "Random" => PyRandom::make_class(ctx),
     })
 }
-
-// taken from the translated mersenne twister
-/* generates a random number on [0,1) with 53-bit resolution*/
-fn gen_res53<R: RngCore>(rng: &mut R) -> f64 {
-    let a = rng.next_u32() >> 5;
-    let b = rng.next_u32() >> 6;
-    (a as f64 * 67108864.0 + b as f64) * (1.0 / 9007199254740992.0)
-}
-/* These real versions are due to Isaku Wada, 2002/01/09 added */
diff --git a/vm/src/stdlib/random/mersenne.rs b/vm/src/stdlib/random/mersenne.rs
@@ -186,6 +186,14 @@ impl MT19937 {
     }
 }
 
+/* generates a random number on [0,1) with 53-bit resolution*/
+pub fn gen_res53<R: rand::RngCore>(rng: &mut R) -> f64 {
+    let a = rng.next_u32() >> 5;
+    let b = rng.next_u32() >> 6;
+    (a as f64 * 67108864.0 + b as f64) * (1.0 / 9007199254740992.0)
+}
+/* These real versions are due to Isaku Wada, 2002/01/09 added */
+
 impl rand::RngCore for MT19937 {
     fn next_u32(&mut self) -> u32 {
         self.gen_u32()

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,14 @@ impl MT19937 {`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
	`189`	`+/* generates a random number on [0,1) with 53-bit resolution*/`
	`190`	`+pub fn gen_res53<R: rand::RngCore>(rng: &mut R) -> f64 {`
	`191`	`+ let a = rng.next_u32() >> 5;`
	`192`	`+ let b = rng.next_u32() >> 6;`
	`193`	`+ (a as f64 * 67108864.0 + b as f64) * (1.0 / 9007199254740992.0)`
	`194`	`+}`
	`195`	`+/* These real versions are due to Isaku Wada, 2002/01/09 added */`
	`196`	`+`
`189`	`197`	`impl rand::RngCore for MT19937 {`
`190`	`198`	`fn next_u32(&mut self) -> u32 {`
`191`	`199`	`self.gen_u32()`