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

;cln:import: update some Haddock strings to reflect #2158

Browse Source 
Signed-off-by: Jonathan Dowland <jon@dow.land>
This commit is contained in:
Jonathan Dowland 2024-03-01 17:58:28 +00:00
parent 71684f5611
commit 1424a1f2f1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hledger-lib/Hledger/Read/RulesReader.hs
View File

@ -715,7 +715,7 @@ hledgerField rules record f = fmap
(getEffectiveAssignment rules record f) (getEffectiveAssignment rules record f)
-- | Look up the final value assigned to a hledger field, with csv field -- | Look up the final value assigned to a hledger field, with csv field
-- references interpolated. -- references and regular expression match group references interpolated.
hledgerFieldValue rules record f = (flip fmap) (getEffectiveAssignment rules record f) hledgerFieldValue rules record f = (flip fmap) (getEffectiveAssignment rules record f)
$ either (renderTemplate rules record) $ either (renderTemplate rules record)
$ \cb -> let $ \cb -> let
@ -730,9 +730,10 @@ maybeNegate :: MatcherPrefix -> Bool -> Bool
maybeNegate Not origbool = not origbool maybeNegate Not origbool = not origbool
maybeNegate _ origbool = origbool maybeNegate _ origbool = origbool
-- | Given the conversion rules, a CSV record and a hledger field name, find -- | Given the conversion rules, a CSV record and a hledger field name, collect
-- the value template ultimately assigned to this field, if any, by a field -- the value templates (and their parent Conditional Blocks where applicable)
-- assignment at top level or in a conditional block matching this record. -- assigned to this field, if any, by top-level field assignments and
-- conditional blocks matching this record.
-- --
-- Note conditional blocks' patterns are matched against an approximation of the -- Note conditional blocks' patterns are matched against an approximation of the
-- CSV record: all the field values, without enclosing quotes, comma-separated. -- CSV record: all the field values, without enclosing quotes, comma-separated.
@ -748,7 +749,7 @@ getEffectiveAssignment rules record f = lastMay assignments
assignments = dbg9 "csv assignments" $ toplevelassignments ++ conditionalassignments assignments = dbg9 "csv assignments" $ toplevelassignments ++ conditionalassignments
-- all top level field assignments -- all top level field assignments
toplevelassignments = map (Left . snd) $ filter ((==f).fst) $ rassignments rules toplevelassignments = map (Left . snd) $ filter ((==f).fst) $ rassignments rules
-- all field assignments in conditional blocks assigning to field f and active for the current csv record -- all conditional blocks assigning to field f and active for the current csv record
conditionalassignments = map Right conditionalassignments = map Right
$ filter (any (==f) . map fst . cbAssignments) $ filter (any (==f) . map fst . cbAssignments)
$ filter (isBlockActive rules record) $ filter (isBlockActive rules record)