dates 0.1.1.1 → 0.1.2.0

raw patch · 2 files changed

+20/−5 lines, 2 files

Files

• Data/Dates.hs +19/−4
• dates.cabal +1/−1

@@ -4,7 +4,7 @@   (DateTime (..),    Time (..),    parseDate,-   pDate,+   pDate, pDateTime,    getCurrentDateTime,    tryRead   ) where@@ -229,8 +229,8 @@   hd ← ampm   return $ Time (h+hd) m s -pAbsDate ∷ Int → Parsec String st DateTime-pAbsDate year = do+pAbsDateTime ∷ Int → Parsec String st DateTime+pAbsDateTime year = do   date ← choice $ map try $ map ($ year) $ [                               const euroNumDate,                               const americanDate,@@ -246,6 +246,16 @@       t ← choice $ map try [time12,time24]       return $ date `addTime` t +pAbsDate ∷ Int → Parsec String st DateTime+pAbsDate year =+  choice $ map try $ map ($ year) $ [+                          const euroNumDate,+                          const americanDate,+                          const strDate,+                          strDate',+                          euroNumDate',+                          americanDate']+ data DateIntervalType = Day | Week | Month | Year   deriving (Eq,Show,Read) @@ -328,8 +338,13 @@   return $ Days (-1)  -- | Parsec parser for DateTime.+pDateTime ∷ DateTime       -- ^ Current date / time, to use as base for relative dates+          → Parsec String st DateTime+pDateTime date =  (try $ pRelDate date) <|> (try $ pAbsDateTime $ year date)++-- | Parsec parser for Date only. pDate ∷ DateTime       -- ^ Current date / time, to use as base for relative dates-      → Parsec String st DateTime+          → Parsec String st DateTime pDate date =  (try $ pRelDate date) <|> (try $ pAbsDate $ year date)  -- | Parse date/time

@@ -1,5 +1,5 @@ name:                dates-version:             0.1.1.1+version:             0.1.2.0 synopsis:            Small library for parsing different dates formats. description:         This package allows to parse many different formats                      of dates. Both absolute and relative dates are supported.