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

Extract flag parser

Browse source
This commit is contained in:
Joscha 2019-11-20 18:19:25 +00:00
parent 602e8b5b14
commit 42d52055d1
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ module Mima.Parse.Common
-- * Basic parsers
, whitespace
, labelName
, flag
-- ** Number literals
, binDigit
, decDigit
@ -58,6 +59,9 @@ labelName = label "label" $ do
ts <- takeWhileP Nothing (\c -> isAlphaNum c || isConnecting c)
pure $ T.singleton t <> ts
flag :: Parser (Set.Set Char)
flag = label "alphanumeric character" $ Set.singleton <$> satisfy isAlphaNum
binDigit :: (Num a) => Parser a
binDigit = label "binary digit" $ token helper Set.empty
where

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

@ -21,11 +21,8 @@ import Mima.Word
lAddress :: Parser MimaAddress
lAddress = lexeme fixedWidthHexAddress
lFlag :: Parser (Set.Set Char)
lFlag = lexeme $ label "alphanumeric character" $ Set.singleton <$> satisfy isAlphaNum
lFlags :: Parser (Set.Set Char)
lFlags = Set.unions <$> some lFlag
lFlags = Set.unions <$> some (lexeme flag)
lAddressRange :: Parser AddressRange
lAddressRange = do