1.0.15.10: ASSOC and MEMBER were broken for :KEY #'IDENTITY

[sbcl.git] / tests / list.pure.lisp

diff --git a/tests/list.pure.lisp b/tests/list.pure.lisp
index 8f251d4..97f6eb7 100644 (file)
--- a/tests/list.pure.lisp
+++ b/tests/list.pure.lisp
@@ -157,6 +157,8 @@
   (let ((x-numbers '(1 2))
         (fun (car (list 'member))))
     (test x-numbers (member 1 numbers))
+    (test x-numbers (member 1 numbers :key 'identity))
+    (test x-numbers (member 1 numbers :key #'identity))
     (test (cdr x-numbers) (member 2 numbers))
     (test nil (member 1.0 numbers ))
 
@@ -186,19 +188,21 @@
                   (assert (equal ',expected (let ((numbers ',numbers)
                                                   (tricky ',tricky))
                                               (funcall fun ,@(cdr form)))))
-                 (assert (equal ',expected (funcall (lambda ()
-                                                      (declare (optimize speed))
-                                                      (let ((numbers ',numbers)
-                                                            (tricky ',tricky))
-                                                        ,form)))))
-                 (assert (equal ',expected (funcall (lambda ()
-                                                      (declare (optimize space))
-                                                      (let ((numbers ',numbers)
-                                                            (tricky ',tricky))
+                  (assert (equal ',expected (funcall (lambda ()
+                                                       (declare (optimize speed))
+                                                       (let ((numbers ',numbers)
+                                                             (tricky ',tricky))
+                                                         ,form)))))
+                  (assert (equal ',expected (funcall (lambda ()
+                                                       (declare (optimize space))
+                                                       (let ((numbers ',numbers)
+                                                             (tricky ',tricky))
                                                         ,form)))))))))
   (let ((fun (car (list 'assoc))))
     (test (1 a) (assoc 1 numbers))
     (test (2 b) (assoc 2 numbers))
+    (test (1 a) (assoc 1 numbers :key 'identity))
+    (test (2 b) (assoc 2 numbers :key #'identity))
     (test nil (assoc 1.0 numbers))
 
     (test (1 a) (assoc 1.0 numbers :test #'=))
@@ -221,3 +225,18 @@
     ;; Bug reported by Paul Dietz: ASSOC should ignore NIL elements in a
     ;; alist
     (test (nil . c) (assoc nil tricky :test #'eq))))
+
+;;; bug reported by Dan Corkill: *PRINT-CASE* affected the compiler transforms
+;;; for ASSOC & MEMBER
+(let ((*print-case* :downcase))
+  (assert (eql 2 (cdr (funcall (compile nil '(lambda (i l) (assoc i l)))
+                               :b '((:a . 1) (:b . 2))))))
+  (assert (equal '(3 4 5) (funcall (compile nil '(lambda (i l) (member i l)))
+                                   3 '(1 2 3 4 5)))))
+
+;;; bad bounding index pair to SUBSEQ on a list
+(let ((list (list 0 1 2 3 4 5)))
+  (multiple-value-bind (res err) (ignore-errors (subseq list 4 2))
+    (assert (not res))
+    (assert (typep err 'sb-kernel:bounding-indices-bad-error))))
+