X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FHttpVersion.hs;h=2029a7facbaf3e5eec5a1bc42201a74e26ff9151;hb=9668dc27a02b59d7bfb1e9e40af3d2619700ad69;hp=a5db1e29193a10aaeec1b4c67ca57092f906a477;hpb=3fe5ca3bca04e0124a5f2440e893dc5375e0bb51;p=Lucu.git

diff --git a/Network/HTTP/Lucu/HttpVersion.hs b/Network/HTTP/Lucu/HttpVersion.hs
index a5db1e2..2029a7f 100644
--- a/Network/HTTP/Lucu/HttpVersion.hs
+++ b/Network/HTTP/Lucu/HttpVersion.hs
@@ -1,14 +1,13 @@
 {-# LANGUAGE
-    BangPatterns
-  , OverloadedStrings
+    OverloadedStrings
   , UnicodeSyntax
   #-}
-
--- |Manipulation of HTTP version string.
+-- |HTTP version number
 module Network.HTTP.Lucu.HttpVersion
     ( HttpVersion(..)
-    , httpVersionP
     , printHttpVersion
+
+    , httpVersionP
     )
     where
 import qualified Blaze.Text.Int as BT
@@ -20,7 +19,7 @@ import Data.Attoparsec.Char8
 import Data.Monoid.Unicode
 import Prelude hiding (min)
 
--- |@'HttpVersion' major minor@ represents \"HTTP\/major.minor\".
+-- |An HTTP version consists of major and minor versions.
 data HttpVersion
     = HttpVersion !Int !Int
       deriving (Eq, Show)
@@ -33,24 +32,25 @@ instance Ord HttpVersion where
         | minA < minB = LT
         | otherwise   = EQ
 
-httpVersionP ∷ Parser HttpVersion
-httpVersionP = string "HTTP/"
-               *>
-               choice [ string "1.1" *> pure (HttpVersion 1 1)
-                      , string "1.0" *> pure (HttpVersion 1 0)
-                      , HttpVersion <$> decimal ⊛ (char '.' *> decimal)
-                      ]
-
 -- |Convert an 'HttpVersion' to 'AsciiBuilder'.
 printHttpVersion ∷ HttpVersion → AsciiBuilder
 printHttpVersion v
     = case v of
-        -- 頻出するので高速化
+        -- Optimisation for special cases.
         HttpVersion 1 0 → A.toAsciiBuilder "HTTP/1.0"
         HttpVersion 1 1 → A.toAsciiBuilder "HTTP/1.1"
-        -- 一般の場合
+        -- General cases.
         HttpVersion maj min
             → A.toAsciiBuilder    "HTTP/"           ⊕
               A.unsafeFromBuilder (BT.integral maj) ⊕
               A.toAsciiBuilder    "."               ⊕
               A.unsafeFromBuilder (BT.integral min)
+
+-- |'Parser' for an 'HttpVersion'.
+httpVersionP ∷ Parser HttpVersion
+httpVersionP = string "HTTP/"
+               *>
+               choice [ string "1.1" *> pure (HttpVersion 1 1)
+                      , string "1.0" *> pure (HttpVersion 1 0)
+                      , HttpVersion <$> decimal ⊛ (char '.' *> decimal)
+                      ]