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

fix: journal: parse include directives with trailing whitespace

Browse Source 
[https://github.com/adept/full-fledged-hledger/issues/29]
This commit is contained in:
Simon Michael 2024-05-02 07:26:12 -10:00
parent 89de1ae764
commit 490a46fcd2
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,7 +291,7 @@ includedirectivep :: MonadIO m => ErroringJournalParser m ()
includedirectivep = do includedirectivep = do
string "include" string "include"
lift skipNonNewlineSpaces1 lift skipNonNewlineSpaces1
prefixedglob <- T.unpack <$> takeWhileP Nothing (/= '\n') -- don't consume newline yet prefixedglob <- rstrip . T.unpack <$> takeWhileP Nothing (/= '\n') -- don't consume newline yet
parentoff <- getOffset parentoff <- getOffset
parentpos <- getSourcePos parentpos <- getSourcePos
let (mprefix,glb) = splitReaderPrefix prefixedglob let (mprefix,glb) = splitReaderPrefix prefixedglob

15
hledger/test/journal/include.test
View File

@ -54,14 +54,19 @@ $ hledger -f - print
>2 // >2 //
>= 1 >= 1
# ** 5. include nonexsitant file # ** 5. include nonexistent file
< <
include doesnotexist.journal include doesnotexist.journal
$ hledger -f - print $ hledger -f - print
>2 // >2 //
>= 1 >= 1
# ** 6. include relative to home # ** 6. trailing whitespace after the filename does not make a file nonexistent
<
include a.timeclock
$ hledger -f - check
# ** 7. include relative to home
< <
include ~/included.journal include ~/included.journal
$ printf '2018/01/01\n (A) 1\n' >included.journal; HOME="$PWD" hledger -f - print; rm -rf included.journal $ printf '2018/01/01\n (A) 1\n' >included.journal; HOME="$PWD" hledger -f - print; rm -rf included.journal
@ -73,17 +78,17 @@ $ printf '2018/01/01\n (A) 1\n' >included.journal; HOME="$PWD" hledger -f - pr
# The next tests require hard coded file names, so are not concurrent-safe. # The next tests require hard coded file names, so are not concurrent-safe.
# They use different file names so a single concurrent shelltest invocation will be fine. # They use different file names so a single concurrent shelltest invocation will be fine.
# ** 7. test that order of include files is maintained # ** 8. test that order of include files is maintained
$ printf 'include _b\n' >_a; touch _b; hledger -f _a stats -v | grep _ | sed -e 's%.*/%%'; rm -rf _a _b $ printf 'include _b\n' >_a; touch _b; hledger -f _a stats -v | grep _ | sed -e 's%.*/%%'; rm -rf _a _b
_a _a
_b _b
# ** 8. and with --auto code path # ** 9. and with --auto code path
$ printf 'include _d\n=\n' >_c; touch _d; hledger -f _c stats -v --auto | grep _ | sed -e 's%.*/%%'; rm -rf _c _d $ printf 'include _d\n=\n' >_c; touch _d; hledger -f _c stats -v --auto | grep _ | sed -e 's%.*/%%'; rm -rf _c _d
_c _c
_d _d
# ** 9. include using old !include directive # ** 10. include using old !include directive
< <
!include f.journal !include f.journal
$ printf '2018/01/01\n (A) 1\n' >f.journal; hledger -f - print; rm -f f.journal $ printf '2018/01/01\n (A) 1\n' >f.journal; hledger -f - print; rm -f f.journal