X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FMIMEType.hs;h=947cb004cc8fe62c57492decb78de60636d14567;hb=f1f2bf550b80e3a7522790d6609b0a5ab18b5150;hp=93b8f1ff38d7aeed4f388432ee5cc8463bb68166;hpb=175e14b3b144537644e65ca76f1fca5c56fd44e9;p=Lucu.git

diff --git a/Network/HTTP/Lucu/MIMEType.hs b/Network/HTTP/Lucu/MIMEType.hs
index 93b8f1f..947cb00 100644
--- a/Network/HTTP/Lucu/MIMEType.hs
+++ b/Network/HTTP/Lucu/MIMEType.hs
@@ -3,14 +3,13 @@
 -- |Manipulation of MIME Types.
 module Network.HTTP.Lucu.MIMEType
     ( MIMEType(..)
-    , (</>)
-    , (<:>)
-    , (<=>)
+    , parseMIMEType
     , mimeTypeP
     , mimeTypeListP
     )
     where
 
+import qualified Data.ByteString.Lazy as B
 import           Network.HTTP.Lucu.Parser
 import           Network.HTTP.Lucu.Parser.Http
 import           Network.HTTP.Lucu.Utils
@@ -18,9 +17,9 @@ import           Network.HTTP.Lucu.Utils
 -- |@'MIMEType' \"major\" \"minor\" [(\"name\", \"value\")]@
 -- represents \"major\/minor; name=value\".
 data MIMEType = MIMEType {
-      mtMajor  :: String
-    , mtMinor  :: String
-    , mtParams :: [ (String, String) ]
+      mtMajor  :: !String
+    , mtMinor  :: !String
+    , mtParams :: ![ (String, String) ]
     } deriving (Eq)
 
 
@@ -40,32 +39,22 @@ instance Show MIMEType where
                                    value
 
 
-infix  9 </>, <=>
-infixl 8 <:>
+instance Read MIMEType where
+    readsPrec _ s = [(parseMIMEType s, "")]
 
--- |@\"major\" \<\/\> \"minor\"@ constructs a MIME Type
--- \"major\/minor\".
-(</>) :: String -> String -> MIMEType
-maj </> min
-    = MIMEType maj min []
-
--- |\<\:\> appends a @(name, value)@ pair to a MIME Type.
-(<:>) :: MIMEType -> (String, String) -> MIMEType
-mt@(MIMEType _ _ params) <:> pair
-    = mt {
-        mtParams = mtParams mt ++ [pair]
-      }
-
--- |\<\=\> takes two strings and makes a tuple of them. So you can say
--- @\"text\" \<\/\> \"xml\" \<\:\> \"charset\" \<\=\> \"UTF-8\" \<\:\>
--- \"q\" \<\=\> \"0.9\"@ to represent \"text\/xml; charset=UTF-8;
--- q=0.9\".
-(<=>) :: String -> String -> (String, String)
-name <=> value = (name, value)
+-- |Parse 'MIMEType' from a 'Prelude.String'. This function throws an
+-- exception for parse error.
+parseMIMEType :: String -> MIMEType
+parseMIMEType str = case parseStr mimeTypeP str of
+                      (Success t, r) -> if B.null r then
+                                            t
+                                        else
+                                            error ("unparsable MIME Type: " ++ str)
+                      _              -> error ("unparsable MIME Type: " ++ str)
 
 
 mimeTypeP :: Parser MIMEType
-mimeTypeP = allowEOF $
+mimeTypeP = allowEOF $!
             do maj <- token
                char '/'
                min <- token
@@ -82,4 +71,4 @@ mimeTypeP = allowEOF $
                   return (name, value)
 
 mimeTypeListP :: Parser [MIMEType]
-mimeTypeListP = allowEOF $ listOf mimeTypeP
+mimeTypeListP = allowEOF $! listOf mimeTypeP