X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-sxhash.lisp;h=5e7b3d9d68aea2c0b1009f7431c2d8ad374c45b1;hb=0f2ae6ebc3520494b665a9dbf32c36c671334d36;hp=7f6f7b309547c05cbb0942423bd0e8737bafe2db;hpb=de201aeb12169d0bd377eca4da6116c2797a66ad;p=sbcl.git

diff --git a/src/code/target-sxhash.lisp b/src/code/target-sxhash.lisp
index 7f6f7b3..5e7b3d9 100644
--- a/src/code/target-sxhash.lisp
+++ b/src/code/target-sxhash.lisp
@@ -26,9 +26,9 @@
 ;;; desiderata:
 ;;;   * Non-commutativity keeps us from hashing e.g. #(1 5) to the
 ;;;     same value as #(5 1), and ending up in real trouble in some
-;;;     special cases like bit vectors the way that CMUCL SXHASH 18b
+;;;     special cases like bit vectors the way that CMUCL 18b SXHASH 
 ;;;     does. (Under CMUCL 18b, SXHASH of any bit vector is 1..)
-;;;   * We'd like to scatter our hash values the entire possible range
+;;;   * We'd like to scatter our hash values over the entire possible range
 ;;;     of values instead of hashing small or common key values (like
 ;;;     2 and NIL and #\a) to small FIXNUMs the way that the CMUCL 18b
 ;;;     SXHASH function does, again helping to avoid pathologies like
@@ -99,7 +99,7 @@
 ;;;	     (unless (string= (gethash hash ht) string)
 ;;;	       (format t "collision: ~S ~S~%" string (gethash hash ht)))
 ;;;	     (setf (gethash hash ht) string))))
-;;;     (format t "final count=~D~%" (hash-table-count ht)))
+;;;     (format t "final count=~W~%" (hash-table-count ht)))
 
 (defun %sxhash-simple-string (x)
   (declare (optimize speed))
@@ -117,7 +117,7 @@
 (defun sxhash (x)
   (labels ((sxhash-number (x)
 	     (etypecase x
-	       (fixnum (sxhash x)) ; through DEFTRANSFORM
+	       (fixnum (sxhash x))	; through DEFTRANSFORM
 	       (integer (sb!bignum:sxhash-bignum x))
 	       (single-float (sxhash x)) ; through DEFTRANSFORM
 	       (double-float (sxhash x)) ; through DEFTRANSFORM
@@ -145,9 +145,8 @@
 		    (logxor 422371266
 			    (sxhash ; through DEFTRANSFORM
 			     (class-name (layout-class (%instance-layout x)))))
-		    309518995))
+		    (sxhash-instance x)))
 	       (symbol (sxhash x)) ; through DEFTRANSFORM
-	       (number (sxhash-number x))
 	       (array
 		(typecase x
 		  (simple-string (sxhash x)) ; through DEFTRANSFORM
@@ -161,6 +160,9 @@
 	       (character
 		(logxor 72185131
 			(sxhash (char-code x)))) ; through DEFTRANSFORM
+	       ;; general, inefficient case of NUMBER
+	       (number (sxhash-number x))
+	       (generic-function (sxhash-instance x))
 	       (t 42))))
     (sxhash-recurse x)))