lib: clarify checkBalanceAssertion etc.

hledger-lib/Hledger/Data/Journal.hs

@@ -1,5 +1,7 @@
 {-# LANGUAGE Rank2Types #-}
-{-# LANGUAGE StandaloneDeriving, OverloadedStrings #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE CPP #-}
 
 {-|
@@ -569,24 +571,26 @@ journalCheckBalanceAssertions j =
 -- | Check a posting's balance assertion and return an error if it
 -- fails.
 checkBalanceAssertion :: Posting -> MixedAmount -> Either String ()
-checkBalanceAssertion p@Posting{ pbalanceassertion = Just ass } bal =
+checkBalanceAssertion p@Posting{pbalanceassertion=Just (BalanceAssertion{baamount,baexact})} actualbal =
-  foldl' fold (Right ()) amts
+  foldl' f (Right ()) assertedamts
-    where fold (Right _) cass = checkBalanceAssertionCommodity p cass bal
+    where
-          fold err _ = err
+      f (Right _) assertedamt = checkBalanceAssertionCommodity p assertedamt actualbal
-          amt = baamount ass
+      f err _                 = err
-          amts = amt : if baexact ass
+      assertedamts = baamount : otheramts
-            then map (\a -> a{ aquantity = 0 }) $ amounts $ filterMixedAmount (\a -> acommodity a /= assertedcomm) bal
+        where
-            else []
+          assertedcomm = acommodity baamount
-          assertedcomm = acommodity amt
+          otheramts | baexact   = map (\a -> a{ aquantity = 0 }) $ amounts $ filterMixedAmount (\a -> acommodity a /= assertedcomm) actualbal
+                    | otherwise = []
 checkBalanceAssertion _ _ = Right ()
 
 checkBalanceAssertionCommodity :: Posting -> Amount -> MixedAmount -> Either String ()
-checkBalanceAssertionCommodity p amt bal
+checkBalanceAssertionCommodity p assertedamt actualbal
   | isReallyZeroAmount diff = Right ()
   | True              = Left err
-    where assertedcomm = acommodity amt
+    where
-          actualbal = fromMaybe nullamt $ find ((== assertedcomm) . acommodity) (amounts bal)
+      assertedcomm = acommodity assertedamt
-          diff = amt - actualbal
+      actualbalincommodity = fromMaybe nullamt $ find ((== assertedcomm) . acommodity) (amounts actualbal)
+      diff = assertedamt - actualbalincommodity
       diffplus | isNegativeAmount diff == False = "+"
                | otherwise = ""
       err = printf (unlines
@@ -609,14 +613,15 @@ checkBalanceAssertionCommodity p amt bal
         (showDate $ postingDate p)
         (T.unpack $ paccount p) -- XXX pack
         assertedcomm
-            (showAmount actualbal)
+        (showAmount actualbalincommodity)
-            (showAmount amt)
+        (showAmount assertedamt)
         (diffplus ++ showAmount diff)
 
 -- | Fill in any missing amounts and check that all journal transactions
--- balance, or return an error message. This is done after parsing all
+-- balance and all balance assertions pass, or return an error message.
--- amounts and applying canonical commodity styles, since balancing
+-- This is done after parsing all amounts and applying canonical
--- depends on display precision. Reports only the first error encountered.
+-- commodity styles, since balancing depends on display precision.
+-- Reports only the first error encountered.
 journalBalanceTransactions :: Bool -> Journal -> Either String Journal
 journalBalanceTransactions assrt j =
   runST $ journalBalanceTransactionsST 
@@ -627,6 +632,8 @@ journalBalanceTransactions assrt j =
     (fmap (\txns -> j{ jtxns = txns}) . getElems) -- summarise state
 
 -- | Helper used by 'journalBalanceTransactions' and 'journalCheckBalanceAssertions'.
+-- Balances transactions, applies balance assignments, and checks balance assertions
+-- at the same time.
 journalBalanceTransactionsST ::
   Bool
   -> Journal