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

lib: simplify fromRawNumber

Browse Source
This commit is contained in:
Alex Chen 2018-05-26 22:54:31 -06:00 committed by Simon Michael
parent c3f5659d75
commit 1116261f5a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -691,21 +691,25 @@ fromRawNumber
fromRawNumber raw mExp = case raw of fromRawNumber raw mExp = case raw of
NoSeparators digitGrp mDecimals -> NoSeparators digitGrp mDecimals ->
let decimalGrp = maybe mempty snd mDecimals let mDecPt = fmap fst mDecimals
decimalGrp = maybe mempty snd mDecimals
(quantity, precision) = (quantity, precision) =
maybe id applyExp mExp $ toQuantity digitGrp decimalGrp maybe id applyExp mExp $ toQuantity digitGrp decimalGrp
in Right (quantity, precision, fmap fst mDecimals, Nothing) in Right (quantity, precision, mDecPt, Nothing)
WithSeparators digitSep digitGrps mDecimals -> do WithSeparators digitSep digitGrps mDecimals -> case mExp of
let decimalGrp = maybe mempty snd mDecimals Nothing ->
let mDecPt = fmap fst mDecimals
decimalGrp = maybe mempty snd mDecimals
digitGroupStyle = DigitGroups digitSep (groupSizes digitGrps) digitGroupStyle = DigitGroups digitSep (groupSizes digitGrps)
let errMsg = "mixing digit separators with exponents is not allowed" (quantity, precision) = toQuantity (mconcat digitGrps) decimalGrp
(quantity, precision) <- maybe Right (const $ const $ Left errMsg) mExp
$ toQuantity (mconcat digitGrps) decimalGrp
Right (quantity, precision, fmap fst mDecimals, Just digitGroupStyle) in Right (quantity, precision, mDecPt, Just digitGroupStyle)
Just _ ->
Left "mixing digit separators with exponents is not allowed"
where where
-- Outputs digit group sizes from least significant to most significant -- Outputs digit group sizes from least significant to most significant