Changeset 12516 for trunk/abcl/src/org/armedbear/lisp/replace.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/replace.lisp (modified) (3 diffs)

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

@@ -34 +34 @@
 (in-package #:system)
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
+(require "EXTENSIBLE-SEQUENCES-BASE")
+
+#|(eval-when (:compile-toplevel :load-toplevel :execute)
   (defmacro seq-dispatch (sequence list-form array-form)
     `(if (listp ,sequence)
          ,list-form
-         ,array-form)))
+         ,array-form)))|#
 
 (eval-when (:compile-toplevel :execute)
@@ -146 +148 @@
   (mumble-replace-from-mumble))
 
-(defun %replace (target-sequence source-sequence target-start target-end source-start source-end)
-  (declare (type (integer 0 #.most-positive-fixnum) target-start target-end source-start source-end))
-  (seq-dispatch target-sequence
-                (seq-dispatch source-sequence
-                              (list-replace-from-list)
-                              (list-replace-from-mumble))
-                (seq-dispatch source-sequence
-                              (mumble-replace-from-list)
-                              (mumble-replace-from-mumble))))
-
 ;;; REPLACE cannot default end arguments to the length of sequence since it
 ;;; is not an error to supply nil for their values.  We must test for ends
 ;;; being nil in the body of the function.
-(defun replace (target-sequence source-sequence &key
+(defun replace (target-sequence source-sequence &rest args &key
                                 ((:start1 target-start) 0)
                                 ((:end1 target-end))
@@ -168 +160 @@
   (let ((target-end (or target-end (length target-sequence)))
   (source-end (or source-end (length source-sequence))))
-    (%replace target-sequence source-sequence target-start target-end source-start source-end)))
+    (declare (type (integer 0 #.most-positive-fixnum) target-start target-end source-start source-end))
+    (sequence::seq-dispatch target-sequence
+      (sequence::seq-dispatch source-sequence
+        (list-replace-from-list)
+  (list-replace-from-mumble)
+  (apply #'sequence:replace target-sequence source-sequence args))
+      (sequence::seq-dispatch source-sequence
+        (mumble-replace-from-list)
+  (mumble-replace-from-mumble)
+  (apply #'sequence:replace target-sequence source-sequence args))
+      (apply #'sequence:replace target-sequence source-sequence args))))