diff --git a/collects/embedded-gui/private/alignment.ss b/collects/embedded-gui/private/alignment.ss index 7d265aaa..439b9ad9 100644 --- a/collects/embedded-gui/private/alignment.ss +++ b/collects/embedded-gui/private/alignment.ss @@ -87,9 +87,8 @@ neck and it is the most readable solution. (let-values ([(total-unstretchable-size stretchable-sizes) (get-onsizes rects)]) (let-values ([(extra-div extra-mod) - (get-extra/rect - (- onsize total-unstretchable-size) - (quicksort stretchable-sizes >))]) + (get-extra/rect (- onsize total-unstretchable-size) + (sort stretchable-sizes >))]) (allocate-evenly/position extra-div extra-mod offsize rects)))) #;(((listof rect?)) . ->* . (nonnegative? (listof nonnegative?))) @@ -147,4 +146,4 @@ neck and it is the most readable solution. (begin (set! n (sub1 n)) 1)))) - ) \ No newline at end of file + ) diff --git a/collects/framework/private/finder.ss b/collects/framework/private/finder.ss index b6645dfd..1628fab9 100644 --- a/collects/framework/private/finder.ss +++ b/collects/framework/private/finder.ss @@ -100,7 +100,7 @@ (send name-list clear) (send name-list set - (quicksort + (sort (let ([no-periods? (not (preferences:get 'framework:show-periods-in-dirlist))]) diff --git a/collects/framework/private/group.ss b/collects/framework/private/group.ss index fd96a4ea..32ac7c32 100644 --- a/collects/framework/private/group.ss +++ b/collects/framework/private/group.ss @@ -81,7 +81,7 @@ default-name) label)))] [sorted/visible-frames - (quicksort + (sort (filter (λ (x) (send (frame-frame x) is-shown?)) frames) (λ (f1 f2) (string-ci<=? (get-name (frame-frame f1)) @@ -254,7 +254,7 @@ (define (choose-a-frame parent) (letrec-values ([(sorted-frames) - (quicksort + (sort (send (get-the-frame-group) get-frames) (λ (x y) (string-ci<=? (send x get-label) (send y get-label))))] [(d) (make-object dialog% (string-constant bring-frame-to-front) parent 400 600)] diff --git a/collects/framework/private/handler.ss b/collects/framework/private/handler.ss index 4b7657a2..8a08aa0b 100644 --- a/collects/framework/private/handler.ss +++ b/collects/framework/private/handler.ss @@ -303,9 +303,9 @@ (for-each (λ (item) (send hl delete-item item)) (send hl get-items)) (for-each (λ (item) (add-recent-item item)) (if (eq? (preferences:get 'framework:recently-opened-sort-by) 'name) - (quicksort recent-list-items - (λ (x y) (string<=? (path->string (car x)) - (path->string (car y))))) + (sort recent-list-items + (λ (x y) (string<=? (path->string (car x)) + (path->string (car y))))) recent-list-items)) (send ed end-edit-sequence))) diff --git a/collects/framework/private/scheme.ss b/collects/framework/private/scheme.ss index be8f7990..a92d0367 100644 --- a/collects/framework/private/scheme.ss +++ b/collects/framework/private/scheme.ss @@ -1222,7 +1222,7 @@ (letrec ([all-keywords (hash-table-map hash-table list)] [pick-out (λ (wanted in out) (cond - [(null? in) (quicksort out string<=?)] + [(null? in) (sort out string<=?)] [else (if (eq? wanted (cadr (car in))) (pick-out wanted (cdr in) (cons (symbol->string (car (car in))) out)) (pick-out wanted (cdr in) out))]))]) diff --git a/collects/hierlist/hierlist-unit.ss b/collects/hierlist/hierlist-unit.ss index 267dfe2d..a2dccfa3 100644 --- a/collects/hierlist/hierlist-unit.ss +++ b/collects/hierlist/hierlist-unit.ss @@ -7,7 +7,7 @@ (lib "include-bitmap.ss" "mrlib") "hierlist-sig.ss") - (require (lib "list.ss") + (require (rename (lib "list.ss") sort* sort) (lib "etc.ss")) (define turn-up (include-bitmap "../icons/turn-up.png" 'png)) @@ -395,9 +395,10 @@ (delete (if (zero? s) s (sub1 s)) (if (zero? s) (add1 e) e)))] [else (loop (add1 pos) (cdr l) (cons (car l) others))])))] [sort (opt-lambda (less-than? [recur? #t]) - (let ([l (mergesort children (lambda (a b) - (less-than? (send a get-item) - (send b get-item))))]) + (let ([l (sort* children + (lambda (a b) + (less-than? (send a get-item) + (send b get-item))))]) (begin-edit-sequence) (when recur? (for-each (lambda (child) diff --git a/collects/mred/private/filedialog.ss b/collects/mred/private/filedialog.ss index ba3667a2..ef56014f 100644 --- a/collects/mred/private/filedialog.ss +++ b/collects/mred/private/filedialog.ss @@ -212,8 +212,8 @@ (let loop ([l l][ds null][fs null]) (cond [(null? l) (values (cons (string->path "..") - (quicksort ds path-string-localestring (car l)) 0) #\.)) (loop (cdr l) ds fs)] diff --git a/collects/mred/private/fontdialog.ss b/collects/mred/private/fontdialog.ss index d2aa0360..79c10808 100644 --- a/collects/mred/private/fontdialog.ss +++ b/collects/mred/private/fontdialog.ss @@ -50,19 +50,17 @@ ;; Sort space-starting first (for Xft), and ;; otherwise push names that start with an ;; ASCII non-letter/digit/hyphen to the end - (quicksort l (lambda (a b) - (let ([a-sp? (char=? #\space (string-ref a 0))] - [b-sp? (char=? #\space (string-ref b 0))] - [a-ugly? (ugly? a)] - [b-ugly? (ugly? b)]) - (cond - [(eq? a-sp? b-sp?) - (cond - [(eq? a-ugly? b-ugly?) - (string-locale-ci))]) + (sort stretchable-sizes >))]) (allocate-evenly/position extra-div extra-mod offsize rects)))) ;; get-onsizes (((listof rect?)) . ->* . (nonnegative? (listof nonnegative?))) diff --git a/collects/mrlib/syntax-browser.ss b/collects/mrlib/syntax-browser.ss index 141f1795..5afa0ebb 100644 --- a/collects/mrlib/syntax-browser.ss +++ b/collects/mrlib/syntax-browser.ss @@ -273,14 +273,13 @@ needed to really make this work: (set! details-shown? #t))) (let ([ranges - (quicksort - (apply append + (sort + (apply append (hash-table-map range-ht (λ (k vs) - (map - (λ (v) (make-range k (car v) (cdr v))) - vs)))) + (map (λ (v) (make-range k (car v) (cdr v))) + vs)))) (λ (x y) (>= (- (range-end x) (range-start x)) (- (range-end y) (range-start y)))))]) diff --git a/collects/tests/mred/png.ss b/collects/tests/mred/png.ss index 0011f121..f232e6d4 100644 --- a/collects/tests/mred/png.ss +++ b/collects/tests/mred/png.ss @@ -11,10 +11,9 @@ "It should contain the PNG test files (including GIFs for comparisons)."))) (define l (map (lambda (f) (build-path png-suite f)) - (quicksort - (filter (lambda (x) (regexp-match #rx"^[^x].*[.]png$" x)) - (directory-list png-suite)) - stringgif f) (regexp-replace #rx"[.]png$" f ".gif"))