X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Lucu.git;a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FETag.hs;h=7e618782c45e17e75ec16ef8667510447c518a20;hp=acc496fa2113ef6a0848e570dffd56c453566f4b;hb=ea2b7838f1b3d9d4923a220a601be2e04cc559d7;hpb=17020e406a20cbef8ec17594868db559c4c5a5db

diff --git a/Network/HTTP/Lucu/ETag.hs b/Network/HTTP/Lucu/ETag.hs
index acc496f..7e61878 100644
--- a/Network/HTTP/Lucu/ETag.hs
+++ b/Network/HTTP/Lucu/ETag.hs
@@ -2,12 +2,10 @@
     OverloadedStrings
   , UnicodeSyntax
   #-}
-{-# OPTIONS_HADDOCK prune #-}
-
 -- |Manipulation of entity tags.
 module Network.HTTP.Lucu.ETag
     ( ETag(..)
-
+    , parseETag
     , printETag
 
     , strongETag
@@ -16,14 +14,15 @@ module Network.HTTP.Lucu.ETag
     , eTagListP
     )
     where
+import Control.Applicative
 import Control.Monad
-import Control.Monad.Unicode
 import Data.Ascii (Ascii)
 import qualified Data.Ascii as A
 import Data.Attoparsec.Char8
 import Data.Monoid.Unicode
 import Network.HTTP.Lucu.Parser.Http hiding (token)
 import Network.HTTP.Lucu.Utils
+import Prelude.Unicode
 
 -- |An entity tag is made of a weakness flag and a opaque string.
 data ETag = ETag {
@@ -47,6 +46,19 @@ printETag et
         ⊕
         quoteStr (etagToken et) )
 
+-- |Parse 'Etag' from an 'Ascii'. This functions throws an exception
+-- for parse error.
+parseETag ∷ Ascii → ETag
+parseETag str
+    = let p  = do et ← eTagP
+                  endOfInput
+                  return et
+          bs = A.toByteString str
+      in
+        case parseOnly p bs of
+          Right et → et
+          Left err → error ("unparsable ETag: " ⧺ A.toString str ⧺ ": " ⧺ err)
+
 -- |This is equivalent to @'ETag' 'Prelude.False'@. If you want to
 -- generate an ETag from a file, try using
 -- 'Network.HTTP.Lucu.StaticFile.generateETagFromFile'.
@@ -58,7 +70,7 @@ weakETag ∷ Ascii → ETag
 weakETag = ETag True
 
 eTagP ∷ Parser ETag
-eTagP = do isWeak ← option False (string "W/" ≫ return True)
+eTagP = do isWeak ← option False (string "W/" *> return True)
            str    ← quotedStr
            return $ ETag isWeak str