X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FParser.hs;h=ce4371878890301eb152d3b9ef55c526c4127174;hb=48560a5;hp=0d33a858a6b44362abf8668bc26974fcc5c737fa;hpb=1e48e402adec79653203dc19a1800efa7b1c467b;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Parser.hs b/Network/HTTP/Lucu/Parser.hs
index 0d33a85..ce43718 100644
--- a/Network/HTTP/Lucu/Parser.hs
+++ b/Network/HTTP/Lucu/Parser.hs
@@ -1,144 +1,20 @@
+{-# LANGUAGE
+    UnicodeSyntax
+  #-}
+-- |This is an auxiliary parser utilities. You usually don't have to
+-- use this module directly.
 module Network.HTTP.Lucu.Parser
-    ( Parser(..)
-    , ParserResult(..)
-    , parse     -- Parser a -> ByteString -> ParserResult a
-    , anyChar   -- Parser Char
-    , satisfy   -- (Char -> Bool) -> Parser Char
-    , char      -- Char -> Parser Char
-    , string    -- String -> Parser String
-    , (<|>)     -- Parser a -> Parser a -> Parser a
-    , oneOf     -- [Char] -> Parser Char
-    , digit     -- Parser Char
-    , notFollowedBy -- Parser a -> Parser ()
-    , many      -- Parser a -> Parser [a]
-    , many1     -- Parser a -> Parser [a]
-    , manyTill  -- Parser a -> Parser end -> Parser [a]
-    , many1Till -- Parser a -> Parser end -> Parser [a]
-    , option    -- a -> Parser a -> Parser a
-    , sp        -- Parser Char
-    , ht        -- Parser Char
-    , crlf      -- Parser String
+    ( atMost
     )
     where
-
-import           Control.Monad
-import           Control.Monad.State
-import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
-
-data Parser a = Parser {
-      runParser :: State ByteString (ParserResult a)
-    }
-
-data ParserResult a = Success a
-                    | IllegalInput -- 受理出來ない入力があった
-                    | ReachedEOF   -- 限界を越えて讀まうとした
-
-
---  (>>=) :: Parser a -> (a -> Parser b) -> Parser b
-instance Monad Parser where
-    p >>= f = Parser $ do saved  <- get -- 失敗した時の爲に状態を保存
-                          result <- runParser p
-                          case result of
-                            Success a    -> runParser (f a)
-                            IllegalInput -> do put saved -- 状態を復歸
-                                               return IllegalInput
-                            ReachedEOF   -> return ReachedEOF
-    return = Parser . return . Success
-    fail _ = Parser $ return IllegalInput
-
-
-parse :: Parser a -> ByteString -> (ParserResult a, ByteString)
-parse p input = runState (runParser p) input
-
-
-anyChar :: Parser Char
-anyChar = Parser $ do input <- get
-                      if B.null input then
-                          return ReachedEOF
-                        else
-                          do let c = B.head input
-                             put (B.tail input)
-                             return (Success c)
-
-
-satisfy :: (Char -> Bool) -> Parser Char
-satisfy f = do c <- anyChar
-               unless (f c) (fail "")
-               return c
-
-
-char :: Char -> Parser Char
-char c = satisfy (== c)
-
-
-string :: String -> Parser String
-string str = do mapM_ char str
-                return str
-
-
-infixr 0 <|>
-
-(<|>) :: Parser a -> Parser a -> Parser a
-f <|> g = Parser $ do saved  <- get -- 状態を保存
-                      result <- runParser f
-                      case result of
-                        Success a    -> return $ Success a
-                        IllegalInput -> do put saved -- 状態を復歸
-                                           runParser g
-                        ReachedEOF   -> return ReachedEOF
-
-
-oneOf :: [Char] -> Parser Char
-oneOf = foldl (<|>) (fail "") . map char
-
-
-notFollowedBy :: Parser a -> Parser ()
-notFollowedBy p = p >>= fail "" <|> return ()
-
-
-digit :: Parser Char
-digit = oneOf "0123456789"
-
-
-many :: Parser a -> Parser [a]
-many p = do x  <- p
-            xs <- many p
-            return (x:xs)
-         <|>
-         return []
-
-
-many1 :: Parser a -> Parser [a]
-many1 p = do ret <- many p
-             case ret of
-               [] -> fail ""
-               xs -> return xs
-
-
-manyTill :: Parser a -> Parser end -> Parser [a]
-manyTill p end = many $ do x <- p
-                           end
-                           return x
-
-
-many1Till :: Parser a -> Parser end -> Parser [a]
-many1Till p end = many1 $ do x <- p
-                             end
-                             return x
-
-
-option :: a -> Parser a -> Parser a
-option def p = p <|> return def
-
-
-sp :: Parser Char
-sp = char ' '
-
-
-ht :: Parser Char
-ht = char '\t'
-
-
-crlf :: Parser String
-crlf = string "\x0d\x0a"
+import Control.Applicative
+import Control.Applicative.Unicode
+
+-- |@'atMost' n v@ is like @'P.many' v@ but accumulates @v@ at most
+-- @n@ times.
+atMost ∷ Alternative f ⇒ Int → f a → f [a]
+{-# INLINE atMost #-}
+atMost 0 _ = pure []
+atMost n v = ( (:) <$> v ⊛ atMost (n-1) v )
+             <|>
+             pure []