Move ch-upper? from unicode.case to ascii

diff --git a/basis/ascii/ascii.factor b/basis/ascii/ascii.factor
index bd1b86b2793347fcf56dfa1923b9b87a4184a508..a1bd87e5daef46313e8764d8e3e95a464fa43b4d 100644 (file)
--- a/basis/ascii/ascii.factor
+++ b/basis/ascii/ascii.factor
@@ -18,6 +18,9 @@ IN: ascii
 : >lower ( str -- lower ) [ ch>lower ] map ;\r
 : ch>upper ( ch -- upper ) dup letter? [ HEX: 20 - ] when ; inline\r
 : >upper ( str -- upper ) [ ch>upper ] map ;\r
+: ch-lower? ( ch -- ? ) dup ch>lower = ;\r
+: ch-upper? ( ch -- ? ) dup ch>upper = ;\r
+\r
 \r
 HINTS: >lower string ;\r
 HINTS: >upper string ;\r

diff --git a/basis/unicode/case/case.factor b/basis/unicode/case/case.factor
index 82ff55fb9f52d97376a020fb356581b6926da430..9726b6dd78f63980d9916f3b18a5b66c48c7b36c 100644 (file)
--- a/basis/unicode/case/case.factor
+++ b/basis/unicode/case/case.factor
@@ -122,10 +122,6 @@ HINTS: >title string ;
 : >case-fold ( string -- fold )
     >upper >lower ;
 
-: ch-lower? ( ch -- ? ) dup ch>lower = ;
-
-: ch-upper? ( ch -- ? ) dup ch>upper = ;
-
 : lower? ( string -- ? ) dup >lower = ;
 
 : upper? ( string -- ? ) dup >upper = ;