simonmichael/hledger
1
1
Fork 0
mirror of https://github.com/simonmichael/hledger.git synced 2024-09-20 02:37:12 +03:00
Code Issues Projects Releases Wiki Activity

lib: avoid shady Not (Or []) in account type queries

Browse Source
This commit is contained in:
Simon Michael 2021-02-13 14:58:06 -08:00
parent 6c392e9f43
commit b31e40ceca
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hledger-lib/Hledger/Data/Journal.hs
View File

@ -338,7 +338,8 @@ journalAccountTypeQuery atypes fallbackregex Journal{jdeclaredaccounttypes} =
concat $ mapMaybe (`M.lookup` jdeclaredaccounttypes) atypes
in case declaredacctsoftype of
[] -> Acct fallbackregex
as -> And [ Or acctnameRegexes , Not $ Or differentlyTypedRegexes ]
as -> And $ [ Or acctnameRegexes ]
++ if null differentlyTypedRegexes then [] else [ Not $ Or differentlyTypedRegexes ]
where
-- XXX Query isn't able to match account type since that requires extra info from the journal.
-- So we do a hacky search by name instead.