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

fix:journal: consistent error message when include has no argument

Browse Source
This commit is contained in:
Simon Michael 2025-12-01 05:45:10 -08:00
parent 92a3ea48f9
commit 00f6a832d4
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,16 +304,21 @@ includedirectivep iopts = do
-- save the position at start of include directive, for error messages -- save the position at start of include directive, for error messages
eoff <- getOffset eoff <- getOffset
pos <- getSourcePos pos <- getSourcePos
let errorNoArg = customFailure $ parseErrorAt eoff "include needs a file path or glob pattern argument"
-- parse the directive -- parse the directive
string "include" string "include"
lift skipNonNewlineSpaces1 -- notFollowedBy newline <?> "a file path or glob pattern argument"
prefixedglob <- rstrip . T.unpack <$> takeWhileP Nothing (`notElem` [';','\n']) prefixedglob <- (do
lift followingcommentp lift skipNonNewlineSpaces1
prefixedglob <- rstrip . T.unpack <$> takeWhileP Nothing (`notElem` [';','\n'])
lift followingcommentp
return prefixedglob
) <|> errorNoArg
let (mprefix,glb) = splitReaderPrefix prefixedglob let (mprefix,glb) = splitReaderPrefix prefixedglob
parentf <- sourcePosFilePath pos -- a little slow, don't do too often parentf <- sourcePosFilePath pos -- a little slow, don't do too often
when (null $ dbg6 (parentf <> " include: glob pattern") glb) $ when (null $ dbg6 (parentf <> " include: glob pattern") glb) errorNoArg
customFailure $ parseErrorAt eoff $ "include needs a file path or glob pattern argument"
-- Find the file or glob-matched files (just the ones from this include directive), with some IO error checking. -- Find the file or glob-matched files (just the ones from this include directive), with some IO error checking.
-- Also report whether a glob pattern was used, and not just a literal file path. -- Also report whether a glob pattern was used, and not just a literal file path.