Changeset 900

Timestamp:

Feb 15, 2005, 6:14:26 PM (20 years ago)

Author:

bryan

Message:

%hash-table-equalp uses :test arg instead of equalp.

spec says: equalp descends hash-tables by first comparing the count of
entries and the :test function; if those are the same, it compares the
keys of the tables using the :test function and then the values of the
matching keys using equalp recursively.

File:

• trunk/ccl/level-0/l0-hash.lisp (modified) (1 diff)

trunk/ccl/level-0/l0-hash.lisp

@@ -1607 +1607 @@
 (defun %hash-table-equalp (x y)
   ; X and Y are both hash tables
-  (let* ((test (hash-table-test x)))
-    (and (eq test
-             (hash-table-test y))
-         (eql (hash-table-count x)
-              (hash-table-count y))
-         (block nil
-           (let* ((default (cons nil nil))
-                  (foo #'(lambda (k v)
-                           (let ((y-value (gethash k y default)))
-                             (unless (and (neq default y-value)
-                                          (funcall test v y-value))
-                               (return nil))))))
-             (declare (dynamic-extent foo default))
-             (maphash foo x))
-           t))))
+  (and (eq (hash-table-test x)
+           (hash-table-test y))
+       (eql (hash-table-count x)
+            (hash-table-count y))
+       (block nil
+         (let* ((default (cons nil nil))
+                (foo #'(lambda (k v)
+                         (let ((y-value (gethash k y default)))
+                           (unless (and (neq default y-value)
+                                        (equalp v y-value))
+                             (return nil))))))
+           (declare (dynamic-extent foo default))
+           (maphash foo x))
+         t)))
 
 (defun sxhash (s-expr)