X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Lucu.git;a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FUtils.hs;h=f1c178d55a1b22983d1ec75907873186f4446686;hp=9212747d9cf4ea782491240f1c8e201c29715dc4;hb=7943b7672278b5fc2b15f4005441b2c076e4e138;hpb=9ac730212cb361eb10e5fe4ad0eec6758e2b200a diff --git a/Network/HTTP/Lucu/Utils.hs b/Network/HTTP/Lucu/Utils.hs index 9212747..f1c178d 100644 --- a/Network/HTTP/Lucu/Utils.hs +++ b/Network/HTTP/Lucu/Utils.hs @@ -10,9 +10,10 @@ module Network.HTTP.Lucu.Utils ) where -import Data.List hiding (last) +import Control.Monad +import Data.List hiding (last) import Network.URI -import Prelude hiding (last) +import Prelude hiding (last) -- |> splitBy (== ':') "ab:c:def" -- > ==> ["ab", "c", "def"] @@ -25,14 +26,12 @@ splitBy isSep src -- |> joinWith ":" ["ab", "c", "def"] -- > ==> "ab:c:def" joinWith :: [a] -> [[a]] -> [a] -joinWith separator xs - = separator `seq` xs `seq` - foldr (++) [] $! intersperse separator xs +joinWith = (join .) . intersperse -- |> trim (== '_') "__ab_c__def___" -- > ==> "ab_c__def" trim :: (a -> Bool) -> [a] -> [a] -trim p = p `seq` trimTail . trimHead +trim !p = trimTail . trimHead where trimHead = dropWhile p trimTail = reverse . trimHead . reverse @@ -53,8 +52,7 @@ isWhiteSpace _ = False -- > quoteStr "ab\"c" -- > ==> "\"ab\\\"c\"" quoteStr :: String -> String -quoteStr str = str `seq` - foldr (++) "" (["\""] ++ map quote str ++ ["\""]) +quoteStr !str = concat (["\""] ++ map quote str ++ ["\""]) where quote :: Char -> String quote '"' = "\\\""