diff --git a/core/splitting/splitting-docs.factor b/core/splitting/splitting-docs.factor index 458cb707a6..771343e1f9 100644 --- a/core/splitting/splitting-docs.factor +++ b/core/splitting/splitting-docs.factor @@ -17,8 +17,6 @@ ARTICLE: "sequences-split" "Splitting sequences" split split-when split-when-slice - split* - split*-when } "Splitting a string into lines:" { $subsections string-lines } @@ -67,16 +65,6 @@ HELP: split { $description "Splits " { $snippet "seq" } " at each occurrence of an element of " { $snippet "separators" } " and outputs an array of pieces. The pieces do not include the elements along which the sequence was split." } { $examples { $example "USING: prettyprint splitting ;" "\"hello world-how are you?\" \" -\" split ." "{ \"hello\" \"world\" \"how\" \"are\" \"you?\" }" } } ; -HELP: split*-when -{ $values { "seq" "a sequence" } { "quot" { $quotation "( ... elt -- ... ? )" } } { "pieces" "a new array" } } -{ $description "A variant of " { $link split-when } " that includes the elements along which the sequence was split." } -{ $examples { $example "USING: ascii kernel prettyprint splitting ;" "\"hello,world-how.are:you\" [ letter? not ] split*-when ." "{ \"hello\" \",\" \"world\" \"-\" \"how\" \".\" \"are\" \":\" \"you\" }" } } ; - -HELP: split* -{ $values { "seq" "a sequence" } { "separators" "a sequence" } { "pieces" "a new array" } } -{ $description "A variant of " { $link split } " that includes the elements along which the sequence was split." } -{ $examples { $example "USING: prettyprint splitting ;" "\"hello world-how are you?\" \" -\" split* ." "{ \"hello\" \" \" \"world\" \"-\" \"how\" \" \" \"are\" \" \" \"you?\" }" } } ; - HELP: ?head { $values { "seq" "a sequence" } { "begin" "a sequence" } { "newseq" "a new sequence" } { "?" "a boolean" } } { $description "Tests if " { $snippet "seq" } " starts with " { $snippet "begin" } ". If there is a match, outputs the subrange of " { $snippet "seq" } " excluding " { $snippet "begin" } ", and " { $link t } ". If there is no match, outputs " { $snippet "seq" } " and " { $link f } "." } ; diff --git a/core/splitting/splitting-tests.factor b/core/splitting/splitting-tests.factor index 764bf54d64..06cffb6964 100644 --- a/core/splitting/splitting-tests.factor +++ b/core/splitting/splitting-tests.factor @@ -91,24 +91,6 @@ unit-test [ "" "ABC" ] [ " ABC" [ blank? ] split1-when-slice [ >string ] bi@ ] unit-test [ "a" " bc" ] [ "a bc" [ blank? ] split1-when-slice [ >string ] bi@ ] unit-test -{ { } } [ { } { 0 } split* ] unit-test -{ { { 1 2 3 } } } [ { 1 2 3 } { 0 } split* ] unit-test -{ { { 0 } } } [ { 0 } { 0 } split* ] unit-test -{ { { 0 0 } } } [ { 0 0 } { 0 } split* ] unit-test -{ { { 1 2 } { 0 } { 3 } { 0 0 } } } [ { 1 2 0 3 0 0 } { 0 } split* ] unit-test -{ { "hello" } } [ "hello" " " split* ] unit-test -{ { " " "hello" } } [ " hello" " " split* ] unit-test -{ { "hello" " " "world" } } [ "hello world" " " split* ] unit-test -{ { "hello" " " "world" " " } } [ "hello world " " " split* ] unit-test - -{ { } } [ { } [ 0 > ] split*-when ] unit-test -{ { { 0 } } } [ { 0 } [ 0 > ] split*-when ] unit-test -{ { { 0 0 } } } [ { 0 0 } [ 0 > ] split*-when ] unit-test -{ { { 1 2 } { 0 } { 3 } { 0 0 } } } [ { 1 2 0 3 0 0 } [ 0 > ] split*-when ] unit-test -{ { { 1 } { 2 3 } { 1 } { 4 5 } { 1 } { 6 } } } [ - 1 { 1 2 3 1 4 5 1 6 } [ dupd = ] split*-when nip -] unit-test - { "abarbbarc" } [ "afoobfooc" "foo" "bar" replace ] unit-test diff --git a/core/splitting/splitting.factor b/core/splitting/splitting.factor index eb0d2c5bb0..c75b27263e 100644 --- a/core/splitting/splitting.factor +++ b/core/splitting/splitting.factor @@ -100,35 +100,6 @@ PRIVATE> : split-slice ( seq separators -- pieces ) [ member? ] curry split-when-slice ; inline - - -: split*-when ( ... seq quot: ( ... elt -- ... ? ) -- ... pieces ) - [ 0 ] 2dip [ subseq ] (split*) ; inline - -: split*-when-slice ( ... seq quot: ( ... elt -- ... ? ) -- ... pieces ) - [ 0 ] 2dip [ ] (split*) ; inline - -: split* ( seq separators -- pieces ) - [ member? ] curry split*-when ; inline - -: split*-slice ( seq separators -- pieces ) - [ member? ] curry split*-when-slice ; inline - GENERIC: string-lines ( str -- seq ) M: string string-lines