X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FParser.hs;h=bbe16a3d80b8bd3d4da6f2263fbe995f9cf3fd75;hb=e53a2f3202f763e844de725712f1bf26b82cd41f;hp=cc12cd73733b636ce3270e8518d137ade2eb3266;hpb=7b3c7c2c5be4fc05ee03008aa0af56fab798e1bb;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Parser.hs b/Network/HTTP/Lucu/Parser.hs
index cc12cd7..bbe16a3 100644
--- a/Network/HTTP/Lucu/Parser.hs
+++ b/Network/HTTP/Lucu/Parser.hs
@@ -1,7 +1,8 @@
--- |Yet another parser combinator. This is mostly a subset of Parsec
--- but there are some differences:
+-- |Yet another parser combinator. This is mostly a subset of
+-- "Text.ParserCombinators.Parsec" but there are some differences:
 --
--- * This parser works on ByteString instead of String.
+-- * This parser works on 'Data.ByteString.Base.LazyByteString'
+--   instead of 'Prelude.String'.
 --
 -- * Backtracking is the only possible behavior so there is no \"try\"
 --   action.
@@ -50,11 +51,11 @@ module Network.HTTP.Lucu.Parser
     where
 
 import           Control.Monad.State.Strict
+import           Data.ByteString.Base (LazyByteString)
+import           Data.ByteString.Lazy ()
 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@.
+-- |@'Parser' a@ is obviously a parser which parses and returns @a@.
 newtype Parser a = Parser {
       runParser :: State ParserState (ParserResult a)
     }
@@ -62,7 +63,7 @@ newtype Parser a = Parser {
 
 data ParserState
     = PST {
-        pstInput      :: ByteString
+        pstInput      :: LazyByteString
       , pstIsEOFFatal :: !Bool
       }
     deriving (Eq, Show)
@@ -87,24 +88,25 @@ instance Monad Parser where
     return x = x `seq` Parser $! return $! Success x
     fail _   = Parser $! return $! IllegalInput
 
--- |@'failP'@ is just a synonym for @'Prelude.fail Prelude.undefined'@.
+-- |@'failP'@ is just a synonym for @'Prelude.fail'
+-- 'Prelude.undefined'@.
 failP :: Parser a
 failP = fail undefined
 
--- |@'parse' p bstr@ parses @bstr@ with @p@ and returns @(result,
--- remaining)@.
-parse :: Parser a -> ByteString -> (ParserResult a, ByteString)
+-- |@'parse' p bstr@ parses @bstr@ with @p@ and returns @(# result,
+-- remaining #)@.
+parse :: Parser a -> LazyByteString -> (# ParserResult a, LazyByteString #)
 parse p input -- input は lazy である必要有り。
     = p `seq`
       let (result, state') = runState (runParser p) (PST input True)
       in
-        result `seq` (result, pstInput state') -- pstInput state' も lazy である必要有り。
+        result `seq` (# result, pstInput state' #) -- pstInput state' も lazy である必要有り。
 
 -- |@'parseStr' p str@ packs @str@ and parses it.
-parseStr :: Parser a -> String -> (ParserResult a, ByteString)
+parseStr :: Parser a -> String -> (# ParserResult a, LazyByteString #)
 parseStr p input
     = p `seq` -- input は lazy である必要有り。
-      parse p $! B.pack input
+      parse p (B.pack input)
 
 
 anyChar :: Parser Char
@@ -142,7 +144,7 @@ allowEOF f = f `seq`
 satisfy :: (Char -> Bool) -> Parser Char
 satisfy f = f `seq`
             do c <- anyChar
-               if f c then
+               if f $! c then
                    return c
                  else
                    failP
@@ -165,7 +167,7 @@ infixr 0 <|>
 (<|>) :: Parser a -> Parser a -> Parser a
 f <|> g
     = f `seq` g `seq`
-      Parser $! do saved <- get -- 状態を保存
+      Parser $! do saved  <- get -- 状態を保存
                    result <- runParser f
                    case result of
                      Success a    -> return $! Success a
@@ -183,8 +185,17 @@ oneOf = foldl (<|>) failP . map char
 
 
 notFollowedBy :: Parser a -> Parser ()
-notFollowedBy p = p `seq`
-                  (p >> failP) <|> return ()
+notFollowedBy p
+    = p `seq`
+      Parser $! do saved  <- get -- 状態を保存
+                   result <- runParser p
+                   case result of
+                     Success a    -> do put saved -- 状態を復歸
+                                        return IllegalInput
+                     IllegalInput -> do put saved -- 状態を復歸
+                                        return $! Success ()
+                     ReachedEOF   -> do put saved -- 状態を復歸
+                                        return $! Success ()
 
 
 digit :: Parser Char