Changeset 13310

Timestamp:

Dec 21, 2009, 3:47:21 PM (15 years ago)

Author:

R. Matthew Emerson

Message:

Update PRINT-OBJECT method for new random state objects.

File:

• branches/new-random/lib/numbers.lisp (modified) (1 diff)

branches/new-random/lib/numbers.lisp

@@ -347 +347 @@
 (defparameter a-short-float 1.0s0)
 
-#+32-bit-target
+#-x86-target
 (defmethod print-object ((rs random-state) stream)
-  (format stream "#.(~S ~S ~S)"         ;>> #.GAG!!!
-          'ccl::initialize-random-state
-          (random.seed-1 rs)
-          (random.seed-2 rs)))
-
-#+64-bit-target
+  (let* ((s1 (random.seed-1 rs))
+         (s2 (random.seed-2 rs)))
+    #+64-bit-target
+    (setq s1 (ldb (byte 16 16) s1)
+          s2 (ldb (byte 16 0) s1))
+    (format stream "#.(~S ~S ~S)"         ;>> #.GAG!!!
+            'ccl::initialize-random-state
+            s1
+            s2)))
+
+#+x86-target
 (defmethod print-object ((rs random-state) stream)
-  (let* ((s1 (random.seed-1 rs)))
-    (format stream "#.(~S ~S ~S)"       ;>> #.GAG!!!
-            'ccl::initialize-random-state
-            (ldb (byte 16 16) s1)
-            (ldb (byte 16 0) s1))))
-
-
+  (let* ((s1 (random.mrg31k3p-state rs)))
+    (format stream "#.(~s~{ ~s~})"       ;>> #.GAG!!!
+            'ccl::initialize-mrg31k3p-state
+            (coerce s1 'list))))
 
 (defun float-radix (float)