X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Lucu.git;a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FETag.hs;h=86dd429e265100b8318716679ebfd4d0554120b0;hp=0341f5ac382b245638575477b0474ec0b1fafe40;hb=c6b11025d1f81c668e9995e856b7bb34175230d3;hpb=1000bdc46cfe7b3ae550ff24ccea9f440f11b42a

diff --git a/Network/HTTP/Lucu/ETag.hs b/Network/HTTP/Lucu/ETag.hs
index 0341f5a..86dd429 100644
--- a/Network/HTTP/Lucu/ETag.hs
+++ b/Network/HTTP/Lucu/ETag.hs
@@ -1,13 +1,17 @@
 module Network.HTTP.Lucu.ETag
     ( ETag
-    , mkETag    -- Bool -> String -> ETag
+    , mkETag     -- Bool -> String -> ETag
+    , strongETag -- String -> ETag
+    , weakETag   -- String -> ETag
     , eTagP     -- Parser ETag
     , eTagListP -- Parser [ETag]
     )
     where
 
+import           Control.Monad
 import           Network.HTTP.Lucu.Parser
 import           Network.HTTP.Lucu.Parser.Http
+import           Network.HTTP.Lucu.Utils
 
 
 data ETag = ETag {
@@ -15,24 +19,27 @@ data ETag = ETag {
     , etagToken  :: String
     } deriving (Eq)
 
-
 instance Show ETag where
     show (ETag isWeak token) = (if isWeak then
                                     "W/"
                                 else
                                     "")
                                ++
-                               foldr (++) "" (["\""] ++ map quote token ++ ["\""])
-        where
-          quote :: Char -> String
-          quote '"' = "\\\""
-          quote c   = [c]
+                               quoteStr token
 
 
 mkETag :: Bool -> String -> ETag
 mkETag = ETag
 
 
+strongETag :: String -> ETag
+strongETag = ETag False
+
+
+weakETag :: String -> ETag
+weakETag = ETag True
+
+
 eTagP :: Parser ETag
 eTagP = do isWeak <- option False (string "W/" >> return True)
            str    <- quotedStr
@@ -41,6 +48,7 @@ eTagP = do isWeak <- option False (string "W/" >> return True)
 
 eTagListP :: Parser [ETag]
 eTagListP = allowEOF
-            $ sepBy1 eTagP (do many sp
-                               char ','
-                               many sp)
+            $ do xs <- listOf eTagP
+                 when (null xs)
+                          $ fail ""
+                 return xs