Garmelon/mima-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix labels not being applied when they should

Browse source
This commit is contained in:
Joscha 2019-11-20 20:46:12 +00:00
parent e93ff1fc74
commit 7def23284d
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Mima/Parse/Common.hs
View file

@ -157,9 +157,12 @@ fixedWidthDec = fixedWidthWithExponent 10 decDigit
fixedWidthHex :: (Num a) => Int -> Parser a fixedWidthHex :: (Num a) => Int -> Parser a
fixedWidthHex = fixedWidthWithExponent 16 hexDigit fixedWidthHex = fixedWidthWithExponent 16 hexDigit
-- The 'try' below is necessary for the label to take effect if the parser
-- succeeds but the value is out of bounds. In that case, the do-block has
-- usually already consumed input, so the label wouldn't take effect.
asBoundedValue :: (Show a, Ord a) => a -> a -> Parser a -> Parser a asBoundedValue :: (Show a, Ord a) => a -> a -> Parser a -> Parser a
asBoundedValue lower upper parser = asBoundedValue lower upper parser =
label ("value within bounds " ++ show (lower, upper)) $ do label ("value within bounds " ++ show (lower, upper)) $ try $ do
value <- parser value <- parser
if lower <= value && value <= upper if lower <= value && value <= upper
then pure value then pure value