X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsort.lisp;h=076a9b9e3f65c71b605786d0abe74164583ccaee;hb=1dc38285834db2d374a156a4f68b19096341deb3;hp=3087025d1f241555f15a9bfec1e9c54f8b587b62;hpb=60ce532301c8f4b7ed289d049717ee16639bc4d4;p=sbcl.git diff --git a/src/code/sort.lisp b/src/code/sort.lisp index 3087025..076a9b9 100644 --- a/src/code/sort.lisp +++ b/src/code/sort.lisp @@ -19,57 +19,45 @@ ;;; allows the compiler to make enough optimizations that it might be ;;; worth the (large) cost in space. (declaim (maybe-inline sort)) -(defun sort (sequence predicate &key key) +(defun sort (sequence predicate &rest args &key key) #!+sb-doc "Destructively sort SEQUENCE. PREDICATE should return non-NIL if ARG1 is to precede ARG2." + (declare (truly-dynamic-extent args)) (let ((predicate-fun (%coerce-callable-to-fun predicate))) - (typecase sequence - (list - (stable-sort-list sequence - predicate-fun - (if key (%coerce-callable-to-fun key) #'identity))) - (vector - (let ((key-fun-or-nil (and key (%coerce-callable-to-fun key)))) - (with-array-data ((vector (the vector sequence)) - (start 0) - (end (length sequence))) - (sort-vector vector start end predicate-fun key-fun-or-nil))) - sequence) - (t - (error 'simple-type-error - :datum sequence - :expected-type 'sequence - :format-control "~S is not a sequence." - :format-arguments (list sequence)))))) + (seq-dispatch sequence + (stable-sort-list sequence + predicate-fun + (if key (%coerce-callable-to-fun key) #'identity)) + (let ((key-fun-or-nil (and key (%coerce-callable-to-fun key)))) + (with-array-data ((vector (the vector sequence)) + (start) + (end) + :check-fill-pointer t) + (sort-vector vector start end predicate-fun key-fun-or-nil)) + sequence) + (apply #'sb!sequence:sort sequence predicate args)))) ;;;; stable sorting - -(defun stable-sort (sequence predicate &key key) +(defun stable-sort (sequence predicate &rest args &key key) #!+sb-doc "Destructively sort SEQUENCE. PREDICATE should return non-NIL if ARG1 is to precede ARG2." + (declare (truly-dynamic-extent args)) (let ((predicate-fun (%coerce-callable-to-fun predicate))) - (typecase sequence - (simple-vector - (stable-sort-simple-vector sequence - predicate-fun - (and key (%coerce-callable-to-fun key)))) - (list - (stable-sort-list sequence - predicate-fun - (if key (%coerce-callable-to-fun key) #'identity))) - (vector - (stable-sort-vector sequence - predicate-fun - (and key (%coerce-callable-to-fun key)))) - (t - (error 'simple-type-error - :datum sequence - :expected-type 'sequence - :format-control "~S is not a sequence." - :format-arguments (list sequence)))))) - + (seq-dispatch sequence + (stable-sort-list sequence + predicate-fun + (if key (%coerce-callable-to-fun key) #'identity)) + (if (typep sequence 'simple-vector) + (stable-sort-simple-vector sequence + predicate-fun + (and key (%coerce-callable-to-fun key))) + (stable-sort-vector sequence + predicate-fun + (and key (%coerce-callable-to-fun key)))) + (apply #'sb!sequence:stable-sort sequence predicate args)))) + ;;; FUNCALL-USING-KEY saves us a function call sometimes. (eval-when (:compile-toplevel :execute) (sb!xc:defmacro funcall2-using-key (pred key one two) @@ -250,12 +238,14 @@ (,start-1 0)) ; one n-len subsequence to be merged with the next (declare (fixnum ,vector-len ,n ,temp-len ,unsorted ,start-1) (simple-vector ,temp)) - (if (> ,vector-len ,temp-len) - (setf ,temp (make-array (max ,vector-len - (min most-positive-fixnum - (+ ,temp-len ,temp-len)))) - *merge-sort-temp-vector* ,temp)) - ;; rebind, in case PRED or KEY calls STABLE-SORT + (when (> ,vector-len ,temp-len) + (setf ,temp (make-array (max ,vector-len + (min (truncate array-dimension-limit 2) + (logand most-positive-fixnum (+ ,temp-len ,temp-len))))) + *merge-sort-temp-vector* ,temp)) + ;; Rebind, in case PRED or KEY calls STABLE-SORT. This is also + ;; interrupt safe: we bind before we put any data of our own in + ;; the temp vector. (let ((*merge-sort-temp-vector* (vector))) (loop ;; for each n, we start taking n-runs from the start of the vector @@ -307,11 +297,6 @@ ) ; EVAL-when -;;; temporary vector for stable sorting vectors, allocated for each new thread -(defvar *merge-sort-temp-vector* (make-array 50)) - -(declaim (simple-vector *merge-sort-temp-vector*)) - (defun stable-sort-simple-vector (vector pred key) (declare (type simple-vector vector) (type function pred) @@ -420,8 +405,7 @@ (vector-2 (coerce sequence2 'vector)) (length-1 (length vector-1)) (length-2 (length vector-2)) - (result (make-sequence result-type - (+ length-1 length-2)))) + (result (make-sequence result-type (+ length-1 length-2)))) (declare (vector vector-1 vector-2) (fixnum length-1 length-2)) (if (and (simple-vector-p result) @@ -431,4 +415,17 @@ result predicate key svref) (merge-vectors vector-1 length-1 vector-2 length-2 result predicate key aref)))) + ((and (csubtypep type (specifier-type 'sequence)) + (find-class result-type nil)) + (let* ((vector-1 (coerce sequence1 'vector)) + (vector-2 (coerce sequence2 'vector)) + (length-1 (length vector-1)) + (length-2 (length vector-2)) + (temp (make-array (+ length-1 length-2))) + (result (make-sequence result-type (+ length-1 length-2)))) + (declare (vector vector-1 vector-2) (fixnum length-1 length-2)) + (merge-vectors vector-1 length-1 vector-2 length-2 + temp predicate key aref) + (replace result temp) + result)) (t (bad-sequence-type-error result-type)))))