Index: /trunk/ccl/level-0/l0-numbers.lisp
===================================================================
--- /trunk/ccl/level-0/l0-numbers.lisp	(revision 286)
+++ /trunk/ccl/level-0/l0-numbers.lisp	(revision 287)
@@ -783,5 +783,5 @@
     (rational
      (if (minusp number)
-       (%double-float pi) ; is it (will it be) always double float?
+       (%short-float pi)
        0.0f0))
     (double-float
@@ -1382,5 +1382,5 @@
   (number-case number
     (complex (%imagpart number))
-    (float (float 0.0 number))
+    (float (* 0 number))
     (rational 0)))
 
@@ -1517,28 +1517,28 @@
 (defun ash (integer count)
   "Shifts integer left by count places preserving sign.  - count shifts right."
-  (number-case integer
-   (fixnum
-    (cond ((eql 0 integer)
-           0)
-          (t (number-case count
-              (fixnum
-               (if (eql count 0)
-                 integer
-                 (let ((length (integer-length (the fixnum integer))))
-                   (declare (fixnum length count))
-                   (cond ((and (plusp count)
-                               (> (+ length count)
-                                  (- 31 ppc32::fixnumshift)))                          
-                          (with-small-bignum-buffers ((bi integer))
-                            (bignum-ashift-left bi count)))
-                         ((and (minusp count) (< count -31))
-                          (if (minusp integer) -1 0))
-                         (t (%iash (the fixnum integer) count))))))
-               (bignum
-                (if (minusp count)
-                  (if (minusp integer) -1 0)          
-                  (error "Count ~s too large for ASH" count)))))))
+  (etypecase integer
+    (fixnum
+     (etypecase count
+       (fixnum
+	(if (eql integer 0)
+	  0
+	  (if (eql count 0)
+	    integer
+	    (let ((length (integer-length (the fixnum integer))))
+	      (declare (fixnum length count))
+	      (cond ((and (plusp count)
+			  (> (+ length count)
+			     (- 31 ppc32::fixnumshift)))                          
+		     (with-small-bignum-buffers ((bi integer))
+		       (bignum-ashift-left bi count)))
+		    ((and (minusp count) (< count -31))
+		     (if (minusp integer) -1 0))
+		    (t (%iash (the fixnum integer) count)))))))
+       (bignum
+	(if (minusp count)
+	  (if (minusp integer) -1 0)          
+	  (error "Count ~s too large for ASH" count)))))
     (bignum
-     (number-case count
+     (etypecase count
        (fixnum
         (if (eql count 0) 
@@ -1587,21 +1587,17 @@
 (defun random (number &optional (state *random-state*))
   (if (not (typep state 'random-state)) (report-bad-arg state 'random-state))
-  ; below doesn't boot
-  ;(setq state (require-type (or state *random-state*) 'random-state))
-  (if (eql number 0)
-    0
-    (cond
-     ((and (fixnump number) (>= (the fixnum number) 0))
+  (cond
+     ((and (fixnump number) (> (the fixnum number) 0))
       (locally (declare (fixnum number))
         (if (< number 65536)
           (mod (%next-random-seed state) number)
           (%bignum-random number state))))
-     ((and (typep number 'double-float) (>= (the double-float number) 0.0))
+     ((and (typep number 'double-float) (> (the double-float number) 0.0))
       (%float-random number state))
-     ((and (typep number 'short-float) (>= (the short-float number) 0.0s0))
+     ((and (typep number 'short-float) (> (the short-float number) 0.0s0))
       (%float-random number state))
-     ((and (bignump number) (>= number 0))
+     ((and (bignump number) (> number 0))
       (%bignum-random number state))
-     (t (report-bad-arg number '(or (integer 0) (float 0.0)))))))
+     (t (report-bad-arg number '(or (integer (0)) (float (0.0)))))))
 
 (defun %bignum-random (number &optional state)
@@ -1627,5 +1623,8 @@
       (incf  index 2))
     ; The bignum code expects normalized bignums
-    (mod dividend number)))
+    (let* ((result (mod dividend number)))
+      (if (eq dividend result)
+	(copy-uvector result)
+	result))))
 
 (defun %float-random (number state)