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

dev: Hledger.Query.matchesCommodity: check all query types, not just cur:

Browse Source 
And default to False (unlike the other match functions. Ok ?)
This commit is contained in:
Simon Michael 2025-06-14 16:09:08 -10:00
parent 13109ac280
commit 38aadddf7b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hledger-lib/Hledger/Query.hs
View File

@ -813,8 +813,14 @@ inAccountQuery (QueryOptInAcct a : _) = Just . Acct $ accountNameToAccountRe
-- matching things with queries -- matching things with queries
matchesCommodity :: Query -> CommoditySymbol -> Bool matchesCommodity :: Query -> CommoditySymbol -> Bool
matchesCommodity (Sym r) = regexMatchText r matchesCommodity (Sym r) s = regexMatchText r s
matchesCommodity _ = const True matchesCommodity (Any) _ = True
matchesCommodity (None) _ = False
matchesCommodity (Or qs) s = any (`matchesCommodity` s) qs
matchesCommodity (And qs) s = all (`matchesCommodity` s) qs
matchesCommodity (AnyPosting qs) s = all (`matchesCommodity` s) qs
matchesCommodity (AllPostings qs) s = all (`matchesCommodity` s) qs
matchesCommodity _ _ = False
-- | Does the match expression match this (simple) amount ? -- | Does the match expression match this (simple) amount ?
matchesAmount :: Query -> Amount -> Bool matchesAmount :: Query -> Amount -> Bool