From 45ec7d1708a44afd4b15e4b49c081e06aa87cf0d Mon Sep 17 00:00:00 2001 From: Joscha Date: Tue, 19 Nov 2019 10:23:29 +0000 Subject: [PATCH] Rename AllFlags to RawFlags I just like this new name better --- src/Mima/Flag.hs | 6 +++--- src/Mima/Format/FlagFile.hs | 2 +- src/Mima/Parse/FlagFile.hs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mima/Flag.hs b/src/Mima/Flag.hs index 3b6f9d4..4dd22f9 100644 --- a/src/Mima/Flag.hs +++ b/src/Mima/Flag.hs @@ -18,7 +18,7 @@ module Mima.Flag , flagChar , Flags(..) , rawFlags - , AllFlags + , RawFlags , FlagSpec , getFlagSpec , interpretFlagSpec @@ -113,10 +113,10 @@ rawFlags = Flags , flagReadOnly = ReadOnly } -type AllFlags = Map.Map AddressRange (Set.Set Char) +type RawFlags = Map.Map AddressRange (Set.Set Char) type FlagSpec = Flags AddressSpec -getFlagSpec :: AllFlags -> FlagSpec +getFlagSpec :: RawFlags -> FlagSpec getFlagSpec af = let isInSet :: Flag -> Set.Set Char -> Bool isInSet f s = flagChar f `Set.member` s diff --git a/src/Mima/Format/FlagFile.hs b/src/Mima/Format/FlagFile.hs index d561ade..02d7534 100644 --- a/src/Mima/Format/FlagFile.hs +++ b/src/Mima/Format/FlagFile.hs @@ -29,5 +29,5 @@ fRange r fLine :: (AddressRange, Set.Set Char) -> T.Text fLine (r, s) = fRange r <> ": " <> fFlagSet s <> "\n" -formatFlagFile :: AllFlags -> T.Text +formatFlagFile :: RawFlags -> T.Text formatFlagFile = mconcat . map fLine . Map.assocs diff --git a/src/Mima/Parse/FlagFile.hs b/src/Mima/Parse/FlagFile.hs index 7419483..7cde1c3 100644 --- a/src/Mima/Parse/FlagFile.hs +++ b/src/Mima/Parse/FlagFile.hs @@ -41,8 +41,8 @@ lLine = do hidden lNewlines pure (a, f) -parseFlagFile :: Parser AllFlags +parseFlagFile :: Parser RawFlags parseFlagFile = space *> many lNewline *> (Map.fromList <$> many lLine) <* hidden eof -readFlagFile :: FilePath -> T.Text -> Either WeedErrorBundle AllFlags +readFlagFile :: FilePath -> T.Text -> Either WeedErrorBundle RawFlags readFlagFile filename input = parse parseFlagFile filename input