X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FUtils.hs;h=9212747d9cf4ea782491240f1c8e201c29715dc4;hb=f62b6f07bbf1eefcf552163d8f7daa6e0862ed5d;hp=d92516ee15875a6791fc912b8d11ebe1eb765ffb;hpb=636a3b3334f1ede61dc1e6faa2c4a021ea9bbd5c;p=Lucu.git diff --git a/Network/HTTP/Lucu/Utils.hs b/Network/HTTP/Lucu/Utils.hs index d92516e..9212747 100644 --- a/Network/HTTP/Lucu/Utils.hs +++ b/Network/HTTP/Lucu/Utils.hs @@ -4,26 +4,23 @@ module Network.HTTP.Lucu.Utils ( splitBy , joinWith , trim - , noCaseEq - , noCaseEq' , isWhiteSpace , quoteStr , parseWWWFormURLEncoded ) where -import Data.Char -import Data.List +import Data.List hiding (last) import Network.URI +import Prelude hiding (last) -- |> splitBy (== ':') "ab:c:def" -- > ==> ["ab", "c", "def"] splitBy :: (a -> Bool) -> [a] -> [[a]] -splitBy isSeparator src - = isSeparator `seq` - case break isSeparator src - of (last , [] ) -> last : [] - (first, sep:rest) -> first : splitBy isSeparator rest +splitBy isSep src + = case break isSep src + of (last , [] ) -> [last] + (first, _sep:rest) -> first : splitBy isSep rest -- |> joinWith ":" ["ab", "c", "def"] -- > ==> "ab:c:def" @@ -40,22 +37,8 @@ trim p = p `seq` trimTail . trimHead trimHead = dropWhile p trimTail = reverse . trimHead . reverse --- |@'noCaseEq' a b@ is equivalent to @(map toLower a) == (map toLower --- b)@. See 'noCaseEq''. -noCaseEq :: String -> String -> Bool -noCaseEq a b - = (map toLower a) == (map toLower b) -{-# INLINE noCaseEq #-} - --- |@'noCaseEq'' a b@ is a variant of 'noCaseEq' which first checks --- the length of two strings to avoid possibly unnecessary comparison. -noCaseEq' :: String -> String -> Bool -noCaseEq' a b - | length a /= length b = False - | otherwise = noCaseEq a b -{-# INLINE noCaseEq' #-} - --- |@'isWhiteSpace' c@ is True iff c is one of SP, HT, CR and LF. +-- |@'isWhiteSpace' c@ is 'Prelude.True' iff c is one of SP, HT, CR +-- and LF. isWhiteSpace :: Char -> Bool isWhiteSpace ' ' = True isWhiteSpace '\t' = True @@ -88,5 +71,5 @@ parseWWWFormURLEncoded src return ( unEscapeString key , unEscapeString $ case value of ('=':val) -> val - "" -> "" + val -> val )