Changeset 12516 for trunk/abcl/src/org/armedbear/lisp/find.lisp

Timestamp:

03/03/10 21:05:41 (11 years ago)

Author:

astalla

Message:

Support for user-extensible sequences, adapted from SBCL.

File:

• trunk/abcl/src/org/armedbear/lisp/find.lisp (modified) (7 diffs)

trunk/abcl/src/org/armedbear/lisp/find.lisp

@@ -31 +31 @@
 
 (in-package #:system)
+
+(require "EXTENSIBLE-SEQUENCES-BASE")
 
 ;;; From CMUCL.
@@ -143 +145 @@
 
 
-(defun position (item sequence &key from-end (test #'eql) test-not (start 0)
-                      end key)
-  (if (listp sequence)
-      (list-position* item sequence from-end test test-not start end key)
-      (vector-position* item sequence from-end test test-not start end key)))
-
+(defun position (item sequence &rest args &key from-end (test #'eql) test-not
+     (start 0) end key)
+  (sequence::seq-dispatch sequence
+    (list-position* item sequence from-end test test-not start end key)
+    (vector-position* item sequence from-end test test-not start end key)
+    (apply #'sequence:position item sequence args)))
 
 (defun list-position* (item sequence from-end test test-not start end key)
@@ -168 +170 @@
   `(list-locater-if ,test ,sequence :position))
 
-(defun position-if (test sequence &key from-end (start 0) key end)
-  (declare (type fixnum start))
-  (let ((end (or end (length sequence))))
-    (declare (type fixnum end))
-    (if (listp sequence)
-        (list-position-if test sequence)
-        (vector-position-if test sequence))))
+(defun position-if (test sequence &rest args &key from-end (start 0) key end)
+  (declare (type fixnum start))
+  (let ((end (or end (length sequence))))
+    (declare (type fixnum end))
+    (sequence::seq-dispatch sequence
+      (list-position-if test sequence)
+      (vector-position-if test sequence)
+      (apply #'sequence:position-if test sequence args))))
 
 (defmacro vector-position-if-not (test sequence)
@@ -182 +185 @@
   `(list-locater-if-not ,test ,sequence :position))
 
-(defun position-if-not (test sequence &key from-end (start 0) key end)
-  (declare (type fixnum start))
-  (let ((end (or end (length sequence))))
-    (declare (type fixnum end))
-    (if (listp sequence)
-        (list-position-if-not test sequence)
-        (vector-position-if-not test sequence))))
+(defun position-if-not (test sequence &rest args &key from-end (start 0) key end)
+  (declare (type fixnum start))
+  (let ((end (or end (length sequence))))
+    (declare (type fixnum end))
+    (sequence::seq-dispatch sequence
+      (list-position-if-not test sequence)
+      (vector-position-if-not test sequence)
+      (apply #'sequence:position-if-not test sequence args))))
 
 (defmacro vector-find (item sequence)
@@ -208 +212 @@
   (vector-find item sequence))
 
-(defun find (item sequence &key from-end (test #'eql) test-not (start 0)
-                  end key)
+(defun find (item sequence &rest args &key from-end (test #'eql) test-not
+       (start 0) end key)
   (let ((end (check-sequence-bounds sequence start end)))
-    (if (listp sequence)
-        (list-find* item sequence from-end test test-not start end key)
-        (vector-find* item sequence from-end test test-not start end key))))
+    (sequence::seq-dispatch sequence
+      (list-find* item sequence from-end test test-not start end key)
+      (vector-find* item sequence from-end test test-not start end key)
+      (apply #'sequence:find item sequence args))))
 
 (defmacro vector-find-if (test sequence)
@@ -221 +226 @@
   `(list-locater-if ,test ,sequence :element))
 
-(defun find-if (test sequence &key from-end (start 0) end key)
-  (let ((end (or end (length sequence))))
-    (declare (type fixnum end))
-    (if (listp sequence)
-        (list-find-if test sequence)
-        (vector-find-if test sequence))))
+(defun find-if (test sequence &rest args &key from-end (start 0) end key)
+  (let ((end (or end (length sequence))))
+    (declare (type fixnum end))
+    (sequence::seq-dispatch sequence
+      (list-find-if test sequence)
+      (vector-find-if test sequence)
+      (apply #'sequence:find-if test sequence args))))
 
 (defmacro vector-find-if-not (test sequence)
@@ -234 +240 @@
   `(list-locater-if-not ,test ,sequence :element))
 
-(defun find-if-not (test sequence &key from-end (start 0) end key)
-  (let ((end (or end (length sequence))))
-    (declare (type fixnum end))
-    (if (listp sequence)
-        (list-find-if-not test sequence)
-        (vector-find-if-not test sequence))))
+(defun find-if-not (test sequence &rest args &key from-end (start 0) end key)
+  (let ((end (or end (length sequence))))
+    (declare (type fixnum end))
+    (sequence::seq-dispatch sequence
+      (list-find-if-not test sequence)
+      (vector-find-if-not test sequence)
+      (apply #'sequence:find-if-not test sequence args))))