From 4306656556335f7e9e8b91bfb5d9988e14835a12 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 20 Jan 2009 16:35:09 -0600 Subject: [PATCH] use assert-sequence= in mime.multipart --- basis/mime/multipart/multipart.factor | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/basis/mime/multipart/multipart.factor b/basis/mime/multipart/multipart.factor index d61b927cc8..10ddb926dd 100755 --- a/basis/mime/multipart/multipart.factor +++ b/basis/mime/multipart/multipart.factor @@ -139,13 +139,16 @@ ERROR: no-content-disposition multipart ; [ no-content-disposition ] } case ; -: read-assert= ( string -- ) - [ length read ] keep assert= ; +: assert-sequence= ( a b -- ) + 2dup sequence= [ 2drop ] [ assert ] if ; + +: read-assert-sequence= ( sequence -- ) + [ length read ] keep assert-sequence= ; : parse-beginning ( multipart -- multipart ) - "--" read-assert= + "--" read-assert-sequence= dup mime-separator>> - [ read-assert= ] + [ read-assert-sequence= ] [ separator-prefix prepend >>mime-separator ] bi ; : parse-multipart-loop ( multipart -- multipart )