X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FUtils.hs;h=f1c178d55a1b22983d1ec75907873186f4446686;hb=7943b7672278b5fc2b15f4005441b2c076e4e138;hp=d7ace3f8309aab60c21f2c8c6c4362189a05bc73;hpb=0b4db5681e3b0b27357a87316822ea3671f8c174;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Utils.hs b/Network/HTTP/Lucu/Utils.hs
index d7ace3f..f1c178d 100644
--- a/Network/HTTP/Lucu/Utils.hs
+++ b/Network/HTTP/Lucu/Utils.hs
@@ -4,51 +4,47 @@ module Network.HTTP.Lucu.Utils
     ( splitBy
     , joinWith
     , trim
-    , noCaseEq
     , isWhiteSpace
     , quoteStr
     , parseWWWFormURLEncoded
     )
     where
 
-import Control.Monad.Trans
-import Data.Char
-import Data.List
-import Foreign
-import Foreign.C
+import Control.Monad
+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
-    = 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"]
+-- |> joinWith ":" ["ab", "c", "def"]
 --  > ==> "ab:c:def"
 joinWith :: [a] -> [[a]] -> [a]
-joinWith separator xs
-    = foldr (++) [] $ intersperse separator xs
+joinWith = (join .) . intersperse
 
 -- |> trim (== '_') "__ab_c__def___"
 --  > ==> "ab_c__def"
 trim :: (a -> Bool) -> [a] -> [a]
-trim p = trimTail . trimHead
+trim !p = trimTail . trimHead
     where
       trimHead = dropWhile p
       trimTail = reverse . trimHead . reverse
 
--- |@'noCaseEq' a b@ is equivalent to @(map toLower a) == (map toLower
--- b)@
-noCaseEq :: String -> String -> Bool
-noCaseEq a b
-    = (map toLower a) == (map toLower b)
-
--- |@'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 = flip elem " \t\r\n"
+isWhiteSpace ' '  = True
+isWhiteSpace '\t' = True
+isWhiteSpace '\r' = True
+isWhiteSpace '\n' = True
+isWhiteSpace _    = False
+{-# INLINE isWhiteSpace #-}
 
 -- |> quoteStr "abc"
 --  > ==> "\"abc\""
@@ -56,7 +52,7 @@ isWhiteSpace = flip elem " \t\r\n"
 --  > quoteStr "ab\"c"
 --  > ==> "\"ab\\\"c\""
 quoteStr :: String -> String
-quoteStr str = foldr (++) "" (["\""] ++ map quote str ++ ["\""])
+quoteStr !str = concat (["\""] ++ map quote str ++ ["\""])
     where
       quote :: Char -> String
       quote '"' = "\\\""
@@ -69,7 +65,9 @@ parseWWWFormURLEncoded :: String -> [(String, String)]
 parseWWWFormURLEncoded src
     | src == "" = []
     | otherwise = do pairStr <- splitBy (\ c -> c == ';' || c == '&') src
-                     let pair = break (== '=') pairStr
-                     return ( unEscapeString $ fst pair
-                            , unEscapeString $ snd pair
+                     let (key, value) = break (== '=') pairStr
+                     return ( unEscapeString key
+                            , unEscapeString $ case value of
+                                                 ('=':val) -> val
+                                                 val       -> val
                             )