X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Lucu.git;a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FParser.hs;h=0033eb482e88b80d111b2aededf9705c5cbb8ac5;hp=4c44f0be3e7dfa75d74b0af3bd05260d3f5b47e9;hb=858129cb755aa09da2b7bd758efb8519f2c89103;hpb=5b255535f2c7d2a6d4622ad164b31e63746b906e

diff --git a/Network/HTTP/Lucu/Parser.hs b/Network/HTTP/Lucu/Parser.hs
index 4c44f0b..0033eb4 100644
--- a/Network/HTTP/Lucu/Parser.hs
+++ b/Network/HTTP/Lucu/Parser.hs
@@ -55,7 +55,7 @@ import qualified Data.ByteString.Lazy.Char8 as B
 import           Data.ByteString.Lazy.Char8 (ByteString)
 
 -- |@Parser a@ is obviously a parser which parses and returns @a@.
-data Parser a = Parser {
+newtype Parser a = Parser {
       runParser :: State ParserState (ParserResult a)
     }
 
@@ -63,7 +63,7 @@ type ParserState = (ByteString, IsEOFFatal)
 
 type IsEOFFatal = Bool
 
-data ParserResult a = Success a
+data ParserResult a = Success !a
                     | IllegalInput -- 受理出來ない入力があった
                     | ReachedEOF   -- 限界を越えて讀まうとした
                       deriving (Eq, Show)
@@ -71,72 +71,81 @@ data ParserResult a = Success a
 
 --  (>>=) :: Parser a -> (a -> Parser b) -> Parser b
 instance Monad Parser where
-    p >>= f = Parser $ do saved@(_, isEOFFatal) <- get -- 失敗した時の爲に状態を保存
-                          result <- runParser p
-                          case result of
-                            Success a    -> runParser (f a)
-                            IllegalInput -> do put saved -- 状態を復歸
-                                               return IllegalInput
-                            ReachedEOF   -> do unless isEOFFatal
-                                                          $ put saved -- 状態を復歸
-                                               return ReachedEOF
-    return = Parser . return . Success
-    fail _ = Parser $ return IllegalInput
+    p >>= f = Parser $! do saved@(_, isEOFFatal) <- get -- 失敗した時の爲に状態を保存
+                           result <- runParser p
+                           case result of
+                             Success a    -> a `seq` runParser (f a)
+                             IllegalInput -> do put saved -- 状態を復歸
+                                                return IllegalInput
+                             ReachedEOF   -> do unless isEOFFatal
+                                                           $ put saved -- 状態を復歸
+                                                return ReachedEOF
+    return x = x `seq` Parser $! return $! Success x
+    fail _   = Parser $! return $! IllegalInput
 
 -- |@'parse' p bstr@ parses @bstr@ with @p@ and returns @(result,
 -- remaining)@.
 parse :: Parser a -> ByteString -> (ParserResult a, ByteString)
-parse p input = let (result, (input', _)) = runState (runParser p) (input, True)
-                in
-                  (result, input')
+parse p input -- input は lazy である必要有り。
+    = p `seq`
+      let (result, (input', _)) = runState (runParser p) (input, True)
+      in
+        result `seq` (result, input') -- input' も lazy である必要有り。
 
 -- |@'parseStr' p str@ packs @str@ and parses it.
 parseStr :: Parser a -> String -> (ParserResult a, ByteString)
-parseStr p input = parse p $ B.pack input
+parseStr p input
+    = p `seq` -- input は lazy である必要有り。
+      parse p $! B.pack input
 
 
 anyChar :: Parser Char
-anyChar = Parser $ do (input, isEOFFatal) <- get
-                      if B.null input then
-                          return ReachedEOF
-                        else
-                          do let c = B.head input
-                             put (B.tail input, isEOFFatal)
-                             return (Success c)
+anyChar = Parser $!
+          do (input, isEOFFatal) <- get
+             if B.null input then
+                 return ReachedEOF
+               else
+                 do let c = B.head input
+                    put (B.tail input, isEOFFatal)
+                    return (Success c)
 
 
 eof :: Parser ()
-eof = Parser $ do (input, _) <- get
-                  if B.null input then
-                      return $ Success ()
-                    else
-                      return IllegalInput
+eof = Parser $!
+      do (input, _) <- get
+         if B.null input then
+             return $ Success ()
+           else
+             return IllegalInput
 
 -- |@'allowEOF' p@ makes @p@ treat reaching EOF a normal failure.
 allowEOF :: Parser a -> Parser a
-allowEOF f = Parser $ do (input, isEOFFatal) <- get
-                         put (input, False)
+allowEOF f = f `seq`
+             Parser $! do (input, isEOFFatal) <- get
+                          put (input, False)
 
-                         result <- runParser f
+                          result <- runParser f
                          
-                         (input', _) <- get
-                         put (input', isEOFFatal)
+                          (input', _) <- get
+                          put (input', isEOFFatal)
 
-                         return result
+                          return result
 
 
 satisfy :: (Char -> Bool) -> Parser Char
-satisfy f = do c <- anyChar
+satisfy f = f `seq`
+            do c <- anyChar
                unless (f c) (fail "")
                return c
 
 
 char :: Char -> Parser Char
-char c = satisfy (== c)
+char c = c `seq` satisfy (== c)
 
 
 string :: String -> Parser String
-string str = do mapM_ char str
+string str = str `seq`
+             do mapM_ char str
                 return str
 
 
@@ -145,17 +154,19 @@ infixr 0 <|>
 -- |This is the backtracking alternation. There is no non-backtracking
 -- equivalent.
 (<|>) :: Parser a -> Parser a -> Parser a
-f <|> g = Parser $ do saved@(_, isEOFFatal) <- get -- 状態を保存
-                      result <- runParser f
-                      case result of
-                        Success a    -> return $ Success a
-                        IllegalInput -> do put saved -- 状態を復歸
-                                           runParser g
-                        ReachedEOF   -> if isEOFFatal then
-                                            return ReachedEOF
-                                        else
-                                            do put saved
-                                               runParser g
+f <|> g
+    = f `seq` g `seq`
+      Parser $! do saved@(_, isEOFFatal) <- get -- 状態を保存
+                   result <- runParser f
+                   case result of
+                     Success a    -> return $ Success a
+                     IllegalInput -> do put saved -- 状態を復歸
+                                        runParser g
+                     ReachedEOF   -> if isEOFFatal then
+                                         return ReachedEOF
+                                     else
+                                         do put saved
+                                            runParser g
 
 
 oneOf :: [Char] -> Parser Char
@@ -163,7 +174,8 @@ oneOf = foldl (<|>) (fail "") . map char
 
 
 notFollowedBy :: Parser a -> Parser ()
-notFollowedBy p = p >>= fail "" <|> return ()
+notFollowedBy p = p `seq`
+                  p >>= fail "" <|> return ()
 
 
 digit :: Parser Char
@@ -185,7 +197,8 @@ hexDigit = do c <- anyChar
 
 
 many :: Parser a -> Parser [a]
-many p = do x  <- p
+many p = p `seq`
+         do x  <- p
             xs <- many p
             return (x:xs)
          <|>
@@ -193,42 +206,51 @@ many p = do x  <- p
 
 
 many1 :: Parser a -> Parser [a]
-many1 p = do ret <- many p
+many1 p = p `seq`
+          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
+manyTill p end
+    = p `seq` end `seq`
+      many $! do x <- p
+                 end
+                 return x
 
 
 many1Till :: Parser a -> Parser end -> Parser [a]
-many1Till p end = many1 $ do x <- p
-                             end
-                             return x
+many1Till p end
+    = p `seq` end `seq`
+      many1 $! do x <- p
+                  end
+                  return x
 
 
 count :: Int -> Parser a -> Parser [a]
 count 0 _ = return []
-count n p = do x  <- p
+count n p = n `seq` p `seq`
+            do x  <- p
                xs <- count (n-1) p
                return (x:xs)
 
-
+-- def may be a _|_
 option :: a -> Parser a -> Parser a
-option def p = p <|> return def
+option def p = p `seq`
+               p <|> return def
 
 
 sepBy :: Parser a -> Parser sep -> Parser [a]
-sepBy p sep = sepBy1 p sep <|> return []
+sepBy p sep = p `seq` sep `seq`
+              sepBy1 p sep <|> return []
 
 
 sepBy1 :: Parser a -> Parser sep -> Parser [a]
-sepBy1 p sep = do x  <- p
-                  xs <- many $ sep >> p
+sepBy1 p sep = p `seq` sep `seq`
+               do x  <- p
+                  xs <- many $! sep >> p
                   return (x:xs)