From aa4e65ef6fd8c5583a99ed7b4d0edc0ec94a6213 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Sun, 2 Oct 2011 09:24:51 -0700
Subject: [PATCH] sorting.human: rename <hybrid> to <alphanum>. Fixes #226.
---
basis/sorting/human/human.factor | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/basis/sorting/human/human.factor b/basis/sorting/human/human.factor
index ceef6f2a15..3789d2a771 100644
--- a/basis/sorting/human/human.factor
+++ b/basis/sorting/human/human.factor
@@ -25,17 +25,17 @@ IN: sorting.human
[ digit? ] [ string>number ] find-sequences ;
! For comparing integers or sequences
-TUPLE: hybrid obj ;
+TUPLE: alphanum obj ;
-: <hybrid> ( obj -- hybrid )
- hybrid new
+: <alphanum> ( obj -- hybrid )
+ alphanum new
swap >>obj ; inline
-: <hybrid-insensitive> ( obj -- hybrid )
- hybrid new
+: <alphanum-insensitive> ( obj -- hybrid )
+ alphanum new
swap dup string? [ w/collation-key ] when >>obj ; inline
-M: hybrid <=>
+M: alphanum <=>
[ obj>> ] bi@
2dup [ integer? ] bi@ xor [
drop integer? +lt+ +gt+ ?
@@ -43,5 +43,5 @@ M: hybrid <=>
<=>
] if ;
-<< "human" [ find-numbers [ <hybrid> ] map ] define-sorting >>
-<< "humani" [ find-numbers [ <hybrid-insensitive> ] map ] define-sorting >>
+<< "human" [ find-numbers [ <alphanum> ] map ] define-sorting >>
+<< "humani" [ find-numbers [ <alphanum-insensitive> ] map ] define-sorting >>