;timedot: update parser tracing
This commit is contained in:
parent
cc928c0096
commit
8535939f33
@ -46,13 +46,12 @@ import Text.Megaparsec.Char
|
|||||||
|
|
||||||
import Hledger.Data
|
import Hledger.Data
|
||||||
import Hledger.Read.Common
|
import Hledger.Read.Common
|
||||||
import Hledger.Utils hiding (traceParse)
|
import Hledger.Utils
|
||||||
|
|
||||||
-- easier to toggle this here sometimes
|
-- traceparse :: Monad m => a -> m a
|
||||||
-- import qualified Hledger.Utils (parsertrace)
|
-- traceparse = return
|
||||||
-- parsertrace = Hledger.Utils.parsertrace
|
traceparse :: String -> JournalParser m ()
|
||||||
traceParse :: Monad m => a -> m a
|
traceparse = lift.traceParse
|
||||||
traceParse = return
|
|
||||||
|
|
||||||
reader :: Reader
|
reader :: Reader
|
||||||
reader = Reader
|
reader = Reader
|
||||||
@ -73,7 +72,7 @@ timedotfilep = do many timedotfileitemp
|
|||||||
where
|
where
|
||||||
timedotfileitemp :: JournalParser m ()
|
timedotfileitemp :: JournalParser m ()
|
||||||
timedotfileitemp = do
|
timedotfileitemp = do
|
||||||
traceParse "timedotfileitemp"
|
traceparse "timedotfileitemp"
|
||||||
choice [
|
choice [
|
||||||
void $ lift emptyorcommentlinep
|
void $ lift emptyorcommentlinep
|
||||||
,timedotdayp >>= \ts -> modify' (addTransactions ts)
|
,timedotdayp >>= \ts -> modify' (addTransactions ts)
|
||||||
@ -91,7 +90,7 @@ addTransactions ts j = foldl' (flip ($)) j (map addTransaction ts)
|
|||||||
-- @
|
-- @
|
||||||
timedotdayp :: JournalParser m [Transaction]
|
timedotdayp :: JournalParser m [Transaction]
|
||||||
timedotdayp = do
|
timedotdayp = do
|
||||||
traceParse " timedotdayp"
|
traceparse " timedotdayp"
|
||||||
d <- datep <* lift eolof
|
d <- datep <* lift eolof
|
||||||
es <- catMaybes <$> many (const Nothing <$> try (lift emptyorcommentlinep) <|>
|
es <- catMaybes <$> many (const Nothing <$> try (lift emptyorcommentlinep) <|>
|
||||||
Just <$> (notFollowedBy datep >> timedotentryp))
|
Just <$> (notFollowedBy datep >> timedotentryp))
|
||||||
@ -103,7 +102,7 @@ timedotdayp = do
|
|||||||
-- @
|
-- @
|
||||||
timedotentryp :: JournalParser m Transaction
|
timedotentryp :: JournalParser m Transaction
|
||||||
timedotentryp = do
|
timedotentryp = do
|
||||||
traceParse " timedotentryp"
|
traceparse " timedotentryp"
|
||||||
pos <- genericSourcePos <$> getSourcePos
|
pos <- genericSourcePos <$> getSourcePos
|
||||||
lift (skipMany spacenonewline)
|
lift (skipMany spacenonewline)
|
||||||
a <- modifiedaccountnamep
|
a <- modifiedaccountnamep
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user