From 17f6513602bc702551e8b93d6bf7c432875fd910 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 22 May 2008 17:28:15 -0500 Subject: [PATCH] Cleanup --- extra/strings/lib/lib.factor | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/extra/strings/lib/lib.factor b/extra/strings/lib/lib.factor index c6299e6b08..ec4c70f6bf 100644 --- a/extra/strings/lib/lib.factor +++ b/extra/strings/lib/lib.factor @@ -1,10 +1,7 @@ -USING: math arrays sequences kernel random splitting strings unicode.case ; +USING: math math.ranges arrays sequences kernel random splitting +strings unicode.case ; IN: strings.lib -: char>digit ( c -- i ) 48 - ; - -: string>digits ( s -- seq ) [ char>digit ] { } map-as ; - : >Upper ( str -- str ) dup empty? [ unclip ch>upper 1string prepend @@ -14,13 +11,13 @@ IN: strings.lib "-" split [ >Upper ] map "-" join ; : lower-alpha-chars ( -- seq ) - 26 [ CHAR: a + ] map ; + CHAR: a CHAR: z [a,b] ; : upper-alpha-chars ( -- seq ) - 26 [ CHAR: A + ] map ; + CHAR: A CHAR: Z [a,b] ; : numeric-chars ( -- seq ) - 10 [ CHAR: 0 + ] map ; + CHAR: 0 CHAR: 9 [a,b] ; : alpha-chars ( -- seq ) lower-alpha-chars upper-alpha-chars append ;