From 0dddf931d8c9ea8ae463a773f02c90428c0afede Mon Sep 17 00:00:00 2001
From: Eli Barzilay <eli@racket-lang.org>
Date: Sat, 1 Apr 2006 12:24:15 +0000
Subject: [PATCH] {quick,merge}sort -> sort

svn: r2569

original commit: 16f01a1109691d2fa4844b9411410f4794cf0dc1
---
 collects/mzlib/private/sigutil.ss | 30 ++++++++++++++----------------
 collects/mzlib/serialize.ss       | 11 ++++-------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/collects/mzlib/private/sigutil.ss b/collects/mzlib/private/sigutil.ss
index 7330ab7..33021b2 100644
--- a/collects/mzlib/private/sigutil.ss
+++ b/collects/mzlib/private/sigutil.ss
@@ -334,22 +334,20 @@
   (define sort-signature-elems
     (lambda (elems)
       (map car
-	   (quicksort (map
-		       (lambda (ip)
-			 (let ([i (car ip)])
-			   (cons ip (symbol->string (if (symbol? i) 
-							i 
-							(signature-name i))))))
-		       elems)
-		      ;; Less-than; put subs at front
-		      (lambda (a b)
-			(if (symbol? (caar a))
-			    (if (symbol? (caar b))
-				(string<? (cdr a) (cdr b))
-				#f)
-			    (if (symbol? (caar b))
-				#t
-				(string<? (cdr a) (cdr b)))))))))
+	   (sort (map (lambda (ip)
+                        (let ([i (car ip)])
+                          (cons ip (symbol->string
+                                    (if (symbol? i) i (signature-name i))))))
+                      elems)
+                 ;; Less-than; put subs at front
+                 (lambda (a b)
+                   (if (symbol? (caar a))
+                     (if (symbol? (caar b))
+                       (string<? (cdr a) (cdr b))
+                       #f)
+                     (if (symbol? (caar b))
+                       #t
+                       (string<? (cdr a) (cdr b)))))))))
   
   (define flatten-signature
     (lambda (id sig main-ctx)
diff --git a/collects/mzlib/serialize.ss b/collects/mzlib/serialize.ss
index 3d39d6d..b0f61f7 100644
--- a/collects/mzlib/serialize.ss
+++ b/collects/mzlib/serialize.ss
@@ -675,10 +675,8 @@
       (hash-table-for-each cycle
 			   (lambda (k v)
 			     (hash-table-put! share k v)))
-      (let ([ordered (map car
-			  (mergesort (hash-table-map share cons)
-				     (lambda (a b)
-				       (< (cdr a) (cdr b)))))])
+      (let ([ordered (map car (sort (hash-table-map share cons)
+                                    (lambda (a b) (< (cdr a) (cdr b)))))])
 	(let ([serializeds (map (lambda (v)
 				  (if (hash-table-get cycle v (lambda () #f))
 				      ;; Box indicates cycle record allocation
@@ -693,9 +691,8 @@
 			 (cons n
 			       (serialize-one v share #f mod-map mod-map-cache))))]
 	      [main-serialized (serialize-one v share #t mod-map mod-map-cache)]
-	      [mod-map-l (map car
-			      (mergesort (hash-table-map mod-map cons)
-					 (lambda (a b) (< (cdr a) (cdr b)))))])
+	      [mod-map-l (map car (sort (hash-table-map mod-map cons)
+                                        (lambda (a b) (< (cdr a) (cdr b)))))])
 	  (list (hash-table-count mod-map)
 		mod-map-l
 		(length serializeds)