slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: reorder code for reading include files

Browse Source 
This should be before all journal and parser state manipulations,
so that those can be readily factored in a few commits time.
This commit is contained in:
Joseph Weston 2018-07-22 23:03:18 +02:00 committed by Simon Michael
parent c6c412632b
commit 9e56ad24e2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hledger-lib/Hledger/Read/JournalReader.hs
View File

@ -191,11 +191,6 @@ includedirectivep = do
lift (skipSome spacenonewline) lift (skipSome spacenonewline)
filename <- T.unpack <$> takeWhileP Nothing (/= '\n') -- don't consume newline yet filename <- T.unpack <$> takeWhileP Nothing (/= '\n') -- don't consume newline yet
-- save parent state
parentParserState <- getParserState
parentj <- get
let childj = newJournalWithParseStateFrom parentj
parentpos <- getPosition parentpos <- getPosition
-- read child input -- read child input
@ -203,6 +198,12 @@ includedirectivep = do
filepath <- lift $ expandPath curdir filename `orRethrowIOError` (show parentpos ++ " locating " ++ filename) filepath <- lift $ expandPath curdir filename `orRethrowIOError` (show parentpos ++ " locating " ++ filename)
childInput <- lift $ readFilePortably filepath `orRethrowIOError` (show parentpos ++ " reading " ++ filepath) childInput <- lift $ readFilePortably filepath `orRethrowIOError` (show parentpos ++ " reading " ++ filepath)
-- save parent state
parentParserState <- getParserState
parentj <- get
let childj = newJournalWithParseStateFrom parentj
-- set child state -- set child state
setInput childInput setInput childInput
pushPosition $ initialPos filepath pushPosition $ initialPos filepath