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

lib: rename pdigitgroup to digitgroupp for consistency

Browse Source
This commit is contained in:
Alex Chen 2018-05-24 15:29:20 -06:00 committed by Simon Michael
parent cf9b2001e7
commit 6ffa9cb3cd
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -811,17 +811,17 @@ rawnumberp = label "rawnumberp" $ do
leadingDecimalPt :: TextParser m RawNumber leadingDecimalPt :: TextParser m RawNumber
leadingDecimalPt = leadingDecimalPt =
LeadingDecimalPt <$> satisfy isDecimalPointChar <*> pdigitgroup LeadingDecimalPt <$> satisfy isDecimalPointChar <*> digitgroupp
leadingDigits :: TextParser m RawNumber leadingDigits :: TextParser m RawNumber
leadingDigits = do leadingDigits = do
grp1 <- pdigitgroup grp1 <- digitgroupp
withSeparators grp1 <|> trailingDecimalPt grp1 <|> pure (NoSeparators grp1) withSeparators grp1 <|> trailingDecimalPt grp1 <|> pure (NoSeparators grp1)
withSeparators :: DigitGrp -> TextParser m RawNumber withSeparators :: DigitGrp -> TextParser m RawNumber
withSeparators grp1 = do withSeparators grp1 = do
(sep, grp2) <- try $ (,) <$> satisfy isDigitSeparatorChar <*> pdigitgroup (sep, grp2) <- try $ (,) <$> satisfy isDigitSeparatorChar <*> digitgroupp
grps <- many $ try $ char sep *> pdigitgroup grps <- many $ try $ char sep *> digitgroupp
let digitGroups = grp1 : grp2 : grps let digitGroups = grp1 : grp2 : grps
withDecimalPt sep digitGroups <|> pure (withoutDecimalPt grp1 sep grp2 grps) withDecimalPt sep digitGroups <|> pure (withoutDecimalPt grp1 sep grp2 grps)
@ -829,7 +829,7 @@ rawnumberp = label "rawnumberp" $ do
withDecimalPt :: Char -> [DigitGrp] -> TextParser m RawNumber withDecimalPt :: Char -> [DigitGrp] -> TextParser m RawNumber
withDecimalPt digitSep digitGroups = do withDecimalPt digitSep digitGroups = do
decimalPt <- satisfy $ \c -> isDecimalPointChar c && c /= digitSep decimalPt <- satisfy $ \c -> isDecimalPointChar c && c /= digitSep
decimalDigitGroup <- option mempty pdigitgroup decimalDigitGroup <- option mempty digitgroupp
pure $ BothSeparators digitSep digitGroups decimalPt decimalDigitGroup pure $ BothSeparators digitSep digitGroups decimalPt decimalDigitGroup
@ -870,8 +870,8 @@ instance Monoid DigitGrp where
mempty = DigitGrp 0 0 mempty = DigitGrp 0 0
mappend = (Sem.<>) mappend = (Sem.<>)
pdigitgroup :: TextParser m DigitGrp digitgroupp :: TextParser m DigitGrp
pdigitgroup = label "digit group" digitgroupp = label "digit group"
$ makeGroup <$> takeWhile1P (Just "digit") isDigit $ makeGroup <$> takeWhile1P (Just "digit") isDigit
where where
makeGroup = uncurry DigitGrp . foldl' step (0, 0) . T.unpack makeGroup = uncurry DigitGrp . foldl' step (0, 0) . T.unpack