Fix sort-by

Signed-off-by: James Hamlin <jfhamlin@gmail.com>

Author: jfhamlin

pkg/stdlib/glojure/core.glj

@@ -3106,7 +3106,7 @@
   ([keyfn coll]
    (sort-by keyfn compare coll))
   ([keyfn ^java.util.Comparator comp coll]
-   (sort (fn [x y] (. comp (compare (keyfn x) (keyfn y)))) coll)))
+   (sort (fn [x y] (comp (keyfn x) (keyfn y))) coll)))
 
 (defn dorun
   "When lazy sequences are produced via functions that have side

scripts/rewrite-core/rewrite.clj

@@ -944,6 +944,9 @@
    (sexpr-replace '(. java.util.Arrays (sort a comp))
                   '(github.com$glojurelang$glojure$pkg$lang.SortSlice a comp))
 
+   ;; comparators are simple functions in Glojure
+   (sexpr-replace '(. comp (compare (keyfn x) (keyfn y)))
+                  '(comp (keyfn x) (keyfn y)))
    ]))
 
 (defn rewrite-core [zloc]

test/glojure/test_glojure/sort.glj

@@ -1,5 +1,5 @@
 ;; Tests for sort function
-;; Ensures Glojure behavior matches Clojure
+;; Ensures Glojure behavior matches Clojure as closely as possible
 
 (ns glojure.test-glojure.sort
   (:require [glojure.test :refer :all]
@@ -51,8 +51,7 @@
 
     ;; Sort by string length
     (is (= '("a" "bb" "ccc" "dddd")
-           (sort (fn [a b] (compare (count a) (count b)))
-                 ["ccc" "a" "dddd" "bb"])))
+           (sort-by count ["ccc" "a" "dddd" "bb"])))
 
     ;; Sort maps by a specific key
     (let [data [{:name "John" :age 30}
@@ -202,15 +201,15 @@
     ;; Lists are not comparable
     (is (thrown? go/any (compare '(1 2) '(1 2))))
     (is (thrown? go/any (sort ['(1 2) '(3 4)])))
-    
+
     ;; Maps are not comparable
     (is (thrown? go/any (compare {:a 1} {:b 2})))
     (is (thrown? go/any (sort [{:a 1} {:b 2}])))
-    
+
     ;; Sets are not comparable
     (is (thrown? go/any (compare #{1 2} #{3 4})))
     (is (thrown? go/any (sort [#{1 2} #{3 4}])))
-    
+
     ;; Mixed incompatible types
     (is (thrown? go/any (compare 1 :a)))
     (is (thrown? go/any (compare "string" 'symbol)))
@@ -222,15 +221,15 @@
     (is (= -1 (compare [1 2] [1 3])))
     (is (= 1 (compare [1 3] [1 2])))
     (is (= 0 (compare [1 2 3] [1 2 3])))
-    
+
     ;; Shorter vectors are less than longer vectors with same prefix
     (is (= -1 (compare [1 2] [1 2 3])))
     (is (= 1 (compare [1 2 3] [1 2])))
-    
+
     ;; Nested vectors
     (is (= -1 (compare [[1 2] [3 4]] [[1 2] [3 5]])))
     (is (= 0 (compare [[1 2] [3 4]] [[1 2] [3 4]])))
-    
+
     ;; SubVectors behave like vectors
     (let [v [1 2 3 4 5]
           sv1 (subvec v 1 3)  ; [2 3]
@@ -243,11 +242,11 @@
     ;; No namespace < with namespace
     (is (= -1 (compare 'x 'a/x)))
     (is (= 1 (compare 'a/x 'x)))
-    
+
     ;; Different namespaces
     (is (= -1 (compare 'a/x 'b/x)))
     (is (= 1 (compare 'b/x 'a/x)))
-    
+
     ;; Same namespace, different names
     (is (= -1 (compare 'ns/a 'ns/b)))
     (is (= 1 (compare 'ns/b 'ns/a)))))