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

;journal: hints for possible future work related to #1461

Browse Source
This commit is contained in:
Simon Michael 2021-01-13 18:15:10 -08:00
parent ce6939b304
commit e1e97f977e
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hledger-lib/Hledger/Read/Common.hs
View File

@ -782,6 +782,7 @@ amountwithoutpricep = do
c <- lift commoditysymbolp c <- lift commoditysymbolp
mdecmarkStyle <- getDecimalMarkStyle mdecmarkStyle <- getDecimalMarkStyle
mcommodityStyle <- getAmountStyle c mcommodityStyle <- getAmountStyle c
-- XXX amounts of this commodity in periodic transaction rules and auto posting rules ? #1461
let suggestedStyle = mdecmarkStyle <|> mcommodityStyle let suggestedStyle = mdecmarkStyle <|> mcommodityStyle
commodityspaced <- lift skipNonNewlineSpaces' commodityspaced <- lift skipNonNewlineSpaces'
sign2 <- lift $ signp sign2 <- lift $ signp
@ -807,6 +808,7 @@ amountwithoutpricep = do
Just (commodityspaced, c) -> do Just (commodityspaced, c) -> do
mdecmarkStyle <- getDecimalMarkStyle mdecmarkStyle <- getDecimalMarkStyle
mcommodityStyle <- getAmountStyle c mcommodityStyle <- getAmountStyle c
-- XXX amounts of this commodity in periodic transaction rules and auto posting rules ? #1461
let msuggestedStyle = mdecmarkStyle <|> mcommodityStyle let msuggestedStyle = mdecmarkStyle <|> mcommodityStyle
(q,prec,mdec,mgrps) <- lift $ interpretNumber numRegion msuggestedStyle ambiguousRawNum mExponent (q,prec,mdec,mgrps) <- lift $ interpretNumber numRegion msuggestedStyle ambiguousRawNum mExponent
let s = amountstyle{ascommodityside=R, ascommodityspaced=commodityspaced, asprecision=prec, asdecimalpoint=mdec, asdigitgroups=mgrps} let s = amountstyle{ascommodityside=R, ascommodityspaced=commodityspaced, asprecision=prec, asdecimalpoint=mdec, asdigitgroups=mgrps}
@ -818,6 +820,7 @@ amountwithoutpricep = do
mdecmarkStyle <- getDecimalMarkStyle -- a decimal-mark CSV rule mdecmarkStyle <- getDecimalMarkStyle -- a decimal-mark CSV rule
mcommodityStyle <- getAmountStyle "" -- a commodity directive for the no-symbol commodity mcommodityStyle <- getAmountStyle "" -- a commodity directive for the no-symbol commodity
mdefaultStyle <- getDefaultAmountStyle -- a D default commodity directive mdefaultStyle <- getDefaultAmountStyle -- a D default commodity directive
-- XXX no-symbol amounts in periodic transaction rules and auto posting rules ? #1461
let msuggestedStyle = mdecmarkStyle <|> mcommodityStyle <|> mdefaultStyle let msuggestedStyle = mdecmarkStyle <|> mcommodityStyle <|> mdefaultStyle
(q,prec,mdec,mgrps) <- lift $ interpretNumber numRegion msuggestedStyle ambiguousRawNum mExponent (q,prec,mdec,mgrps) <- lift $ interpretNumber numRegion msuggestedStyle ambiguousRawNum mExponent
-- if a default commodity has been set, apply it and its style to this amount -- if a default commodity has been set, apply it and its style to this amount