twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-01 12:41:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

X.P.OrgMode: Remove pLast

Browse Source 
Use the more aptly named `option` instead.
This commit is contained in:
Tony Zorman
2022-10-02 08:48:14 +02:00
parent 0bef428f8f
commit 2b1a15c9e5
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
XMonad/Prompt/OrgMode.hs
View File

@@ -414,7 +414,7 @@ pInput inp = (`runParser` inp) . choice $
-- | Parse a 'Priority'. -- | Parse a 'Priority'.
pPriority :: Parser Priority pPriority :: Parser Priority
pPriority = pLast (pure NoPriority) $ pPriority = option NoPriority $
" " *> skipSpaces *> choice " " *> skipSpaces *> choice
[ "#" *> ("A" <|> "a") $> A [ "#" *> ("A" <|> "a") $> A
, "#" *> ("B" <|> "b") $> B , "#" *> ("B" <|> "b") $> B
@@ -423,7 +423,7 @@ pPriority = pLast (pure NoPriority) $
-- | Try to parse a 'Time'. -- | Try to parse a 'Time'.
pTimeOfDay :: Parser (Maybe TimeOfDay) pTimeOfDay :: Parser (Maybe TimeOfDay)
pTimeOfDay = pLast (pure Nothing) $ pTimeOfDay = option Nothing $
skipSpaces *> choice skipSpaces *> choice
[ Just <$> (TimeOfDay <$> pHour <* string ":" <*> pMinute) -- HH:MM [ Just <$> (TimeOfDay <$> pHour <* string ":" <*> pMinute) -- HH:MM
, Just <$> (TimeOfDay <$> pHour <*> pure 0 ) -- HH , Just <$> (TimeOfDay <$> pHour <*> pure 0 ) -- HH
@@ -485,8 +485,3 @@ pNumBetween lo hi = do
n <- num n <- num
n <$ guard (n >= lo && n <= hi) n <$ guard (n >= lo && n <= hi)
-- | A flipped version of '(<|>)'. Useful when @p'@ is some complicated
-- expression that, for example, consumes spaces and @p@ does not want
-- to do that.
pLast :: Parser a -> Parser a -> Parser a
pLast p p' = p' <|> p