0.6.12.49:

[sbcl.git] / src / compiler / seqtran.lisp

diff --git a/src/compiler/seqtran.lisp b/src/compiler/seqtran.lisp
index 2a405a4..05066fa 100644 (file)
--- a/src/compiler/seqtran.lisp
+++ b/src/compiler/seqtran.lisp
@@ -249,7 +249,7 @@
                     `(if (funcall test e ',(car els))
                          ',els
                          ,(frob (cdr els)))
-                    'nil)))
+                    nil)))
        (frob val)))))
 
 ;;; FIXME: Rewrite this so that these definitions of DELETE, ASSOC, and MEMBER
@@ -279,8 +279,8 @@
       (cond (test
             (unless (continuation-function-is test '(eq))
               (give-up-ir1-transform)))
-           ((types-intersect (continuation-type item)
-                             (specifier-type 'number))
+           ((types-equal-or-intersect (continuation-type item)
+                                      (specifier-type 'number))
             (give-up-ir1-transform "Item might be a number.")))
       `(,eq-fun item list))))
 
@@ -324,27 +324,6 @@
 ;;; applied to characters
 (defparameter *char=-functions* '(eql equal char=))
 
-(deftransform search ((string1 string2 &key (start1 0) end1 (start2 0) end2
-                              test)
-                     (simple-string simple-string &rest t))
-  (unless (or (not test)
-             (continuation-function-is test *char=-functions*))
-    (give-up-ir1-transform))
-  '(sb!impl::%sp-string-search string1 start1 (or end1 (length string1))
-                              string2 start2 (or end2 (length string2))))
-
-(deftransform position ((item sequence &key from-end test (start 0) end)
-                       (t simple-string &rest t))
-  (unless (or (not test)
-             (continuation-function-is test *char=-functions*))
-    (give-up-ir1-transform))
-  `(and (typep item 'character)
-       (,(if (constant-value-or-lose from-end)
-             'sb!impl::%sp-reverse-find-character
-             'sb!impl::%sp-find-character)
-        sequence start (or end (length sequence))
-        item)))
-
 (deftransform find ((item sequence &key from-end (test #'eql) (start 0) end)
                    (t simple-string &rest t))
   `(if (position item sequence
@@ -620,7 +599,7 @@
                                                     (- start2 start1))))))
                    index)
                   (t nil))
-            ,(if equalp 'end1 'nil))))))
+            ,(if equalp 'end1 nil))))))
 
 (dolist (stuff '((string=* not)
                 (string/=* identity)))