Merge git://factorcode.org/git/factor

Conflicts:

	extra/random-tester/random/random.factor
	extra/random-tester/utils/utils.factor

diff --cc extra/random-tester/random/random.factor
index 7b7b4dfb6e2e9119599d370dd661bafc8e24535a,7cd669becf4ca7d4ff9350a0687a8d78e211fed5..163de69a59fe5d73b513a4a2f9a4b285464fb4a9
--- 1/extra/random-tester/random/random.factor
--- 2/extra/random-tester/random/random.factor
+++ b/extra/random-tester/random/random.factor
@@@ -18,15 -18,15 +18,15 @@@ IN: random-teste
  : random-string
      [ max-length random [ max-value random , ] times ] "" make ;
  
 -SYMBOL: special-integers
 +: special-integers ( -- seq ) \ special-integers get ;
  [ { -1 0 1 } % most-negative-fixnum , most-positive-fixnum , first-bignum , ] 
  { } make \ special-integers set-global
 -SYMBOL: special-floats
 +: special-floats ( -- seq ) \ special-floats get ;
  [ { 0.0 -0.0 } % e , pi , 1./0. , -1./0. , 0./0. , epsilon , epsilon neg , ]
  { } make \ special-floats set-global
 -SYMBOL: special-complexes
 +: special-complexes ( -- seq ) \ special-complexes get ;
  [ 
-     { -1 0 1 } % -1 sqrt dup , neg ,
+     { -1 0 1 C{ 0 1 } C{ 0 -1 } } %
      e , e neg , pi , pi neg ,
      0 pi rect> , 0 pi neg rect> , pi neg 0 rect> , pi pi rect> ,
      pi pi neg rect> , pi neg pi rect> , pi neg pi neg rect> ,

diff --cc extra/random-tester/utils/utils.factor
index 3bc8184e5ebca07dc3e6fce6fef13386271dff00,1c591a11e9d563122d871eb2f02e413fbf4078bb..a025bbf45f76c55c462e40eb12ec398a97e52b61
--- 1/extra/random-tester/utils/utils.factor
--- 2/extra/random-tester/utils/utils.factor
+++ b/extra/random-tester/utils/utils.factor
@@@ -1,6 -1,7 +1,6 @@@
  USING: arrays assocs combinators.lib continuations kernel
- math math.functions namespaces quotations random sequences
+ math math.functions memoize namespaces quotations random sequences
  sequences.private shuffle ;
 -
  IN: random-tester.utils
  
  : %chance ( n -- ? )