From fc841c24018efac2ce82d7d5acf3c5d1c45fdb8b Mon Sep 17 00:00:00 2001
From: dtc <dtc>
Date: Thu, 6 Jul 2000 04:36:24 +0000
Subject: [PATCH] Clarify some assertions on the result of function rem,
 firstly receiving the only the first value.

---
 code/package.lisp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/code/package.lisp b/code/package.lisp
index c2123e98d..cb5affb5b 100644
--- a/code/package.lisp
+++ b/code/package.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/package.lisp,v 1.53 2000/05/23 05:43:14 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/package.lisp,v 1.54 2000/07/06 04:36:24 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -233,13 +233,13 @@
 (defmacro entry-hash (length sxhash)
   `(the fixnum
 	(+ (the fixnum
-		(rem (the fixnum
-			  (logxor ,length
-				  ,sxhash
-				  (the fixnum (ash ,sxhash -8))
-				  (the fixnum (ash ,sxhash -16))
-				  (the fixnum (ash ,sxhash -19))))
-		     254))
+		(values (rem (the fixnum
+				  (logxor ,length
+					  ,sxhash
+					  (the fixnum (ash ,sxhash -8))
+					  (the fixnum (ash ,sxhash -16))
+					  (the fixnum (ash ,sxhash -19))))
+			     254)))
 	   2)))
 
 ;;; Make-Package-Hashtable  --  Internal
@@ -301,8 +301,9 @@
 	 (hash (package-hashtable-hash table))
 	 (len (length vec))
 	 (sxhash (%sxhash-simple-string (symbol-name symbol)))
-	 (h2 (the fixnum (1+ (the fixnum (rem sxhash
-					      (the fixnum (- len 2))))))))
+	 (h2 (the fixnum (1+ (the fixnum
+				  (values (rem sxhash
+					       (the fixnum (- len 2)))))))))
     (declare (simple-vector vec)
 	     (type (simple-array (unsigned-byte 8)) hash)
 	     (fixnum len sxhash h2))
@@ -345,8 +346,8 @@
     `(let* ((,vec (package-hashtable-table ,table))
 	    (,hash (package-hashtable-hash ,table))
 	    (,len (length ,vec))
-	    (,h2 (1+ (the index (rem (the index ,sxhash)
-				      (the index (- ,len 2)))))))
+	    (,h2 (1+ (the index (values (rem (the index ,sxhash)
+					     (the index (- ,len 2))))))))
        (declare (type (simple-array (unsigned-byte 8) (*)) ,hash)
 		(simple-vector ,vec)
 		(type index ,len ,h2))
-- 
GitLab