Fixed many bugs...

[Lucu.git] / Network / HTTP / Lucu / Headers.hs

diff --git a/Network/HTTP/Lucu/Headers.hs b/Network/HTTP/Lucu/Headers.hs
index b36927d9bc13978ce9a7116883b69f0901b369bd..06dc8f95f0f2ee2c9aca0c1927b9b049797abc49 100644 (file)
--- a/Network/HTTP/Lucu/Headers.hs
+++ b/Network/HTTP/Lucu/Headers.hs
@@ -7,6 +7,8 @@ module Network.HTTP.Lucu.Headers
     ( Headers
     , HasHeaders(..)
 
+    , singleton
+
     , toHeaders
     , fromHeaders
 
@@ -21,6 +23,7 @@ import Data.Attoparsec.Char8 as P
 import qualified Data.ByteString as BS
 import Data.Map (Map)
 import qualified Data.Map as M
+import qualified Data.Map.Unicode as M
 import Data.Monoid
 import Data.Monoid.Unicode
 import Network.HTTP.Lucu.Parser.Http
@@ -40,6 +43,12 @@ class HasHeaders a where
         = case getHeaders a of
             Headers m → M.lookup key m
 
+    hasHeader ∷ CIAscii → a → Bool
+    {-# INLINE hasHeader #-}
+    hasHeader key a
+        = case getHeaders a of
+            Headers m → key M.∈ m
+
     getCIHeader ∷ CIAscii → a → Maybe CIAscii
     {-# INLINE getCIHeader #-}
     getCIHeader key a
@@ -63,6 +72,11 @@ instance HasHeaders Headers where
     getHeaders   = id
     setHeaders _ = id
 
+singleton ∷ CIAscii → Ascii → Headers
+{-# INLINE singleton #-}
+singleton key val
+    = Headers $ M.singleton key val
+
 toHeaders ∷ [(CIAscii, Ascii)] → Headers
 {-# INLINE toHeaders #-}
 toHeaders = flip mkHeaders (∅)
@@ -120,7 +134,7 @@ headersP = do xs ← P.many header
       {-# INLINE content #-}
       content = A.unsafeFromByteString
                 <$>
-                takeWhile1 (\c → ((¬) (isSPHT c)) ∧ isText c)
+                takeWhile1 (\c → (¬) (isSPHT c) ∧ isText c)
 
       joinValues ∷ [Ascii] → Ascii
       {-# INLINE joinValues #-}