X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fhash.impure.lisp;h=5a461ab24cfb52a402dae91eedb4cc4f3ef6525e;hb=fcde5281a74cb29e21550f4f979ad6356f149ab9;hp=4641dc40c14096c155c82ff960de261da4d31dc1;hpb=de201aeb12169d0bd377eca4da6116c2797a66ad;p=sbcl.git

diff --git a/tests/hash.impure.lisp b/tests/hash.impure.lisp
index 4641dc4..5a461ab 100644
--- a/tests/hash.impure.lisp
+++ b/tests/hash.impure.lisp
@@ -51,7 +51,9 @@
 		 (complex 1.0 2.0) (complex 1.0d0 2.0)
 		 (complex 1.5 -3/2) (complex 1.5 -1.5d0)
 	       
-		 #\x #\X #\*))
+		 #\x #\X #\*
+
+		 #'allocate-instance #'no-applicable-method))
 	 (make-psxhash-extra-subtests ()
 	   (list (copy-seq "")
 		 (copy-seq #*)
@@ -186,7 +188,6 @@
 	    ;; (If you get a surprising failure here, maybe you were
 	    ;; just very unlucky; see the notes above.)
 	    (error "bad SXHASH behavior for ~S ~S" i j))))
-      #|
       (dolist (i psxhash-tests)
 	(unless (typep (sb-int:psxhash i) '(and fixnum unsigned-byte))
 	  (error "bad PSXHASH behavior for ~S" i))
@@ -196,7 +197,31 @@
 	    ;; (If you get a surprising failure here, maybe you were
 	    ;; just very unlucky; see the notes above.)
 	    (error "bad PSXHASH behavior for ~S ~S" i j))))
-      |#)))
+      )))
+
+;;; As of sbcl-0.6.12.10, writing hash tables readably should work.
+;;; This isn't required by the ANSI standard, but it should be, since
+;;; it's well-defined useful behavior which ANSI prohibits the users
+;;; from implementing themselves. (ANSI says the users can't define
+;;; their own their own PRINT-OBJECT (HASH-TABLE T) methods, and they
+;;; can't even wiggle out of it by subclassing HASH-TABLE or STREAM.)
+(let ((original-ht (make-hash-table :test 'equal :size 111))
+      (original-keys '(1 10 11 400030002 -100000000)))
+  (dolist (key original-keys)
+    (setf (gethash key original-ht)
+	  (expt key 4)))
+  (let* ((written-ht (with-output-to-string (s)
+		       (write original-ht :stream s :readably t)))
+	 (read-ht (with-input-from-string (s written-ht)
+		    (read s))))
+    (assert (= (hash-table-count read-ht)
+	       (hash-table-count original-ht)
+	       (length original-keys)))
+    (assert (eql (hash-table-test original-ht) (hash-table-test read-ht)))
+    (assert (eql (hash-table-size original-ht) (hash-table-size read-ht)))
+    (dolist (key original-keys)
+      (assert (eql (gethash key read-ht)
+		   (gethash key original-ht))))))
 
 ;;; success
 (quit :unix-status 104)