From fb8bdfe7e569f64de42a21d62a68af7d5ac0c96a Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 22 Nov 2008 20:00:37 -0600 Subject: [PATCH] rename last-slice1 to slice1-last --- basis/cocoa/dialogs/dialogs.factor | 2 +- basis/farkup/farkup.factor | 2 +- basis/smtp/smtp.factor | 2 +- basis/urls/urls.factor | 2 +- core/io/files/files.factor | 2 +- extra/bake/fry/fry.factor | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/basis/cocoa/dialogs/dialogs.factor b/basis/cocoa/dialogs/dialogs.factor index 606526a240..662b4a7bae 100644 --- a/basis/cocoa/dialogs/dialogs.factor +++ b/basis/cocoa/dialogs/dialogs.factor @@ -26,7 +26,7 @@ IN: cocoa.dialogs [ -> filenames CF>string-array ] [ drop f ] if ; : split-path ( path -- dir file ) - "/" last-split1 [ ] bi@ ; + "/" split1-last [ ] bi@ ; : save-panel ( path -- paths ) dup diff --git a/basis/farkup/farkup.factor b/basis/farkup/farkup.factor index 21e3c05d04..77a9038cd9 100644 --- a/basis/farkup/farkup.factor +++ b/basis/farkup/farkup.factor @@ -36,7 +36,7 @@ TUPLE: line-break ; { "http://" "https://" "ftp://" } [ head? ] with contains? ; : simple-link-title ( string -- string' ) - dup absolute-url? [ "/" last-split1 swap or ] unless ; + dup absolute-url? [ "/" split1-last swap or ] unless ; EBNF: parse-farkup nl = ("\r\n" | "\r" | "\n") => [[ drop "\n" ]] diff --git a/basis/smtp/smtp.factor b/basis/smtp/smtp.factor index c17bccf064..3512b2e4d7 100644 --- a/basis/smtp/smtp.factor +++ b/basis/smtp/smtp.factor @@ -153,7 +153,7 @@ ERROR: invalid-header-string string ; : extract-email ( recepient -- email ) ! This could be much smarter. - " " last-split1 swap or "<" ?head drop ">" ?tail drop ; + " " split1-last swap or "<" ?head drop ">" ?tail drop ; : email>headers ( email -- hashtable ) [ diff --git a/basis/urls/urls.factor b/basis/urls/urls.factor index 597cdfdb7f..c0fb1695c3 100644 --- a/basis/urls/urls.factor +++ b/basis/urls/urls.factor @@ -132,7 +132,7 @@ M: url present { [ dup empty? ] [ drop ] } { [ over "/" tail? ] [ append ] } { [ "/" pick start not ] [ nip ] } - [ [ "/" last-split1 drop "/" ] dip 3append ] + [ [ "/" split1-last drop "/" ] dip 3append ] } cond ; PRIVATE> diff --git a/core/io/files/files.factor b/core/io/files/files.factor index 25f6f36e7c..17f06a2a50 100644 --- a/core/io/files/files.factor +++ b/core/io/files/files.factor @@ -150,7 +150,7 @@ PRIVATE> ] unless ; : file-extension ( filename -- extension ) - "." last-split1 nip ; + "." split1-last nip ; ! File info TUPLE: file-info type size permissions created modified diff --git a/extra/bake/fry/fry.factor b/extra/bake/fry/fry.factor index b9f9882e88..d82500edba 100644 --- a/extra/bake/fry/fry.factor +++ b/extra/bake/fry/fry.factor @@ -44,7 +44,7 @@ DEFER: shallow-fry ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! : deep-fry ( quot -- quot ) - { _ } last-split1 dup + { _ } split1-last dup [ shallow-fry [ >r ] rot deep-fry [ [ dip ] curry r> compose ] 4array concat @@ -77,4 +77,4 @@ DEFER: shallow-fry MACRO: fry ( seq -- quot ) [fry] ; -: '[ \ ] [ >quotation ] parse-literal \ fry parsed ; parsing \ No newline at end of file +: '[ \ ] [ >quotation ] parse-literal \ fry parsed ; parsing