@@ -14,12 +14,12 @@

                #:cl-containers

                #:closer-mop

                #:iterate

-               #:fwoar-lisputils/patmatch

+               (:feature (:not (:or :ecl :abcl))

+                         #:fwoar-lisputils/patmatch)

                #:fwoar-lisputils/string-utils

                #:plump

                #:positional-lambda

-               (:feature (:not (:or :ecl :abcl))

-                         #:fwoar-lisputils/implementation-dependent))

+               #:fwoar-lisputils/lexical-compare)

   :components ((:file "package")

                (:file "fwoar-lisputils")

                (:file "clos-helpers")

@@ -33,16 +33,15 @@

                (:file "glambda")

                (:file "misc")))

-(defsystem :fwoar-lisputils/implementation-dependent

+(defsystem :fwoar-lisputils/lexical-compare

   :description "Utilities that don't work on every system"

   :author "fiddlerwoaroof <fiddlerwoaroof@gmail.com"

   :license "MIT"

   :serial t

-  :depends-on (#:serapeum

-               #:should-test)

-  :components ((:file "lexical-compare" :if-feature (:not (:or :ecl :abcl)))))

+  :depends-on ()

+  :components ((:file "lexical-compare")))

-(defsystem :fwoar-lisputils/patmatch 

+(defsystem :fwoar-lisputils/patmatch

   :description ""

   :author "Ed L <edward@elangley.org>"

   :license "MIT"

@@ -38,6 +38,7 @@

   (:method ((a string) (b string))

     (string= a b)))

+#+(or)

 (st:deftest test-parse-mixed-string ()

   (st:should be equal

              (list)

@@ -64,10 +65,14 @@

     (apply 'apply fun args)))

 (defun lexi-compare (a b &optional (elem-compare 'part<))

-  (apply-when elem-compare

-              (car

-               (serapeum:drop-while (serapeum:op (apply 'part= _1))

-                                    (mapcar 'list a b)))))

+  (let* ((mismatch-pos (mismatch a b :test 'part=))

+         (a-tail (when mismatch-pos (nthcdr mismatch-pos a)))

+         (b-tail (when mismatch-pos (nthcdr mismatch-pos b))))

+    (or (when (and a-tail b-tail)

+          (funcall elem-compare

+                   (car a-tail)

+                   (car b-tail)))

+        (null a-tail))))

 (defun natural-sort-strings (a b)

   (lexi-compare (parse-mixed-string a)

@@ -18,8 +18,6 @@

   (:use #:cl #:alexandria)

   (:nicknames #:fw.lu)

   (:shadow #:with)

-  (:import-from #:fwoar.anonymous-gf #:glambda)

-  (:import-from #:patmatch #:let-pat*)

   (:export #:lambda-if #:lambda-cond #:alambda #:rollup-list

            #:ensure-mapping #:alist-string-hash-table #:make-pairs

            #:copy-slots #:transform-alist #:%json-pair-transform

@@ -29,8 +27,8 @@

            #:neither-null #:m-lambda #:sets #:defparameters #:setfs

            #:prog1-let #:prog1-bind #:if-let* #:with #:aconsf #:pick

            #:vector-destructuring-bind #:with-accessors* #:skip-values

-           #:limit-values #:substitute-values #:op #:pick/r

-           #:pick-error #:twice #:glambda #:default-unless

+           #:limit-values #:substitute-values #:pick/r

+           #:pick-error #:twice #:default-unless

            #:transform-first-value #:may #:defun-ct

            #:define-cluser-entrypoint #:new #:make-constructor #:dive

            #:empty-hash-table-like #:v-assoc #:defclass+))