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

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

@@ -34 +34 @@
 (in-package #:system)
 
+(require "EXTENSIBLE-SEQUENCES-BASE")
+
 (defmacro list-reduce (function sequence start end initial-value ivp key)
   (let ((what `(if ,key (funcall ,key (car sequence)) (car sequence))))
@@ -57 +59 @@
 
 
-(defun reduce (function sequence &key from-end (start 0)
+(defun reduce (function sequence &rest args &key from-end (start 0)
                         end (initial-value nil ivp) key)
   (unless end (setq end (length sequence)))
   (if (= end start)
       (if ivp initial-value (funcall function))
-      (if (listp sequence)
+      (sequence::seq-dispatch sequence
           (if from-end
               (list-reduce-from-end function sequence start end initial-value ivp key)
@@ -81 +83 @@
                     value (funcall function
                                    (if from-end element value)
-                                   (if from-end value element))))))))
+                                   (if from-end value element)))))
+    (apply #'sequence:reduce function sequence args))))