fuzzy-time 0.0.0.0 → 0.1.0.0
raw patch · 4 files changed
+31/−17 lines, 4 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
- Data.FuzzyTime.Types: data DayOfTheWeek
- Data.FuzzyTime.Types: instance Control.DeepSeq.NFData Data.FuzzyTime.Types.DayOfTheWeek
- Data.FuzzyTime.Types: instance Data.Validity.Validity Data.FuzzyTime.Types.DayOfTheWeek
- Data.FuzzyTime.Types: instance GHC.Classes.Eq Data.FuzzyTime.Types.DayOfTheWeek
- Data.FuzzyTime.Types: instance GHC.Enum.Bounded Data.FuzzyTime.Types.DayOfTheWeek
- Data.FuzzyTime.Types: instance GHC.Enum.Enum Data.FuzzyTime.Types.DayOfTheWeek
- Data.FuzzyTime.Types: instance GHC.Generics.Generic Data.FuzzyTime.Types.DayOfTheWeek
- Data.FuzzyTime.Types: instance GHC.Show.Show Data.FuzzyTime.Types.DayOfTheWeek
+ Data.FuzzyTime.Types: data DayOfWeek
+ Data.FuzzyTime.Types: instance Control.DeepSeq.NFData Data.FuzzyTime.Types.DayOfWeek
+ Data.FuzzyTime.Types: instance Data.Validity.Validity Data.FuzzyTime.Types.DayOfWeek
+ Data.FuzzyTime.Types: instance GHC.Classes.Eq Data.FuzzyTime.Types.DayOfWeek
+ Data.FuzzyTime.Types: instance GHC.Enum.Bounded Data.FuzzyTime.Types.DayOfWeek
+ Data.FuzzyTime.Types: instance GHC.Enum.Enum Data.FuzzyTime.Types.DayOfWeek
+ Data.FuzzyTime.Types: instance GHC.Generics.Generic Data.FuzzyTime.Types.DayOfWeek
+ Data.FuzzyTime.Types: instance GHC.Show.Show Data.FuzzyTime.Types.DayOfWeek
- Data.FuzzyTime.Parser: fuzzyDayOfTheWeekP :: Parser DayOfTheWeek
+ Data.FuzzyTime.Parser: fuzzyDayOfTheWeekP :: Parser DayOfWeek
- Data.FuzzyTime.Types: Friday :: DayOfTheWeek
+ Data.FuzzyTime.Types: Friday :: DayOfWeek
- Data.FuzzyTime.Types: Monday :: DayOfTheWeek
+ Data.FuzzyTime.Types: Monday :: DayOfWeek
- Data.FuzzyTime.Types: NextDayOfTheWeek :: DayOfTheWeek -> FuzzyDay
+ Data.FuzzyTime.Types: NextDayOfTheWeek :: DayOfWeek -> FuzzyDay
- Data.FuzzyTime.Types: Saturday :: DayOfTheWeek
+ Data.FuzzyTime.Types: Saturday :: DayOfWeek
- Data.FuzzyTime.Types: Sunday :: DayOfTheWeek
+ Data.FuzzyTime.Types: Sunday :: DayOfWeek
- Data.FuzzyTime.Types: Thursday :: DayOfTheWeek
+ Data.FuzzyTime.Types: Thursday :: DayOfWeek
- Data.FuzzyTime.Types: Tuesday :: DayOfTheWeek
+ Data.FuzzyTime.Types: Tuesday :: DayOfWeek
- Data.FuzzyTime.Types: Wednesday :: DayOfTheWeek
+ Data.FuzzyTime.Types: Wednesday :: DayOfWeek
- Data.FuzzyTime.Types: dayOfTheWeekNum :: DayOfTheWeek -> Int
+ Data.FuzzyTime.Types: dayOfTheWeekNum :: DayOfWeek -> Int
- Data.FuzzyTime.Types: numDayOfTheWeek :: Int -> DayOfTheWeek
+ Data.FuzzyTime.Types: numDayOfTheWeek :: Int -> DayOfWeek
Files
- fuzzy-time.cabal +2/−2
- src/Data/FuzzyTime/Parser.hs +1/−1
- src/Data/FuzzyTime/Resolve.hs +1/−1
- src/Data/FuzzyTime/Types.hs +27/−13
fuzzy-time.cabal view
@@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: dea630de13df312effc0438356b40d45d73d14b8b862e0dada4bcb0492bbcc79+-- hash: 4979abc627af2c6063f556a9b81bcde01dac4d1131f6201b91cc0d4c3556f29e name: fuzzy-time-version: 0.0.0.0+version: 0.1.0.0 description: Fuzzy time types, parsing and resolution category: Time homepage: https://github.com/NorfairKing/fuzzy-time
src/Data/FuzzyTime/Parser.hs view
@@ -227,7 +227,7 @@ -- - sunday -- -- and all non-ambiguous prefixes-fuzzyDayOfTheWeekP :: Parser DayOfTheWeek+fuzzyDayOfTheWeekP :: Parser DayOfWeek fuzzyDayOfTheWeekP = recTreeParser [ ("monday", Monday)
src/Data/FuzzyTime/Resolve.hs view
@@ -132,7 +132,7 @@ else go (y + 1) in go y_ -nextDayOfTheWeek :: Day -> DayOfTheWeek -> Day+nextDayOfTheWeek :: Day -> DayOfWeek -> Day nextDayOfTheWeek d dow = let (_, _, i_) = toWeekDate d down = dayOfTheWeekNum dow
src/Data/FuzzyTime/Types.hs view
@@ -1,6 +1,13 @@+{-# LANGUAGE CPP #-} {-# LANGUAGE DeriveGeneric #-}--module Data.FuzzyTime.Types where+#if MIN_VERSION_time(1,9,0)+{-# LANGUAGE StandaloneDeriving #-}+{-# OPTIONS_GHC -fno-warn-orphans #-}+#endif+module Data.FuzzyTime.Types+ ( module Data.FuzzyTime.Types+ , DayOfWeek(..)+ ) where import Data.Fixed import Data.Int@@ -108,7 +115,7 @@ | DiffDays Int16 | DiffWeeks Int16 | DiffMonths Int16- | NextDayOfTheWeek DayOfTheWeek+ | NextDayOfTheWeek DayOfWeek | ExactDay Day deriving (Show, Eq, Generic) @@ -137,8 +144,8 @@ ] instance NFData FuzzyDay--data DayOfTheWeek+#if !MIN_VERSION_time(1,9,0)+data DayOfWeek = Monday | Tuesday | Wednesday@@ -147,11 +154,24 @@ | Saturday | Sunday deriving (Show, Eq, Generic, Enum, Bounded)+#else+deriving instance Generic DayOfWeek+#endif+instance NFData DayOfWeek -instance Validity DayOfTheWeek+instance Validity DayOfWeek -instance NFData DayOfTheWeek+dayOfTheWeekNum :: DayOfWeek -> Int+numDayOfTheWeek :: Int -> DayOfWeek+#if MIN_VERSION_time(1,9,0)+dayOfTheWeekNum = fromEnum +numDayOfTheWeek = toEnum+#else+dayOfTheWeekNum = (+ 1) . fromEnum++numDayOfTheWeek = toEnum . (\x -> x - 1)+#endif data Month = January | February@@ -166,12 +186,6 @@ | November | December deriving (Show, Eq, Generic, Enum, Bounded)--dayOfTheWeekNum :: DayOfTheWeek -> Int-dayOfTheWeekNum = (+ 1) . fromEnum--numDayOfTheWeek :: Int -> DayOfTheWeek-numDayOfTheWeek = toEnum . (\x -> x - 1) instance Validity Month