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

[factor.git] / core / sequences / sequences.factor

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