core: find-subseq -> subsequence-starts, find-subseq-from -> subsequence-starts-from

diff --git a/basis/alien/libraries/finder/linux/linux-tests.factor b/basis/alien/libraries/finder/linux/linux-tests.factor
index b26947f9c96826c4261caa7dd87661ead6c43797..a202743fc705dab1265ad4c246a98720024bfa92 100644 (file)
--- a/basis/alien/libraries/finder/linux/linux-tests.factor
+++ b/basis/alien/libraries/finder/linux/linux-tests.factor
@@ -1,4 +1,4 @@
 USING: alien.libraries.finder sequences tools.test ;
 
-{ t } [ "m" find-library "libm.so" find-subseq? ] unit-test
-{ t } [ "c" find-library "libc.so" find-subseq? ] unit-test
+{ t } [ "m" find-library "libm.so" subsequence? ] unit-test
+{ t } [ "c" find-library "libc.so" subsequence? ] unit-test

diff --git a/basis/alien/libraries/finder/linux/linux.factor b/basis/alien/libraries/finder/linux/linux.factor
index cedd58cb846d8c14aef8002d1aad645f07be3514..d8698ac68494479850cb8e9515a4f3dc849a5c41 100644 (file)
--- a/basis/alien/libraries/finder/linux/linux.factor
+++ b/basis/alien/libraries/finder/linux/linux.factor
@@ -20,7 +20,7 @@ CONSTANT: mach-map {
         [
             " " split1 [ "()" in? ] trim "," split
             [ [ unicode:blank? ] trim ] map
-            [ ": Linux" find-subseq? ] reject
+            [ ": Linux" subsequence? ] reject
         ] dip 3array
     ] map ;
 
@@ -50,7 +50,7 @@ CONSTANT: mach-map {
             "ld" , "-t" , ":" split [ "-L" , , ] each
             "-o" , "/dev/null" , "-l" name append ,
         ] { } make utf8 [ read-lines ] with-process-reader* 2drop
-        "lib" name append '[ _ find-subseq? ] find nip
+        "lib" name append '[ _ subsequence? ] find nip
     ] [ f ] if* ;
 
 PRIVATE>

diff --git a/basis/alien/libraries/finder/macosx/macosx-tests.factor b/basis/alien/libraries/finder/macosx/macosx-tests.factor
index a37425ded467de0937a3725ceaccd4949ab85085..e79dbb8f6cb52abe93856776404af8238cccf4e7 100644 (file)
--- a/basis/alien/libraries/finder/macosx/macosx-tests.factor
+++ b/basis/alien/libraries/finder/macosx/macosx-tests.factor
@@ -41,7 +41,7 @@ alien.libraries.finder.macosx.private sequences tools.test ;
     } [ dyld-find ] map
 ] unit-test
 
-{ t } [ "m" find-library "libm.dylib" find-subseq? ] unit-test
-{ t } [ "c" find-library "libc.dylib" find-subseq? ] unit-test
-{ t } [ "bz2" find-library "libbz2.dylib" find-subseq? ] unit-test
-{ t } [ "AGL" find-library "AGL.framework" find-subseq? ] unit-test
+{ t } [ "m" find-library "libm.dylib" subsequence? ] unit-test
+{ t } [ "c" find-library "libc.dylib" subsequence? ] unit-test
+{ t } [ "bz2" find-library "libbz2.dylib" subsequence? ] unit-test
+{ t } [ "AGL" find-library "AGL.framework" subsequence? ] unit-test

diff --git a/basis/alien/libraries/finder/macosx/macosx.factor b/basis/alien/libraries/finder/macosx/macosx.factor
index d5913c85de64ae9b1ef7a1ba272b6c836e888565..9da349bc8991582929bdf022cdc25703fdf64bd8 100644 (file)
--- a/basis/alien/libraries/finder/macosx/macosx.factor
+++ b/basis/alien/libraries/finder/macosx/macosx.factor
@@ -130,7 +130,7 @@ PRIVATE>
 
 : framework-find ( name -- path )
     dup dyld-find [ nip ] [
-        dup ".framework" find-subseq [
+        dup ".framework" subsequence-starts [
             dupd head
         ] [
             [ ".framework" append ] keep

diff --git a/basis/alien/libraries/finder/windows/windows-tests.factor b/basis/alien/libraries/finder/windows/windows-tests.factor
index 741f4375cbb111dcb3ea60ca3d8056a4204ee53d..6969d528c4070d141681fd1971e29feaa7b7ba01 100644 (file)
--- a/basis/alien/libraries/finder/windows/windows-tests.factor
+++ b/basis/alien/libraries/finder/windows/windows-tests.factor
@@ -1,3 +1,3 @@
 USING: alien.libraries.finder sequences tools.test ;
 
-{ t } [ "kernel32" find-library "kernel32.dll" find-subseq? ] unit-test
+{ t } [ "kernel32" find-library "kernel32.dll" subsequence? ] unit-test

diff --git a/basis/bootstrap/compiler/compiler.factor b/basis/bootstrap/compiler/compiler.factor
index 4d10ced59c6b86b4f1a5854b2f93a4ddf663eb35..feb4a5f1f78e1b6e826dd9bb584ec195f21ae479 100644 (file)
--- a/basis/bootstrap/compiler/compiler.factor
+++ b/basis/bootstrap/compiler/compiler.factor
@@ -89,7 +89,7 @@ gc
     "." write flush
 
     {
-        member-eq? split harvest sift cut cut-slice subseq-start find-subseq
+        member-eq? split harvest sift cut cut-slice subseq-start subsequence-starts
         index clone set-at reverse push-all class-of number>string string>number
         like clone-like
     } compile-unoptimized

diff --git a/basis/db/sqlite/sqlite.factor b/basis/db/sqlite/sqlite.factor
index 046e662f5cf3ef2a21b133d2d0799f2e58a9db3b..dc0e0fd590cb4c0540ebd8c2bba0a71ed8899a86 100644 (file)
--- a/basis/db/sqlite/sqlite.factor
+++ b/basis/db/sqlite/sqlite.factor
@@ -260,7 +260,7 @@ M: sqlite-db-connection persistent-table
     "sql-spec" get modifiers>> [ +not-null+ = ] none? ;
 
 : delete-cascade? ( -- ? )
-    "sql-spec" get modifiers>> { +on-delete+ +cascade+ } find-subseq? ;
+    "sql-spec" get modifiers>> { +on-delete+ +cascade+ } subsequence? ;
 
 : sqlite-trigger, ( string -- )
     { } { } <simple-statement> 3, ;

diff --git a/basis/dns/dns.factor b/basis/dns/dns.factor
index 2cb75d9eb8b38a4249baf8f6a4bb41500370fb7e..11620c2b023d620e8fe1afd42d5e0e343476b6bd 100644 (file)
--- a/basis/dns/dns.factor
+++ b/basis/dns/dns.factor
@@ -58,7 +58,7 @@ SYMBOL: dns-servers
 ERROR: domain-name-contains-empty-label domain ;
 
 : check-domain-name ( domain -- domain )
-    dup ".." find-subseq? [ domain-name-contains-empty-label ] when ;
+    dup ".." subsequence? [ domain-name-contains-empty-label ] when ;
 
 : >dotted ( domain -- domain' )
     dup "." tail? [ "." append ] unless ;

diff --git a/basis/help/html/html.factor b/basis/help/html/html.factor
index fd885b22cfe9797731e04da5028ba6386104fd94..2aeb70a85a95c894db2fa72a55fd9d3969997210 100644 (file)
--- a/basis/help/html/html.factor
+++ b/basis/help/html/html.factor
@@ -140,17 +140,17 @@ M: pathname url-of
         " white-space: pre-wrap; line-height: 125%;" append
     ] re-replace-with
 
-    { "font-family: monospace;" "background-color:" } [ find-subseq? ] with all?[
+    { "font-family: monospace;" "background-color:" } [ subsequence? ] with all?[
         " margin: 10px 0px;" append
     ] when
 
-    dup { "border:" "background-color:" } [ find-subseq? ] with all? [
+    dup { "border:" "background-color:" } [ subsequence? ] with all? [
         " border-radius: 5px;" append
     ] when ;
 
 : fix-help-header ( classes -- classes )
     dup [
-        [ ".a" head? ] [ "#f4efd9;" find-subseq? ] bi and
+        [ ".a" head? ] [ "#f4efd9;" subsequence? ] bi and
     ] find [
         "padding: 10px;" "padding: 0px;" replace
         "background-color: #f4efd9;" "background-color: white;" replace
@@ -188,7 +188,7 @@ M: pathname url-of
                 ] re-replace-with
             ] map " " join "{ " " }" surround
         ] re-replace-with "    " prepend
-        dup "{  }" find-subseq? [ drop f ] when
+        dup "{  }" subsequence? [ drop f ] when
     ] map harvest append "}" suffix ;
 
 : css-classes ( classes -- stylesheet )
@@ -215,7 +215,7 @@ M: pathname url-of
     ] each classes sort-values css-classes body ;
 
 : retina-image ( path -- path' )
-    dup "@2x" find-subseq? [ "." split1-last "@2x." glue ] unless ;
+    dup "@2x" subsequence? [ "." split1-last "@2x." glue ] unless ;
 
 : ?copy-file ( from to -- )
     dup file-exists? [ 2drop ] [ copy-file ] if ;

diff --git a/basis/help/lint/checks/checks.factor b/basis/help/lint/checks/checks.factor
index fc2b6b94062a704704621beedfb318284bdc68f1..0ccc19b9115249b62df962b3c4b9b5e55ee9c42f 100644 (file)
--- a/basis/help/lint/checks/checks.factor
+++ b/basis/help/lint/checks/checks.factor
@@ -152,7 +152,7 @@ SYMBOL: vocab-articles
             simple-lint-error
         ] when
     ] [
-        "  " find-subseq? [
+        "  " subsequence? [
             "Paragraph text should not contain double spaces"
             simple-lint-error
         ] when

diff --git a/basis/help/lint/spaces/spaces.factor b/basis/help/lint/spaces/spaces.factor
index 3419b029d51fcc5fa392eb5f41b5361392db0dc0..bdb1c6c2faccadb44e02e9a486ffdfd3c17c5809 100644 (file)
--- a/basis/help/lint/spaces/spaces.factor
+++ b/basis/help/lint/spaces/spaces.factor
@@ -18,7 +18,7 @@ IN: help.lint.spaces
             first [
                 { [ CHAR: space = ] [ CHAR: " = ] } 1||
             ] trim-head
-            "  " find-subseq?
+            "  " subsequence?
         ] filter
         [ drop ] [
             swap <pathname> .

diff --git a/basis/help/search/search.factor b/basis/help/search/search.factor
index 39103580254511cc7430e0086be607a5470cf262..00a922558ba8bac4a9232eb360f55f91729d786e 100644 (file)
--- a/basis/help/search/search.factor
+++ b/basis/help/search/search.factor
@@ -37,7 +37,7 @@ MEMO: article-words ( name -- words )
     search-words [ { } ] [
         [ all-articles ] dip
         dup length 1 > [
-            '[ article-words _ find-subseq? ] filter
+            '[ article-words _ subsequence? ] filter
         ] [
             first '[ article-words [ _ head? ] any? ] filter
         ] if

diff --git a/basis/html/templates/fhtml/fhtml.factor b/basis/html/templates/fhtml/fhtml.factor
index 40189add6d87590b395699536262b147bc515d0e..8d64ef8e71c69e41842560407bea991faf14a374 100644 (file)
--- a/basis/html/templates/fhtml/fhtml.factor
+++ b/basis/html/templates/fhtml/fhtml.factor
@@ -23,7 +23,7 @@ M: template-lexer skip-word
 DEFER: <% delimiter
 
 : check-<% ( lexer -- col )
-    [ column>> ] [ line-text>> ] bi "<%" find-subseq-from ;
+    [ column>> ] [ line-text>> ] bi "<%" subsequence-starts-from ;
 
 : found-<% ( accum lexer col -- accum )
     [

diff --git a/basis/http/client/client-tests.factor b/basis/http/client/client-tests.factor
index aec8f2041f909fba07c8110917dc3d548cca870d..cf805380cc8c81f8b408ab404892f9348dd010d2 100644 (file)
--- a/basis/http/client/client-tests.factor
+++ b/basis/http/client/client-tests.factor
@@ -48,8 +48,8 @@ IN: http.client.tests
 ! hit the velox.ch website.
 ! { t } [
     ! "https://alice.sni.velox.ch" http-get nip
-    ! [ "Great!" find-subseq? ]
-    ! [ "TLS SNI Test Site: alice.sni.velox.ch" find-subseq? ] bi and
+    ! [ "Great!" subsequence? ]
+    ! [ "TLS SNI Test Site: alice.sni.velox.ch" subsequence? ] bi and
 ! ] unit-test
 
 { t } [

diff --git a/basis/models/search/search.factor b/basis/models/search/search.factor
index 40f017befdcb32ced244bbf185096985ac451ac4..cb62fa636f51c0abe23ba306fd5ff0a8ec3f86ac 100644 (file)
--- a/basis/models/search/search.factor
+++ b/basis/models/search/search.factor
@@ -7,4 +7,4 @@ IN: models.search
     '[ _ curry filter ] <smart-arrow> ; inline
 
 : <string-search> ( values search quot -- model )
-    '[ swap @ [ >case-fold ] bi@ subseq? ] <search> ; inline
+    '[ @ [ >case-fold ] bi@ subsequence? ] <search> ; inline

diff --git a/basis/multiline/multiline.factor b/basis/multiline/multiline.factor
index 66189cfe7f9fa9e08e7e03065b681934417ba90a..a239d1089717f121e02a375c76bc928fa7cb69eb 100644 (file)
--- a/basis/multiline/multiline.factor
+++ b/basis/multiline/multiline.factor
@@ -41,7 +41,7 @@ SYNTAX: STRING:
 :: (scan-multiline-string) ( i end lexer -- j )
     lexer line-text>> :> text
     lexer still-parsing? [
-        i text end find-subseq-from [| j |
+        i text end subsequence-starts-from [| j |
             i j text subseq % j end length +
         ] [
             text i bound tail % CHAR: \n ,

diff --git a/basis/quoted-printable/quoted-printable-tests.factor b/basis/quoted-printable/quoted-printable-tests.factor
index f57f2f0a1ab4900622123926aa68540916081595..71a800b299f2c82edbb54b873921d85addce727c 100644 (file)
--- a/basis/quoted-printable/quoted-printable-tests.factor
+++ b/basis/quoted-printable/quoted-printable-tests.factor
@@ -23,8 +23,8 @@ and we didn't know hów tö do thât" latin2 encode >quoted ] unit-test
 : message ( -- str )
     55 [ "hello" ] replicate concat ;
 
-{ f } [ message >quoted "=\r\n" find-subseq? ] unit-test
+{ f } [ message >quoted "=\r\n" subsequence? ] unit-test
 { 1 } [ message >quoted split-lines length ] unit-test
-{ t } [ message >quoted-lines "=\r\n" find-subseq? ] unit-test
+{ t } [ message >quoted-lines "=\r\n" subsequence? ] unit-test
 { 4 } [ message >quoted-lines split-lines length ] unit-test
 { "===o" } [ message >quoted-lines split-lines [ last ] "" map-as ] unit-test

diff --git a/basis/sequences/deep/deep.factor b/basis/sequences/deep/deep.factor
index 36911bc12b8e9441c7ad7a432aa9617a19a0e6ba..53910bb776a5636375f2a7e020c7326679a3f2ae 100644 (file)
--- a/basis/sequences/deep/deep.factor
+++ b/basis/sequences/deep/deep.factor
@@ -56,7 +56,7 @@ M: object branch? drop f ;
 
 : deep-subseq? ( subseq seq -- ? )
     swap '[
-        _ swap dup branch? [ subseq? ] [ 2drop f ] if
+        _ over branch? [ subsequence? ] [ 2drop f ] if
     ] deep-find >boolean ;
 
 : deep-map! ( ... obj quot: ( ... elt -- ... elt' ) -- ... obj )

diff --git a/basis/tools/test/test-tests.factor b/basis/tools/test/test-tests.factor
index 50e36d44719c23a53f21cd9c5316e987f81130a4..c5f815aaf9b2e6ac9625f985c231f188c5c8e96d 100644 (file)
--- a/basis/tools/test/test-tests.factor
+++ b/basis/tools/test/test-tests.factor
@@ -16,5 +16,5 @@ sequences tools.test tools.test.private ;
 ! Just verifies that the presented output contains a callstack.
 { t } [
     create-test-failure [ error. ] with-string-writer
-    "OBJ-CURRENT-THREAD" find-subseq?
+    "OBJ-CURRENT-THREAD" subsequence?
 ] unit-test

diff --git a/basis/ui/images/images.factor b/basis/ui/images/images.factor
index b11520e390ff21a5bd93e5b26ab8f075a231a5ce..20a4e6109b208c6a93c12ee8b2cc788dd27caa35 100644 (file)
--- a/basis/ui/images/images.factor
+++ b/basis/ui/images/images.factor
@@ -12,7 +12,7 @@ C: <image-name> image-name
 <PRIVATE
 
 MEMO: cached-image-path ( path -- image )
-    [ load-image ] [ "@2x" find-subseq? >>2x? ] bi ;
+    [ load-image ] [ "@2x" subsequence? >>2x? ] bi ;
 
 PRIVATE>
 

diff --git a/core/sequences/sequences-docs.factor b/core/sequences/sequences-docs.factor
index 1a7f7e74ba7019d98de8f9bbebd2d70938ee7e3a..5f9c5f15805067550b9a10e4b6a6deaebc81166a 100644 (file)
--- a/core/sequences/sequences-docs.factor
+++ b/core/sequences/sequences-docs.factor
@@ -1194,11 +1194,11 @@ HELP: subseq-starts-at?
 { $values { "i" "a start index" } { "seq" sequence } { "subseq" sequence } { "?" boolean } }
 { $description "Outputs " { $snippet "t" } " if the subseq starts at the " { $snippet "i" } "th element or outputs " { $link f } " if the sequence is not at that position." } ;
 
-HELP: find-subseq
+HELP: subsequence-starts
 { $values { "seq" sequence } { "subseq" sequence } { "i/f" "a start index or " { $snippet "f" } } }
 { $description "Outputs the start index of the first contiguous subsequence equal to " { $snippet "subseq" } ", starting the search from the " { $snippet "n" } "th element. If no matching subsequence is found, outputs " { $link f } "." } ;
 
-HELP: find-subseq-from
+HELP: subsequence-starts-from
 { $values { "n" "a start index" } { "seq" sequence } { "subseq" sequence } { "i/f" "a start index or " { $snippet "f" } } }
 { $description "Outputs the start index of the first contiguous subsequence equal to " { $snippet "subseq" } ", starting the search from the " { $snippet "n" } "th element. If no matching subsequence is found, outputs " { $link f } "." } ;
 
@@ -1947,8 +1947,8 @@ ARTICLE: "sequences-search" "Searching sequences"
 "Finding the start of a subsequence:"
 { $subsections
     subseq-start
-    find-subseq
-    find-subseq-from
+    subsequence-starts
+    subsequence-starts-from
     subseq-starts-at?
 }
 "Finding the index of an element satisfying a predicate:"

diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index cf4514ff904309d0529a9fcb1899dec650abe8ec..1dbdfa1dc360d278b324bd62115c39520edfd7d4 100644 (file)
--- a/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@ -1057,17 +1057,15 @@ PRIVATE>
         [ + _ nth-unsafe ] keep _ nth-unsafe =
     ] with all-integers? ; inline
 
-: find-subseq-from ( n seq subseq -- i/f )
+: subsequence-starts-from ( n seq subseq -- i/f )
     [ [ length ] bi@ - 1 + ] 2keep
     '[ _ _ subseq-starts-at? ] find-integer-from ; inline
 
-: subseq-start-from ( subseq seq n -- i/f ) spin find-subseq-from ; inline
+: subsequence-starts ( seq subseq -- i/f ) [ 0 ] 2dip subsequence-starts-from ; inline
 
-: find-subseq ( seq subseq -- i/f ) [ 0 ] 2dip find-subseq-from ; inline
+: subsequence? ( seq subseq -- ? ) subsequence-starts >boolean ; inline
 
-: find-subseq? ( seq subseq -- ? ) find-subseq >boolean ; inline
-
-: subseq-start ( subseq seq -- i/f ) swap find-subseq ; inline
+: subseq-start ( subseq seq -- i/f ) swap subsequence-starts ; inline
 
 : subseq? ( subseq seq -- ? ) subseq-start >boolean ; inline
 

diff --git a/core/splitting/splitting.factor b/core/splitting/splitting.factor
index b72aae53bd6d344b9b722140b5232119f6984650..42a1aaeb922e081d005e482a0ea116bf6eeec18c 100644 (file)
--- a/core/splitting/splitting.factor
+++ b/core/splitting/splitting.factor
@@ -28,7 +28,7 @@ PRIVATE>
 <PRIVATE
 
 : subseq-range ( seq subseq -- from/f to/f )
-    [ find-subseq ] keep '[ dup _ length + ] [ f f ] if* ; inline
+    [ subsequence-starts ] keep '[ dup _ length + ] [ f f ] if* ; inline
 
 : (split1) ( seq subseq snip-quot -- before after )
     [ [ subseq-range ] keepd over ] dip [ 2nip f ] if ; inline

diff --git a/core/strings/strings-tests.factor b/core/strings/strings-tests.factor
index 79f8c06c77853a895ec8444bc4de0e71c577737e..ef071188e9583408e119af58c8e99b1b19ca9340 100644 (file)
--- a/core/strings/strings-tests.factor
+++ b/core/strings/strings-tests.factor
@@ -26,8 +26,8 @@ vectors ;
 { f } [ CHAR: I "team" member? ] unit-test
 { t } [ "ea" "team" subseq? ] unit-test
 { f } [ "actore" "Factor" subseq? ] unit-test
-{ t } [ "team" "ea" find-subseq? ] unit-test
-{ f } [ "Factor" "actore" find-subseq? ] unit-test
+{ t } [ "team" "ea" subsequence? ] unit-test
+{ f } [ "Factor" "actore" subsequence? ] unit-test
 
 { "end" } [ "Beginning and end" 14 tail ] unit-test
 

diff --git a/core/system/system-tests.factor b/core/system/system-tests.factor
index 44d58ab02209d9d116eadcda5f500bca844dc048..227893e307b6ee6499a5bec1d89ca379b39145a3 100644 (file)
--- a/core/system/system-tests.factor
+++ b/core/system/system-tests.factor
@@ -3,5 +3,5 @@ USING: arrays sequences system tools.test ;
 { { t t t } } [
     version-info
     vm-version vm-compiler vm-compile-time 3array
-    [ find-subseq? ] with map
+    [ subsequence? ] with map
 ] unit-test

diff --git a/extra/bittorrent/bittorrent.factor b/extra/bittorrent/bittorrent.factor
index 1564022d9b1af9a939c34ca57c311002f3a5c7c8..dad0fff281f907e3c199e6b7491eb0654755f593 100644 (file)
--- a/extra/bittorrent/bittorrent.factor
+++ b/extra/bittorrent/bittorrent.factor
@@ -73,7 +73,7 @@ M: string load-metainfo
     dup "announce-list" of [ nip first random ] [ "announce" of ] if* ;
 
 : scrape-url ( metainfo -- url/f )
-    announce-url dup path>>  "announce" find-subseq? [
+    announce-url dup path>>  "announce" subsequence? [
         [ "announce" "scrape" replace ] change-path
     ] [ drop f ] if ;
 

diff --git a/extra/cli/git/git.factor b/extra/cli/git/git.factor
index 5a431c3e12bafb5b9bcf68202e9cb75b0d1ada83..b4d77105b67652512ec73bc6f57d6dc908291eb2 100644 (file)
--- a/extra/cli/git/git.factor
+++ b/extra/cli/git/git.factor
@@ -63,4 +63,4 @@ cli-git-num-parallel [ cpus 2 * ] initialize
 
 : directory-entries-without-git ( directory -- entries )
     recursive-directory-entries
-    [ name>> "/.git/" find-subseq? ] reject ;
\ No newline at end of file
+    [ name>> "/.git/" subsequence? ] reject ;
\ No newline at end of file

diff --git a/extra/codebase-analyzer/codebase-analyzer.factor b/extra/codebase-analyzer/codebase-analyzer.factor
index 3e6082254e3c6e7af96b3dc62225f42b9c439512..84c1ac5541770aa52db2795a6ed18ddd692c3900 100644 (file)
--- a/extra/codebase-analyzer/codebase-analyzer.factor
+++ b/extra/codebase-analyzer/codebase-analyzer.factor
@@ -23,10 +23,10 @@ IN: codebase-analyzer
     [ has-file-extension? ] filter ;
 
 : without-git-paths ( paths -- paths' )
-    [ "/.git/" find-subseq? ] reject ;
+    [ "/.git/" subsequence? ] reject ;
 
 : without-node-modules-paths ( paths -- paths' )
-    [ "/node_modules/" find-subseq? ] reject ;
+    [ "/node_modules/" subsequence? ] reject ;
 
 : regular-directory-files ( path -- seq )
     recursive-directory-files

diff --git a/extra/gemini/cli/cli.factor b/extra/gemini/cli/cli.factor
index a59cfe68bc759c97b1910c6074a3c4b7e712c8cd..708087c42c3aca581bed89f8d965265ca0fe9499 100644 (file)
--- a/extra/gemini/cli/cli.factor
+++ b/extra/gemini/cli/cli.factor
@@ -101,7 +101,7 @@ CONSTANT: URL V{ }
 
 : gemini-go ( args -- )
     present [ DEFAULT-URL ] when-empty
-    { [ dup "://" find-subseq? ] [ "gemini://" head? ] } 1||
+    { [ dup "://" subsequence? ] [ "gemini://" head? ] } 1||
     [ "gemini://" prepend ] unless
     dup "gemini://" head? [
         [ add-history ] [ add-stack ] [ gemini-get ] tri

diff --git a/extra/html/parser/analyzer/analyzer.factor b/extra/html/parser/analyzer/analyzer.factor
index 6fd88ddbdcec9e2cd90999c78065e84c9bea9b96..112545e2c71668b8655e62142566bf54e6d6a3ce 100644 (file)
--- a/extra/html/parser/analyzer/analyzer.factor
+++ b/extra/html/parser/analyzer/analyzer.factor
@@ -142,7 +142,7 @@ ERROR: undefined-find-nth m n seq quot ;
     [ { [ name>> = ] [ closing?>> not ] } 1&& ] with find-all ;
 
 : href-contains? ( str tag -- ? )
-    "href" attribute* [ swap find-subseq? ] [ 2drop f ] if ;
+    "href" attribute* [ swap subsequence? ] [ 2drop f ] if ;
 
 : find-hrefs ( vector -- vector' )
     [ { [ name>> "a" = ] [ "href" attribute? ] } 1&& ] filter sift

diff --git a/extra/lint/lint.factor b/extra/lint/lint.factor
index 53ef1f453efd035fbf353eddd93a7f65893ceda3..034a81ac8547956899b55552afcf0ced235c76f8 100644 (file)
--- a/extra/lint/lint.factor
+++ b/extra/lint/lint.factor
@@ -249,7 +249,7 @@ GENERIC: lint ( obj -- seq )
 M: object lint ( obj -- seq ) drop f ;
 
 M: callable lint ( quot -- seq )
-    lint-definitions-keys get-global [ find-subseq? ] with filter ;
+    lint-definitions-keys get-global [ subsequence? ] with filter ;
 
 M: word lint ( word -- seq/f )
     def>> [ callable? ] deep-filter [ lint ] map concat ;

diff --git a/extra/mason/git/git.factor b/extra/mason/git/git.factor
index 8bc24c406d38521c18f4682b9dd0551c1fe28a9c..57cf57bba75ae31b4dee6c76e1e05be3a02a6357 100644 (file)
--- a/extra/mason/git/git.factor
+++ b/extra/mason/git/git.factor
@@ -47,7 +47,7 @@ IN: mason.git
 
 : git-pull-failed ( error -- )
     dup output-process-error? [
-        dup output>> "not uptodate. Cannot merge." find-subseq?
+        dup output>> "not uptodate. Cannot merge." subsequence?
         [ git-repo-corrupted ]
         [ rethrow ]
         if

diff --git a/extra/mediawiki/api/api.factor b/extra/mediawiki/api/api.factor
index 9e6ce829c736bb6b0774f9e5dbd9f33c5e92f8cc..92c28132a1d1e9137412b5807b185e732d1bc0d5 100644 (file)
--- a/extra/mediawiki/api/api.factor
+++ b/extra/mediawiki/api/api.factor
@@ -104,7 +104,7 @@ t botflag set-global
 : nonce-already-used? ( assoc -- ? )
     "error" of
     [ "code" of "mwoauth-invalid-authorization" = ]
-    [ "info" of "Nonce already used" find-subseq ] bi
+    [ "info" of "Nonce already used" subsequence-starts ] bi
     and ;
 
 : readonly? ( assoc -- ? )

diff --git a/extra/metar/metar.factor b/extra/metar/metar.factor
index d88249050352269fb03fd8e07b3c4546f37d4291..c228fa9b9b1d630b577c8ce9b69d02fef5514978 100644 (file)
--- a/extra/metar/metar.factor
+++ b/extra/metar/metar.factor
@@ -282,7 +282,7 @@ CONSTANT: compass-directions H{
     ] if ;
 
 : parse-weather ( str -- str' )
-    dup "VC" find-subseq? [ "VC" "" replace t ] [ f ] if
+    dup "VC" subsequence? [ "VC" "" replace t ] [ f ] if
     [ (parse-weather) ]
     [ [ " in the vicinity" append ] when ] bi* ;
 

diff --git a/extra/modern/slices/slices.factor b/extra/modern/slices/slices.factor
index 001c4e1ad6b043a0a49278080db707ef792f0343..6740e02d15057b689dad15af75d1754d05b1fbfd 100644 (file)
--- a/extra/modern/slices/slices.factor
+++ b/extra/modern/slices/slices.factor
@@ -182,7 +182,7 @@ ERROR: expected-sequence-error expected actual ;
 ERROR: subseq-expected-but-got-eof n string expected ;
 
 :: slice-til-string ( n string search --  n' string payload end-string )
-    n string search find-subseq-from :> n'
+    n string search subsequence-starts-from :> n'
     n' [ n string search subseq-expected-but-got-eof ] unless
     n' search length + string
     n n' string ?<slice>

diff --git a/extra/rosetta-code/text-processing/max-licenses/max-licenses.factor b/extra/rosetta-code/text-processing/max-licenses/max-licenses.factor
index 2b875f97266fa4128cd0299aa9f244235192cfa6..dd064e580fd54086af3bd2f866de1d83e2877c45 100644 (file)
--- a/extra/rosetta-code/text-processing/max-licenses/max-licenses.factor
+++ b/extra/rosetta-code/text-processing/max-licenses/max-licenses.factor
@@ -32,7 +32,7 @@ TUPLE: maxlicense max-count current-count times ;
 
 : <maxlicense> ( -- max ) -1 0 V{ } clone \ maxlicense boa ; inline
 
-: out? ( line -- ? ) "OUT" find-subseq? ; inline
+: out? ( line -- ? ) "OUT" subsequence? ; inline
 
 : line-time ( line -- time ) split-words harvest fourth ; inline
 

diff --git a/extra/rosetta-code/web-scraping/web-scraping.factor b/extra/rosetta-code/web-scraping/web-scraping.factor
index 1a426f9a110e003c5550c12ecff9af31b4a5e9ab..02363523271905d5e3068ce8c588530c1f7323e9 100644 (file)
--- a/extra/rosetta-code/web-scraping/web-scraping.factor
+++ b/extra/rosetta-code/web-scraping/web-scraping.factor
@@ -16,6 +16,6 @@ IN: rosetta-code.web-scraping
 
 : web-scraping-main ( -- )
     "http://tycho.usno.navy.mil/cgi-bin/timer.pl" http-get nip
-    [ "UTC" find-subseq [ 9 - ] [ 1 - ] bi ] keep subseq print ;
+    [ "UTC" subsequence-starts [ 9 - ] [ 1 - ] bi ] keep subseq print ;
 
 MAIN: web-scraping-main

diff --git a/extra/txon/txon.factor b/extra/txon/txon.factor
index f681ef3c21d71952d053616145604807c5abbfc5..2b9110e47ede29dc7dc599aa03ab73bc05862ca3 100644 (file)
--- a/extra/txon/txon.factor
+++ b/extra/txon/txon.factor
@@ -42,7 +42,7 @@ DEFER: name/values
 
 : name=value ( string -- remain term )
     [ unicode:blank? ] trim
-    dup ":`" find-subseq? [ (name=value) ] [ f swap ] if ;
+    dup ":`" subsequence? [ (name=value) ] [ f swap ] if ;
 
 : name/values ( string -- remain terms )
     [ dup { [ empty? not ] [ first CHAR: ` = not ] } 1&& ]

diff --git a/extra/zoneinfo/zoneinfo.factor b/extra/zoneinfo/zoneinfo.factor
index 5503f7bf961ea6e20794923a77f98b12cec0c766..3feff6c524168d42b4e85db6650148fa8834d1ac 100644 (file)
--- a/extra/zoneinfo/zoneinfo.factor
+++ b/extra/zoneinfo/zoneinfo.factor
@@ -147,7 +147,7 @@ MEMO: zoneinfo-assoc ( -- assoc )
 
 : zoneinfo-zones ( -- seq )
     raw-zone-map keys
-    [ "/" find-subseq? ] partition
+    [ "/" subsequence? ] partition
     [ natural-sort ] bi@ append ;
 
 GENERIC: zone-matches? ( string rule -- ? )
@@ -232,8 +232,8 @@ ERROR: unknown-day-abbrev day ;
 
 : comparison-day-string ( timestamp string -- timestamp )
     {
-        { [ dup ">=" find-subseq? ] [ ">=" split1 swap [ string>number >>day ] dip day-abbrev>= ] }
-        { [ dup "<=" find-subseq? ] [ "<=" split1 swap [ string>number >>day ] dip day-abbrev<= ] }
+        { [ dup ">=" subsequence? ] [ ">=" split1 swap [ string>number >>day ] dip day-abbrev>= ] }
+        { [ dup "<=" subsequence? ] [ "<=" split1 swap [ string>number >>day ] dip day-abbrev<= ] }
         [ string>number >>day ]
     } cond ;