From 5b83e5c2f01f82f634364807111a0c4fc658990a Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 10 Jun 2024 08:46:13 +0100 Subject: [PATCH] ;dev: cleanup [#2202] --- hledger-lib/Hledger/Data/Journal.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hledger-lib/Hledger/Data/Journal.hs b/hledger-lib/Hledger/Data/Journal.hs index 3db804126..76a284e7a 100644 --- a/hledger-lib/Hledger/Data/Journal.hs +++ b/hledger-lib/Hledger/Data/Journal.hs @@ -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