From cf34ff72e358171917a985926f119c7c116da5c8 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Thu, 5 Apr 2012 14:37:56 -0700 Subject: [PATCH] Revert "ascii: adding title case." This reverts commit 66ecd199d8ceb208a557d8bce4af3cd2f818145f. --- basis/ascii/ascii-docs.factor | 9 --------- basis/ascii/ascii-tests.factor | 5 +---- basis/ascii/ascii.factor | 8 ++------ 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/basis/ascii/ascii-docs.factor b/basis/ascii/ascii-docs.factor index faec03b06b..54e66fea8a 100644 --- a/basis/ascii/ascii-docs.factor +++ b/basis/ascii/ascii-docs.factor @@ -57,14 +57,6 @@ HELP: >upper { $values { "str" "a string" } { "upper" "a string" } } { $description "Converts an ASCII string to upper case." } ; -HELP: >title -{ $values { "string" "a string" } { "title" "a string" } } -{ $description "Converts a string to title case." } ; - -HELP: >words -{ $values { "str" "a string" } { "words" "an array of strings" } } -{ $description "Divides the string up into words." } ; - ARTICLE: "ascii" "ASCII" "The " { $vocab-link "ascii" } " vocabulary implements support for the legacy ASCII character set. Most applications should use " { $link "unicode" } " instead." $nl @@ -85,7 +77,6 @@ $nl ch>upper >lower >upper - >title } ; ABOUT: "ascii" diff --git a/basis/ascii/ascii-tests.factor b/basis/ascii/ascii-tests.factor index d46388d2d3..8551ba53ef 100644 --- a/basis/ascii/ascii-tests.factor +++ b/basis/ascii/ascii-tests.factor @@ -1,5 +1,4 @@ -USING: ascii tools.test sequences kernel math strings ; - +USING: ascii tools.test sequences kernel math ; IN: ascii.tests [ t ] [ CHAR: a letter? ] unit-test @@ -18,5 +17,3 @@ IN: ascii.tests [ "HELLO HOW ARE YOU?" ] [ "hellO hOw arE YOU?" >upper ] unit-test [ "i'm good thx bai" ] [ "I'm Good THX bai" >lower ] unit-test -[ "Hello How Are You?" ] [ "hEllo how ARE yOU?" >title ] unit-test -[ { " " "Hello" " " "World" } ] [ " Hello World" >words [ >string ] map ] unit-test diff --git a/basis/ascii/ascii.factor b/basis/ascii/ascii.factor index 4070944ceb..6f89dea6d9 100644 --- a/basis/ascii/ascii.factor +++ b/basis/ascii/ascii.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2005, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: combinators.short-circuit hints kernel math math.order -sequences splitting.monotonic strings ; +USING: kernel math math.order sequences strings +combinators.short-circuit hints ; IN: ascii : ascii? ( ch -- ? ) 0 127 between? ; inline @@ -18,10 +18,6 @@ IN: ascii : >lower ( str -- lower ) [ ch>lower ] map ; : ch>upper ( ch -- upper ) dup letter? [ 0x20 - ] when ; inline : >upper ( str -- upper ) [ ch>upper ] map ; -: >words ( str -- words ) [ [ blank? ] bi@ = ] slice monotonic-slice ; -: capitalize ( str -- title ) unclip [ >lower ] [ ch>upper ] bi* prefix ; -: >title ( str -- title ) >words [ capitalize ] map concat ; HINTS: >lower string ; HINTS: >upper string ; -