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

dev: includedirectivep: cleanups, docs

Browse Source
This commit is contained in:
Simon Michael 2025-07-11 10:49:19 -07:00
parent 9418807ddc
commit 2815a1865f
1 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,11 +304,13 @@ includedirectivep = do
Nothing -> paths Nothing -> paths
Just fmt -> map ((show fmt++":")++) paths Just fmt -> map ((show fmt++":")++) paths
-- parse them inline -- parse them inline
forM_ prefixedpaths $ parseChild parentpos forM_ prefixedpaths $ parseIncludedFile parentpos
where where
getFilePaths
:: MonadIO m => Int -> SourcePos -> FilePath -> JournalParser m [FilePath] -- Find the files matched by a glob pattern, using the current parse context
-- for detecting the current directory and for error messages.
getFilePaths :: MonadIO m => Int -> SourcePos -> FilePath -> JournalParser m [FilePath]
getFilePaths parseroff parserpos fileglobpattern = do getFilePaths parseroff parserpos fileglobpattern = do
-- Expand a ~ at the start of the glob pattern, if any. -- Expand a ~ at the start of the glob pattern, if any.
fileglobpattern' <- lift $ expandHomePath fileglobpattern fileglobpattern' <- lift $ expandHomePath fileglobpattern
@ -328,8 +330,11 @@ includedirectivep = do
else customFailure $ parseErrorAt parseroff $ else customFailure $ parseErrorAt parseroff $
"No existing files match pattern: " ++ fileglobpattern "No existing files match pattern: " ++ fileglobpattern
parseChild :: MonadIO m => SourcePos -> PrefixedFilePath -> ErroringJournalParser m () -- Parse the given included file (and any deeper includes, recursively)
parseChild parentpos prefixedpath = do -- as if it was inlined in the current (parent) file.
-- The position in the parent file is provided for error messages.
parseIncludedFile :: MonadIO m => SourcePos -> PrefixedFilePath -> ErroringJournalParser m ()
parseIncludedFile parentpos prefixedpath = do
let (_mprefix,filepath) = splitReaderPrefix prefixedpath let (_mprefix,filepath) = splitReaderPrefix prefixedpath
parentj <- get parentj <- get
@ -372,6 +377,7 @@ includedirectivep = do
-- Update the parse state. -- Update the parse state.
put parentj' put parentj'
where
newJournalWithParseStateFrom :: FilePath -> Journal -> Journal newJournalWithParseStateFrom :: FilePath -> Journal -> Journal
newJournalWithParseStateFrom filepath j = nulljournal{ newJournalWithParseStateFrom filepath j = nulljournal{
jparsedefaultyear = jparsedefaultyear j jparsedefaultyear = jparsedefaultyear j