Destroy Data.Attoparsec.Parsable; use Data.Default instead

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

diff --git a/Network/HTTP/Lucu/ContentCoding.hs b/Network/HTTP/Lucu/ContentCoding.hs
index 3ce7806dee86d5271ec50e8e1d4a68d7fd97a1ad..45a8b4e7dcd903deed0b9cecf92640c0b17ba7ff 100644 (file)
--- a/Network/HTTP/Lucu/ContentCoding.hs
+++ b/Network/HTTP/Lucu/ContentCoding.hs
@@ -1,11 +1,12 @@
 {-# LANGUAGE
-    OverloadedStrings
+    FlexibleInstances
+  , MultiParamTypeClasses
+  , TypeSynonymInstances
+  , OverloadedStrings
   , UnicodeSyntax
   #-}
 module Network.HTTP.Lucu.ContentCoding
     ( AcceptEncoding(..)
-
-    , acceptEncodingListP
     , normalizeCoding
     , unnormalizeCoding
     )
@@ -13,6 +14,7 @@ module Network.HTTP.Lucu.ContentCoding
 import Control.Applicative
 import Data.Ascii (CIAscii, toCIAscii)
 import Data.Attoparsec.Char8
+import Data.Default
 import Data.Ord
 import Data.Maybe
 import Network.HTTP.Lucu.Parser.Http
@@ -34,24 +36,28 @@ instance Ord AcceptEncoding where
           q1' = fromMaybe 0 q1
           q2' = fromMaybe 0 q2
 
-acceptEncodingListP ∷ Parser [AcceptEncoding]
-acceptEncodingListP = listOf accEncP
+instance Default (Parser [AcceptEncoding]) where
+    {-# INLINE def #-}
+    def = listOf def
 
-accEncP ∷ Parser AcceptEncoding
-accEncP = do coding ← toCIAscii <$> token
+instance Default (Parser AcceptEncoding) where
+    {-# INLINEABLE def #-}
+    def = do coding ← toCIAscii <$> token
              qVal   ← option Nothing
-                      $ do _ ← string ";q="
-                           q ← qvalue
-                           return $ Just q
+                          $ do _ ← string ";q="
+                               q ← qvalue
+                               return $ Just q
              return $ AcceptEncoding (normalizeCoding coding) qVal
 
 normalizeCoding ∷ CIAscii → CIAscii
+{-# INLINEABLE normalizeCoding #-}
 normalizeCoding coding
     | coding ≡ "x-gzip"     = "gzip"
     | coding ≡ "x-compress" = "compress"
     | otherwise             = coding
 
 unnormalizeCoding ∷ CIAscii → CIAscii
+{-# INLINEABLE unnormalizeCoding #-}
 unnormalizeCoding coding
     | coding ≡ "gzip"     = "x-gzip"
     | coding ≡ "compress" = "x-compress"