Bounded numeric parsers

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/Postdelay/TimeSpec.hs b/lib/Postdelay/TimeSpec.hs
index 384de4b..edd70c1 100644
--- a/lib/Postdelay/TimeSpec.hs
+++ b/lib/Postdelay/TimeSpec.hs
@@ -56,13 +56,18 @@ timeSpec = label "Relative time specification" $
                                              ]
     
     toEndo :: [RWS LocalTime () LocalTime a] -> Endo LocalTime
-    toEndo acts = Endo $ \t -> fst $ execRWS (sequence acts) t t
+    toEndo (sequence -> act) = Endo $ \t -> fst $ execRWS act t t
 
 timeOfDay, dateSpec :: StringParser s m => m (RWS LocalTime () LocalTime ())
 timeOfDay = label "Time of day" $ shiftBack (1 % Day) . assign time <$> choice
             [ TimeOfDay 0  0 0 <$ string' "midnight"
             , TimeOfDay 12 0 0 <$ string' "noon"
             , TimeOfDay 16 0 0 <$ string' "teatime"
+            , try $ do
+                h <- boundedNatural True $ 0 <=..<= 24
+                m <- boundedNatural True $ 0 <=..<= 59
+                s <- option 0 $ boundedRational True $ 0 <=..< 61
+                return $ TimeOfDay h m s
             ]
 dateSpec = label "Date" $ (date <~) <$> choice
            [ view date <$ string' "today"