random: some cleanup.

diff --git a/basis/random/dummy/dummy.factor b/basis/random/dummy/dummy.factor
index 988bd015d05966f829e2e5c5537feb22dd7e2022..21037321934ecb44ec36c2fd646c477e3b3c88b4 100644 (file)
--- a/basis/random/dummy/dummy.factor
+++ b/basis/random/dummy/dummy.factor
@@ -4,8 +4,8 @@ IN: random.dummy
 TUPLE: random-dummy i ;
 C: <random-dummy> random-dummy
 
-M: random-dummy seed-random ( obj seed -- obj )
+M: random-dummy seed-random
     >>i ;
 
-M: random-dummy random-32* ( obj -- r )
+M: random-dummy random-32*
     [ dup 1 + ] change-i drop ;

diff --git a/basis/random/mersenne-twister/mersenne-twister.factor b/basis/random/mersenne-twister/mersenne-twister.factor
index 908e62fe665e12ee94f104164e4b53a7f527461d..b55c3455b0225f6dd70d6d46d5feae5beb004fe3 100644 (file)
--- a/basis/random/mersenne-twister/mersenne-twister.factor
+++ b/basis/random/mersenne-twister/mersenne-twister.factor
@@ -62,20 +62,19 @@ PRIVATE>
     init-mt-seq 0 mersenne-twister boa
     dup mt-generate ;
 
-M: mersenne-twister seed-random ( mt seed -- mt' )
+M: mersenne-twister seed-random
     init-mt-seq >>seq
     [ mt-generate ]
     [ 0 >>i drop ]
     [ ] tri ;
 
-M: mersenne-twister random-32* ( mt -- r )
+M: mersenne-twister random-32*
     [ next-index ]
     [ seq>> nth-unsafe mt-temper ]
     [ [ 1 + ] change-i drop ] tri ;
 
 : default-mersenne-twister ( -- mersenne-twister )
-    [ 32 random-bits ] with-system-random
-    <mersenne-twister> ;
+    [ random-32 ] with-system-random <mersenne-twister> ;
 
 [
     default-mersenne-twister random-generator set-global

diff --git a/basis/random/random-docs.factor b/basis/random/random-docs.factor
index 441aea15b282c4caa385fb6c5ee9a4d090114114..6777e1be1a5f9ea771ae843da336449f2d950915 100644 (file)
--- a/basis/random/random-docs.factor
+++ b/basis/random/random-docs.factor
@@ -10,7 +10,7 @@ HELP: seed-random
 { $notes "Not supported on all random number generators." } ;
 
 HELP: random-32*
-{ $values { "obj" "a random number generator" } { "r" "an integer between 0 and 2^32-1" } }
+{ $values { "obj" "a random number generator" } { "n" "an integer between 0 and 2^32-1" } }
 { $description "Generates a random 32-bit unsigned integer." } ;
 
 HELP: random-bytes*
@@ -78,11 +78,11 @@ HELP: random-units
 } ;
 
 HELP: random-bits
-{ $values { "numbits" integer } { "r" "a random integer" } }
+{ $values { "numbits" integer } { "n" "a random integer" } }
 { $description "Outputs an random integer n bits in length." } ;
 
 HELP: random-bits*
-{ $values { "numbits" integer } { "r" "a random integer" } }
+{ $values { "numbits" integer } { "n" "a random integer" } }
 { $description "Returns an integer exactly " { $snippet "numbits" } " in length, with the topmost bit set to one." } ;
 
 HELP: with-random

diff --git a/basis/random/random.factor b/basis/random/random.factor
index 0c232611c84a42dbb33b4ea0de0695a4f981407b..093e0b87e75fc41f7267b3f7ff8fc8fc2589f845 100644 (file)
--- a/basis/random/random.factor
+++ b/basis/random/random.factor
@@ -15,10 +15,10 @@ SYMBOL: secure-random-generator
 SYMBOL: random-generator
 
 GENERIC# seed-random 1 ( obj seed -- obj )
-GENERIC: random-32* ( obj -- r )
+GENERIC: random-32* ( obj -- n )
 GENERIC: random-bytes* ( n obj -- byte-array )
 
-M: object random-bytes* ( n obj -- byte-array )
+M: object random-bytes*
     [ integer>fixnum-strict [ <byte-array> ] keep ] dip
     [ over 4 >= ] [
         [ 4 - ] dip
@@ -27,7 +27,7 @@ M: object random-bytes* ( n obj -- byte-array )
         random-32* c:int <ref> swap head 0 pick copy-unsafe
     ] if ;
 
-M: object random-32* ( obj -- r )
+M: object random-32*
     4 swap random-bytes* c:uint deref ;
 
 ERROR: no-random-number-generator ;
@@ -47,7 +47,7 @@ M: f random-32* ( obj -- * ) no-random-number-generator ;
 
 <PRIVATE
 
-:: (random-bits) ( numbits obj -- r )
+:: (random-bits) ( numbits obj -- n )
     numbits 32 > [
         obj random-32* numbits 32 - [ dup 32 > ] [
             [ 32 shift obj random-32* + ] [ 32 - ] bi*
@@ -60,27 +60,27 @@ M: f random-32* ( obj -- * ) no-random-number-generator ;
 
 PRIVATE>
 
-: random-bits ( numbits -- r )
+: random-bits ( numbits -- n )
     random-generator get (random-bits) ;
 
-: random-bits* ( numbits -- r )
+: random-bits* ( numbits -- n )
     1 - [ random-bits ] keep set-bit ;
 
 <PRIVATE
 
-: next-power-of-2-bits ( n -- numbits )
+: next-power-of-2-bits ( m -- numbits )
     dup 2 <= [ drop 1 ] [ 1 - log2 1 + ] if ; inline
 
-:: ((random-integer)) ( n obj -- r )
-    obj random-32* 32 n next-power-of-2-bits 32 - [ dup 0 > ] [
+:: ((random-integer)) ( m obj -- n )
+    obj random-32* 32 m next-power-of-2-bits 32 - [ dup 0 > ] [
         [ 32 shift obj random-32* + ] [ 32 + ] [ 32 - ] tri*
-    ] while drop [ n * ] [ neg shift ] bi* ; inline
+    ] while drop [ m * ] [ neg shift ] bi* ; inline
 
-GENERIC# (random-integer) 1 ( n obj -- r )
-M: fixnum (random-integer) ( n obj -- r ) ((random-integer)) ;
-M: bignum (random-integer) ( n obj -- r ) ((random-integer)) ;
+GENERIC# (random-integer) 1 ( m obj -- n )
+M: fixnum (random-integer) ( m obj -- n ) ((random-integer)) ;
+M: bignum (random-integer) ( m obj -- n ) ((random-integer)) ;
 
-: random-integer ( n -- r )
+: random-integer ( m -- n )
     random-generator get (random-integer) ;
 
 PRIVATE>

diff --git a/extra/random/blum-blum-shub/blum-blum-shub.factor b/extra/random/blum-blum-shub/blum-blum-shub.factor
index 8229abca69caaeba103398fa7ce831cbd7ba4f51..dca24e7a3a992f51bd6909a4e400c7046b3c6347 100644 (file)
--- a/extra/random/blum-blum-shub/blum-blum-shub.factor
+++ b/extra/random/blum-blum-shub/blum-blum-shub.factor
@@ -25,6 +25,6 @@ PRIVATE>
     [ find-relative-prime ] keep
     blum-blum-shub boa ;
 
-M: blum-blum-shub random-32* ( bbs -- r )
+M: blum-blum-shub random-32*
     0 32 rot
     [ next-bbs-bit swap 1 shift bitor ] curry times ;