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

;dev: cleanup [#2202]

Browse Source
This commit is contained in:
Simon Michael 2024-06-10 08:46:13 +01:00
parent e89bea8563
commit 5b83e5c2f0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,11 +256,11 @@ journalConcat j1 j2 =
,jdeclaredtags = jdeclaredtags j1 <> jdeclaredtags j2
,jdeclaredaccounts = jdeclaredaccounts j1 <> jdeclaredaccounts j2
--
-- The next six fields are Maps, which need be merged carefully for correct semantics,
-- especially the first two, which have list values. These are not all fully tested.
-- The next six fields are Maps, which need to be merged carefully for correct semantics,
-- especially the first two, which have list values. There may still be room for improvement here.
--
-- ,jdeclaredaccounttags :: M.Map AccountName [Tag]
-- jdeclaredaccounttags can have multiple duplicated/conflicting values for an account tag.
-- jdeclaredaccounttags can have multiple duplicated/conflicting values for an account's tag.
,jdeclaredaccounttags = M.unionWith (<>) (jdeclaredaccounttags j1) (jdeclaredaccounttags j2)
--
-- ,jdeclaredaccounttypes :: M.Map AccountType [AccountName]
@ -268,7 +268,7 @@ journalConcat j1 j2 =
,jdeclaredaccounttypes = M.unionWith (<>) (jdeclaredaccounttypes j1) (jdeclaredaccounttypes j2)
--
-- ,jaccounttypes :: M.Map AccountName AccountType
-- jaccounttypes always has a single type for a given account. When there are multiple type declarations, it is the last/rightmost.
-- jaccounttypes has a single type for any given account. When it had multiple type declarations, the last/rightmost wins.
,jaccounttypes = M.unionWith (const id) (jaccounttypes j1) (jaccounttypes j2)
--
-- ,jglobalcommoditystyles :: M.Map CommoditySymbol AmountStyle