factor: refactor subseq-start

[factor.git] / basis / mime / multipart / multipart.factor

diff --git a/basis/mime/multipart/multipart.factor b/basis/mime/multipart/multipart.factor
index c0192afa9ea09000515f47b3b8ed1387a9429f9f..9a6bc0044da690df12390eca8a1d5c9fe999c7ef 100644 (file)
--- a/basis/mime/multipart/multipart.factor
+++ b/basis/mime/multipart/multipart.factor
@@ -42,13 +42,14 @@ C: <mime-variable> mime-variable
 
 ERROR: mime-decoding-ran-out-of-bytes ;
 : dump-until-separator ( multipart -- multipart )
-    [ ] [ current-separator>> ] [ bytes>> ] tri
-    dup [ mime-decoding-ran-out-of-bytes ] unless
-    2dup subseq-start [
-        cut-slice
+    [ ] [ bytes>> ] [ current-separator>> ] tri
+    over [ mime-decoding-ran-out-of-bytes ] unless
+    2dup subsequence-starts [
+        swapd cut-slice
         [ mime-write ]
         [ swap length tail-slice >>bytes ] bi*
     ] [
+        swap
         tuck [ length ] bi@ - 1 - cut-slice
         [ mime-write ]
         [ >>bytes ] bi* fill-bytes