lib: amultiplier -> aismultiplier
This commit is contained in:
parent
3b0cb701ac
commit
5908414d77
@ -166,7 +166,7 @@ instance Num Amount where
|
||||
|
||||
-- | The empty simple amount.
|
||||
amount, nullamt :: Amount
|
||||
amount = Amount{acommodity="", aquantity=0, aprice=NoPrice, astyle=amountstyle, amultiplier=False}
|
||||
amount = Amount{acommodity="", aquantity=0, aprice=NoPrice, astyle=amountstyle, aismultiplier=False}
|
||||
nullamt = amount
|
||||
|
||||
-- | A temporary value for parsed transactions which had no amount specified.
|
||||
|
||||
@ -47,7 +47,7 @@ import Hledger.Utils.Debug
|
||||
-- 0000/01/01
|
||||
-- ping $1.00
|
||||
-- <BLANKLINE>
|
||||
-- >>> putStr $ showTransaction $ transactionModifierToFunction (TransactionModifier "ping" ["pong" `post` amount{amultiplier=True, aquantity=3}]) nulltransaction{tpostings=["ping" `post` usd 2]}
|
||||
-- >>> putStr $ showTransaction $ transactionModifierToFunction (TransactionModifier "ping" ["pong" `post` amount{aismultiplier=True, aquantity=3}]) nulltransaction{tpostings=["ping" `post` usd 2]}
|
||||
-- 0000/01/01
|
||||
-- ping $2.00
|
||||
-- pong $6.00
|
||||
@ -111,7 +111,7 @@ tmPostingRuleToFunction pr =
|
||||
postingRuleMultiplier :: TMPostingRule -> Maybe Quantity
|
||||
postingRuleMultiplier p =
|
||||
case amounts $ pamount p of
|
||||
[a] | amultiplier a -> Just $ aquantity a
|
||||
[a] | aismultiplier a -> Just $ aquantity a
|
||||
_ -> Nothing
|
||||
|
||||
renderPostingCommentDates :: Posting -> Posting
|
||||
|
||||
@ -203,8 +203,8 @@ instance NFData Commodity
|
||||
data Amount = Amount {
|
||||
acommodity :: CommoditySymbol,
|
||||
aquantity :: Quantity,
|
||||
amultiplier :: Bool, -- ^ kludge: a flag marking this amount and posting as a multiplier
|
||||
-- in a TMPostingRule. In a regular Posting, should always be false.
|
||||
aismultiplier :: Bool, -- ^ kludge: a flag marking this amount and posting as a multiplier
|
||||
-- in a TMPostingRule. In a regular Posting, should always be false.
|
||||
astyle :: AmountStyle,
|
||||
aprice :: Price -- ^ the (fixed, transaction-specific) price for this amount, if any
|
||||
} deriving (Eq,Ord,Typeable,Data,Generic,Show)
|
||||
@ -336,7 +336,7 @@ nulltransactionmodifier = TransactionModifier{
|
||||
|
||||
-- | A transaction modifier transformation, which adds an extra posting
|
||||
-- to the matched posting's transaction.
|
||||
-- Can be like a regular posting, or the amount can have the amultiplier flag set,
|
||||
-- Can be like a regular posting, or the amount can have the aismultiplier flag set,
|
||||
-- indicating that it's a multiplier for the matched posting's amount.
|
||||
type TMPostingRule = Posting
|
||||
|
||||
|
||||
@ -630,7 +630,7 @@ amountwithoutpricep = do
|
||||
let numRegion = (offBeforeNum, offAfterNum)
|
||||
(q,prec,mdec,mgrps) <- lift $ interpretNumber numRegion suggestedStyle ambiguousRawNum mExponent
|
||||
let s = amountstyle{ascommodityside=L, ascommodityspaced=commodityspaced, asprecision=prec, asdecimalpoint=mdec, asdigitgroups=mgrps}
|
||||
return $ nullamt{acommodity=c, aquantity=sign (sign2 q), amultiplier=mult, astyle=s, aprice=NoPrice}
|
||||
return $ nullamt{acommodity=c, aquantity=sign (sign2 q), aismultiplier=mult, astyle=s, aprice=NoPrice}
|
||||
|
||||
rightornosymbolamountp :: Bool -> (Decimal -> Decimal) -> JournalParser m Amount
|
||||
rightornosymbolamountp mult sign = label "amount" $ do
|
||||
@ -646,7 +646,7 @@ amountwithoutpricep = do
|
||||
suggestedStyle <- getAmountStyle c
|
||||
(q,prec,mdec,mgrps) <- lift $ interpretNumber numRegion suggestedStyle ambiguousRawNum mExponent
|
||||
let s = amountstyle{ascommodityside=R, ascommodityspaced=commodityspaced, asprecision=prec, asdecimalpoint=mdec, asdigitgroups=mgrps}
|
||||
return $ nullamt{acommodity=c, aquantity=sign q, amultiplier=mult, astyle=s, aprice=NoPrice}
|
||||
return $ nullamt{acommodity=c, aquantity=sign q, aismultiplier=mult, astyle=s, aprice=NoPrice}
|
||||
-- no symbol amount
|
||||
Nothing -> do
|
||||
suggestedStyle <- getDefaultAmountStyle
|
||||
@ -657,7 +657,7 @@ amountwithoutpricep = do
|
||||
let (c,s) = case (mult, defcs) of
|
||||
(False, Just (defc,defs)) -> (defc, defs{asprecision=max (asprecision defs) prec})
|
||||
_ -> ("", amountstyle{asprecision=prec, asdecimalpoint=mdec, asdigitgroups=mgrps})
|
||||
return $ nullamt{acommodity=c, aquantity=sign q, amultiplier=mult, astyle=s, aprice=NoPrice}
|
||||
return $ nullamt{acommodity=c, aquantity=sign q, aismultiplier=mult, astyle=s, aprice=NoPrice}
|
||||
|
||||
-- For reducing code duplication. Doesn't parse anything. Has the type
|
||||
-- of a parser only in order to throw parse errors (for convenience).
|
||||
|
||||
@ -314,7 +314,7 @@ tests_MultiBalanceReports = tests "MultiBalanceReports" [
|
||||
(map showw aitems) `is` (map showw eitems)
|
||||
((\(_, b, _) -> showMixedAmountDebug b) atotal) `is` (showMixedAmountDebug etotal) -- we only check the sum of the totals
|
||||
usd0 = usd 0
|
||||
amount0 = Amount {acommodity="$", aquantity=0, aprice=NoPrice, astyle=AmountStyle {ascommodityside = L, ascommodityspaced = False, asprecision = 2, asdecimalpoint = Just '.', asdigitgroups = Nothing}, amultiplier=False}
|
||||
amount0 = Amount {acommodity="$", aquantity=0, aprice=NoPrice, astyle=AmountStyle {ascommodityside = L, ascommodityspaced = False, asprecision = 2, asdecimalpoint = Just '.', asdigitgroups = Nothing}, aismultiplier=False}
|
||||
in
|
||||
tests "multiBalanceReport" [
|
||||
test "null journal" $
|
||||
|
||||
Loading…
Reference in New Issue
Block a user