From eafdb65174bc2149881468a060d08127a3f04074 Mon Sep 17 00:00:00 2001 From: odr Date: Mon, 10 Feb 2014 16:22:24 +0400 Subject: matchUntil was changed for performance --- Codec/MIME/Parse.hs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'Codec') diff --git a/Codec/MIME/Parse.hs b/Codec/MIME/Parse.hs index 2843903..f9dfeb2 100644 --- a/Codec/MIME/Parse.hs +++ b/Codec/MIME/Parse.hs @@ -26,6 +26,7 @@ module Codec.MIME.Parse import Codec.MIME.Type import Codec.MIME.Decode +import Control.Arrow(second) import Data.Char import Data.Maybe @@ -245,12 +246,18 @@ untilMatch a b | T.null a = Just b | otherwise = untilMatch a $ T.tail b matchUntil :: T.Text -> T.Text -> (T.Text, T.Text) -matchUntil _ "" = ("", "") -matchUntil str xs +-- searching str; returning parts before str and after str +matchUntil str = second (T.drop $ T.length str) . T.breakOn str + +{- +matchUntil' :: T.Text -> T.Text -> (T.Text, T.Text) +matchUntil' _ "" = ("", "") +matchUntil' str xs | T.null xs = mempty -- slow, but it'll do for now. | str `T.isPrefixOf` xs = ("", T.drop (T.length str) xs) - | otherwise = let (as,bs) = matchUntil str $ T.tail xs in (T.take 1 xs <> as, bs) + | otherwise = let (as,bs) = matchUntil' str $ T.tail xs in (T.take 1 xs <> as, bs) +-} isHSpace :: Char -> Bool isHSpace c = c == ' ' || c == '\t' -- cgit v1.2.3