time-compat 1.9.3 → 1.9.4

raw patch · 50 files changed

+5315/−3912 lines, 50 filesdep ~QuickCheckdep ~tastydep ~timePVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: QuickCheck, tasty, time

API changes (from Hackage documentation)

Files

• CHANGELOG.md +12/−0
• src/Data/Time/Calendar/Compat.hs +41/−56
• src/Data/Time/Calendar/Julian/Compat.hs +31/−3
• src/Data/Time/Calendar/Month/Compat.hs +196/−0
• src/Data/Time/Calendar/MonthDay/Compat.hs +11/−2
• src/Data/Time/Calendar/OrdinalDate/Compat.hs +68/−3
• src/Data/Time/Calendar/Quarter/Compat.hs +152/−0
• src/Data/Time/Calendar/Types.hs +34/−0
• src/Data/Time/Calendar/WeekDate/Compat.hs +192/−1
• src/Data/Time/Clock/Compat.hs +7/−1
• src/Data/Time/Clock/System/Compat.hs +2/−1
• src/Data/Time/Compat.hs +1/−0
• src/Data/Time/Format/Compat.hs +17/−1
• src/Data/Time/LocalTime/Compat.hs +6/−1
• src/Data/Time/Orphans.hs +120/−1
• test-instances/Test.hs +104/−0
• test/Test.hs +0/−68
• test/main/Main.hs +27/−39
• test/main/Test/Arbitrary.hs +51/−4
• test/main/Test/Calendar/AddDays.hs +25/−25
• test/main/Test/Calendar/AddDaysRef.hs +247/−246
• test/main/Test/Calendar/CalendarProps.hs +34/−0
• test/main/Test/Calendar/Calendars.hs +16/−22
• test/main/Test/Calendar/CalendarsRef.hs +6/−5
• test/main/Test/Calendar/ClipDates.hs +28/−31
• test/main/Test/Calendar/ClipDatesRef.hs +569/−564
• test/main/Test/Calendar/ConvertBack.hs +25/−28
• test/main/Test/Calendar/Duration.hs +1/−2
• test/main/Test/Calendar/Easter.hs +23/−20
• test/main/Test/Calendar/EasterRef.hs +59/−58
• test/main/Test/Calendar/LongWeekYears.hs +21/−13
• test/main/Test/Calendar/LongWeekYearsRef.hs +152/−151
• test/main/Test/Calendar/MonthDay.hs +24/−17
• test/main/Test/Calendar/MonthDayRef.hs +748/−747
• test/main/Test/Calendar/Valid.hs +124/−68
• test/main/Test/Calendar/Week.hs +58/−14
• test/main/Test/Clock/Conversion.hs +19/−20
• test/main/Test/Clock/Resolution.hs +45/−30
• test/main/Test/Clock/TAI.hs +48/−54
• test/main/Test/Format/Compile.hs +18/−0
• test/main/Test/Format/Format.hs +153/−112
• test/main/Test/Format/ISO8601.hs +208/−253
• test/main/Test/Format/ParseTime.hs +580/−278
• test/main/Test/LocalTime/CalendarDiffTime.hs +3/−4
• test/main/Test/LocalTime/Time.hs +63/−71
• test/main/Test/LocalTime/TimeOfDay.hs +0/−1
• test/main/Test/LocalTime/TimeRef.hs +889/−884
• test/main/Test/TestUtil.hs +2/−2
• test/main/Test/Types.hs +26/−0
• time-compat.cabal +29/−11

@@ -1,3 +1,15 @@+# 1.9.4++- Support `time-1.11`+  - `Data.Time.Calendar.Month`+  - `Data.Time.Calendar.Quarter`+  - Pattern synonyms+  - `parseTimeMultipleM` is not backported+  - `Month` is missing `ParseTime` instance+  - Compat extras:+    - Add `Ix`, `Enum`, `NFData` instances to `Month`, `Quarter`, `QuarterOfYear`,+      `CalendarDiffTime` and `DayOfWeek`.+ # 1.9.3  - Include `pastMidnight` and `sinceMidnight` aliases (backported from `time-1.10`)

@@ -1,5 +1,9 @@ {-# LANGUAGE CPP                #-} {-# LANGUAGE DeriveDataTypeable #-}+#if __GLASGOW_HASKELL__ >= 710+{-# LANGUAGE PatternSynonyms    #-}+{-# LANGUAGE ViewPatterns       #-}+#endif module Data.Time.Calendar.Compat (     -- * Days     Day(..),addDays,diffDays,@@ -23,12 +27,27 @@        -- * Week     DayOfWeek(..), dayOfWeek,+    dayOfWeekDiff, firstDayOfWeekOnAfter,++    -- * Type aliases+    DayOfMonth, MonthOfYear, Year,+#if __GLASGOW_HASKELL__ >= 710+    pattern YearMonthDay,+#endif     ) where  import Data.Time.Calendar import Data.Time.Format import Data.Time.Orphans () +#if !MIN_VERSION_time(1,11,0)+import Data.Time.Calendar.Types+#endif++#if !MIN_VERSION_time(1,9,0)+import Data.Time.Calendar.WeekDate.Compat+#endif+ #if !MIN_VERSION_time(1,5,0) import System.Locale (TimeLocale (..)) #endif@@ -138,65 +157,31 @@  #endif +#if !MIN_VERSION_time(1,11,0)+#if __GLASGOW_HASKELL__ >= 710+-- | Bidirectional abstract constructor for the proleptic Gregorian calendar.+-- Invalid values will be clipped to the correct range, month first, then day.+pattern YearMonthDay :: Year -> MonthOfYear -> DayOfMonth -> Day+pattern YearMonthDay y m d <- (toGregorian -> (y,m,d)) where+    YearMonthDay y m d = fromGregorian y m d++#if __GLASGOW_HASKELL__ >= 802+{-# COMPLETE YearMonthDay #-}+#endif+#endif+#endif+ ------------------------------------------------------------------------------- -- DayOfWeek ------------------------------------------------------------------------------- -#if !MIN_VERSION_time(1,9,0)--data DayOfWeek-    = Monday-    | Tuesday-    | Wednesday-    | Thursday-    | Friday-    | Saturday-    | Sunday-    deriving (Eq, Show, Read, Typeable)---- | \"Circular\", so for example @[Tuesday ..]@ gives an endless sequence.--- Also: 'fromEnum' gives [1 .. 7] for [Monday .. Sunday], and 'toEnum' performs mod 7 to give a cycle of days.-instance Enum DayOfWeek where-    toEnum i =-        case mod i 7 of-            0 -> Sunday-            1 -> Monday-            2 -> Tuesday-            3 -> Wednesday-            4 -> Thursday-            5 -> Friday-            _ -> Saturday-    fromEnum Monday = 1-    fromEnum Tuesday = 2-    fromEnum Wednesday = 3-    fromEnum Thursday = 4-    fromEnum Friday = 5-    fromEnum Saturday = 6-    fromEnum Sunday = 7-    enumFromTo wd1 wd2-        | wd1 == wd2 = [wd1]-    enumFromTo wd1 wd2 = wd1 : enumFromTo (succ wd1) wd2-    enumFromThenTo wd1 wd2 wd3-        | wd2 == wd3 = [wd1, wd2]-    enumFromThenTo wd1 wd2 wd3 = wd1 : enumFromThenTo wd2 (toEnum $ (2 * fromEnum wd2) - (fromEnum wd1)) wd3--dayOfWeek :: Day -> DayOfWeek-dayOfWeek (ModifiedJulianDay d) = toEnum $ fromInteger $ d + 3--toSomeDay :: DayOfWeek -> Day-toSomeDay d = ModifiedJulianDay (fromIntegral $ fromEnum d + 4)--#if MIN_VERSION_time(1,8,0)-#define FORMAT_OPTS tl mpo i-#else-#define FORMAT_OPTS tl mpo-#endif--instance FormatTime DayOfWeek where-    formatCharacter 'u' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter 'u')-    formatCharacter 'w' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter 'w')-    formatCharacter 'a' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter 'a')-    formatCharacter 'A' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter 'A')-    formatCharacter _  = Nothing+#if !MIN_VERSION_time(1,11,0)+-- | @dayOfWeekDiff a b = a - b@ in range 0 to 6.+-- The number of days from b to the next a.+dayOfWeekDiff :: DayOfWeek -> DayOfWeek -> Int+dayOfWeekDiff a b = mod (fromEnum a - fromEnum b) 7 +-- | The first day-of-week on or after some day+firstDayOfWeekOnAfter :: DayOfWeek -> Day -> Day+firstDayOfWeekOnAfter dw d = addDays (toInteger $ dayOfWeekDiff dw $ dayOfWeek d) d #endif

@@ -1,13 +1,23 @@ {-# LANGUAGE CPP #-}+#if __GLASGOW_HASKELL__ >= 710+{-# LANGUAGE PatternSynonyms #-}+{-# LANGUAGE ViewPatterns    #-}+#endif module Data.Time.Calendar.Julian.Compat (+    Year, MonthOfYear, DayOfMonth, DayOfYear, +    -- JulianYearDay     toJulianYearAndDay,     fromJulianYearAndDay,     fromJulianYearAndDayValid,     showJulianYearAndDay,     isJulianLeapYear, -    toJulian,fromJulian,fromJulianValid,showJulian,julianMonthLength,+    toJulian,fromJulian,+#if __GLASGOW_HASKELL__ >= 710+    pattern JulianYearMonthDay,+#endif+    fromJulianValid,showJulian,julianMonthLength,      -- calendrical arithmetic     -- e.g. "one month after March 31st"@@ -15,13 +25,17 @@     addJulianYearsClip,addJulianYearsRollOver,     addJulianDurationClip,addJulianDurationRollOver,     diffJulianDurationClip,diffJulianDurationRollOver,-    ) where+) where  import Data.Time.Orphans ()  import Data.Time.Calendar.Julian-import Data.Time.Calendar.Compat +import Data.Time.Calendar.Compat +#if !MIN_VERSION_time(1,11,0)+import Data.Time.Calendar.Types+#endif+ #if !MIN_VERSION_time(1,9,0)  -- | Add months (clipped to last day), then add days@@ -63,4 +77,18 @@     dayAllowed = addJulianDurationRollOver (CalendarDiffDays ymAllowed 0) day1     in CalendarDiffDays ymAllowed $ diffDays day2 dayAllowed +#endif++#if !MIN_VERSION_time(1,11,0)+#if __GLASGOW_HASKELL__ >= 710+-- | Bidirectional abstract constructor for the proleptic Julian calendar.+-- Invalid values will be clipped to the correct range, month first, then day.+pattern JulianYearMonthDay :: Year -> MonthOfYear -> DayOfMonth -> Day+pattern JulianYearMonthDay y m d <- (toJulian -> (y,m,d)) where+    JulianYearMonthDay y m d = fromJulian y m d++#if __GLASGOW_HASKELL__ >= 802+{-# COMPLETE JulianYearMonthDay #-}+#endif+#endif #endif

@@ -0,0 +1,196 @@+{-# LANGUAGE CPP                #-}+{-# LANGUAGE DeriveDataTypeable #-}+#if __GLASGOW_HASKELL__ >= 710+{-# LANGUAGE PatternSynonyms    #-}+{-# LANGUAGE ViewPatterns       #-}+#endif+module Data.Time.Calendar.Month.Compat (+    Month(..), addMonths, diffMonths,+#if __GLASGOW_HASKELL__ >= 710+    pattern YearMonth,+#endif+    fromYearMonthValid,+#if __GLASGOW_HASKELL__ >= 710+    pattern MonthDay,+#endif+    fromMonthDayValid,+    -- * time-compat extras+    fromYearMonth,+    toYearMonth,+    fromMonthDay,+    toMonthDay,+) where++#if MIN_VERSION_time(1,11,0)+import Data.Time.Calendar+import Data.Time.Calendar.Month++-- | Part of @YearMonth@ pattern+fromYearMonth :: Year -> MonthOfYear -> Month+fromYearMonth = YearMonth++-- | Part of @YearMonth@ pattern+toYearMonth :: Month -> (Year, MonthOfYear)+toYearMonth (YearMonth y m) = (y, m)++-- | Part of 'MonthDay' pattern+fromMonthDay :: Month -> DayOfMonth -> Day+fromMonthDay = MonthDay++-- | Part of 'MonthDay' pattern+toMonthDay :: Day -> (Month,DayOfMonth)+toMonthDay (MonthDay m d) = (m, d)++#else++#if MIN_VERSION_time(1,9,0)+import Data.Time.Format.Internal+#else+import Data.Time.Format+#endif++import Data.Time.Calendar+import Data.Time.Calendar.Julian+import Data.Time.Calendar.Types+-- import Data.Time.Calendar.Days+import Data.Time.Calendar.Private+import Data.Data+import Data.Fixed+import Text.Read+import Text.ParserCombinators.ReadP+import Control.DeepSeq (NFData (..))+import Data.Ix (Ix (..))++-- | An absolute count of common calendar months.+-- Number is equal to @(year * 12) + (monthOfYear - 1)@.+newtype Month = MkMonth Integer deriving (Eq, Ord, Data, Typeable)++instance NFData Month where+    rnf (MkMonth m) = rnf m++instance Enum Month where+    succ (MkMonth a) = MkMonth (succ a)+    pred (MkMonth a) = MkMonth (pred a)+    toEnum = MkMonth . toEnum+    fromEnum (MkMonth a) = fromEnum a+    enumFrom (MkMonth a) = fmap MkMonth (enumFrom a)+    enumFromThen (MkMonth a) (MkMonth b) = fmap MkMonth (enumFromThen a b)+    enumFromTo (MkMonth a) (MkMonth b) = fmap MkMonth (enumFromTo a b)+    enumFromThenTo (MkMonth a) (MkMonth b) (MkMonth c) =+        fmap MkMonth (enumFromThenTo a b c)++instance Ix Month where+    range (MkMonth a, MkMonth b) = fmap MkMonth (range (a, b))+    index (MkMonth a, MkMonth b) (MkMonth c) = index (a, b) c+    inRange (MkMonth a, MkMonth b) (MkMonth c) = inRange (a, b) c+    rangeSize (MkMonth a, MkMonth b) = rangeSize (a, b)++-- | Show as @yyyy-mm@.+instance Show Month where+    show ym = case toYearMonth ym of+        (y, m) -> show4 y ++ "-" ++ show2 m++-- | Read as @yyyy-mm@.+instance Read Month where+    readPrec = do+        y <- readPrec+        _ <- lift $ char '-'+        m <- readPrec+        return $ fromYearMonth y m++-------------------------------------------------------------------------------+-- ForematTime Month+-------------------------------------------------------------------------------++toSomeDay :: Month -> Day+toSomeDay (MkMonth m) =+    let (y,my) = divMod' m 12+    in fromGregorian y (succ (fromInteger my)) 1++#if MIN_VERSION_time(1,9,0)+#define FORMAT_OPTS fo+#elif MIN_VERSION_time(1,8,0)+#define FORMAT_OPTS tl mpo i+#else+#define FORMAT_OPTS tl mpo+#endif++#if MIN_VERSION_time(1,9,0)+#define FORMAT_ARG _arg+#else+#define FORMAT_ARG+#endif++instance FormatTime Month where+    -- Year Count+    formatCharacter FORMAT_ARG 'Y' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter FORMAT_ARG 'Y')+    formatCharacter FORMAT_ARG 'y' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter FORMAT_ARG 'y')+    formatCharacter FORMAT_ARG 'c' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter FORMAT_ARG 'c')+    -- Month of Year+    formatCharacter FORMAT_ARG 'B' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter FORMAT_ARG 'B')+    formatCharacter FORMAT_ARG 'b' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter FORMAT_ARG 'b')+    formatCharacter FORMAT_ARG 'h' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter FORMAT_ARG 'h')+    formatCharacter FORMAT_ARG 'm' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter FORMAT_ARG 'm')++    formatCharacter FORMAT_ARG _  = Nothing++addMonths :: Integer -> Month -> Month+addMonths n (MkMonth a) = MkMonth $ a + n++diffMonths :: Month -> Month -> Integer+diffMonths (MkMonth a) (MkMonth b) = a - b++fromYearMonthValid :: Year -> MonthOfYear -> Maybe Month+fromYearMonthValid y my = do+    my' <- clipValid 1 12 my+    return $ fromYearMonth y my'++-- | Part of @YearMonth@ pattern+fromYearMonth :: Year -> MonthOfYear -> Month+fromYearMonth y my = MkMonth $ (y * 12) + toInteger (pred $ clip 1 12 my)++-- | Part of @YearMonth@ pattern+toYearMonth :: Month -> (Year, MonthOfYear)+toYearMonth (MkMonth m) = case divMod' m 12 of+    (y, my) -> (y, succ (fromInteger my))++#if __GLASGOW_HASKELL__ >= 710+-- | Bidirectional abstract constructor.+-- Invalid months of year will be clipped to the correct range.+pattern YearMonth :: Year -> MonthOfYear -> Month+pattern YearMonth y my <- (toYearMonth -> (y, my))+  where YearMonth y my = fromYearMonth y my++#if __GLASGOW_HASKELL__ >= 802+{-# COMPLETE YearMonth #-}+#endif+#endif++-- | Part of 'MonthDay' pattern+toMonthDay :: Day -> (Month,DayOfMonth)+toMonthDay d = case toGregorian d of +    (y, my, dm) -> (fromYearMonth y my, dm)++-- | Part of 'MonthDay' pattern+fromMonthDay :: Month -> DayOfMonth -> Day+fromMonthDay m dm = case toYearMonth m of+    (y, my) -> fromGregorian y my dm++fromMonthDayValid :: Month -> DayOfMonth -> Maybe Day+fromMonthDayValid m dm = case toYearMonth m of+    (y, my) -> fromGregorianValid y my dm++#if __GLASGOW_HASKELL__ >= 710+-- | Bidirectional abstract constructor.+-- Invalid days of month will be clipped to the correct range.+pattern MonthDay :: Month -> DayOfMonth -> Day+pattern MonthDay m dm <- (toMonthDay -> (m,dm)) where+    MonthDay (YearMonth y my) dm = fromGregorian y my dm+++#if __GLASGOW_HASKELL__ >= 802+{-# COMPLETE MonthDay #-}+#endif+#endif++#endif

@@ -1,7 +1,16 @@+{-# LANGUAGE CPP #-} module Data.Time.Calendar.MonthDay.Compat (-    monthAndDayToDayOfYear,monthAndDayToDayOfYearValid,dayOfYearToMonthAndDay,monthLength,-    ) where+    MonthOfYear, DayOfMonth, DayOfYear,+    monthAndDayToDayOfYear,+    monthAndDayToDayOfYearValid,+    dayOfYearToMonthAndDay,+    monthLength,+) where  import Data.Time.Orphans ()  import Data.Time.Calendar.MonthDay++#if !MIN_VERSION_time(1,11,0)+import Data.Time.Calendar.Types+#endif

@@ -1,6 +1,15 @@+{-# LANGUAGE CPP #-}+#if __GLASGOW_HASKELL__ >= 710+{-# LANGUAGE PatternSynonyms #-}+{-# LANGUAGE ViewPatterns #-}+#endif module Data.Time.Calendar.OrdinalDate.Compat (+    Day, Year, DayOfYear, WeekOfYear,     toOrdinalDate,     fromOrdinalDate,+#if __GLASGOW_HASKELL__ >= 710+    pattern YearDay,+#endif     fromOrdinalDateValid,     showOrdinalDate,     isLeapYear,@@ -9,9 +18,65 @@     fromMondayStartWeek,     fromMondayStartWeekValid,     fromSundayStartWeek,-    fromSundayStartWeekValid, -    ) where+    fromSundayStartWeekValid,+) where  import Data.Time.Orphans () -import Data.Time.Calendar.OrdinalDate+import Data.Time.Calendar.OrdinalDate hiding (fromSundayStartWeekValid)+#if MIN_VERSION_time(1,6,0)+import Data.Time.Calendar.OrdinalDate (fromSundayStartWeekValid)+#else+import Data.Time.Calendar.Private+#endif++#if !MIN_VERSION_time(1,11,0)+import Data.Time.Calendar+import Data.Time.Calendar.Types+#endif++#if !MIN_VERSION_time(1,11,0)++#if __GLASGOW_HASKELL__ >= 710+-- | Bidirectional abstract constructor for ISO 8601 Ordinal Date format.+-- Invalid day numbers will be clipped to the correct range (1 to 365 or 366).+pattern YearDay :: Year -> DayOfYear -> Day+pattern YearDay y d <- (toOrdinalDate -> (y,d)) where+    YearDay y d = fromOrdinalDate y d++#if __GLASGOW_HASKELL__ >= 802+{-# COMPLETE YearDay #-}+#endif+#endif++#endif++#if !MIN_VERSION_time(1,6,0)+fromSundayStartWeekValid ::+       Year -- ^ Year.+    -> WeekOfYear -- ^ Sunday-starting week number (as @%U@ in 'Data.Time.Format.formatTime').+    -> Int -- ^ Day of week.+                               -- Sunday is 0, Saturday is 6 (as @%w@ in 'Data.Time.Format.formatTime').+    -> Maybe Day+fromSundayStartWeekValid year w d = do+    d' <- clipValid 0 6 d+    let+        -- first day of the year+        firstDay = fromOrdinalDate year 1+        -- 0-based week of year+        zbFirstSunday = (4 - toModifiedJulianDay firstDay) `mod` 7+        -- 0-based week number+        zbWeek = w - 1+        -- 0-based day of week+        zbDay = d'+        -- 0-based day in year+        zbYearDay = zbFirstSunday + 7 * toInteger zbWeek + toInteger zbDay+    zbYearDay' <-+        clipValid+            0+            (if isLeapYear year+                 then 365+                 else 364)+            zbYearDay+    return $ addDays zbYearDay' firstDay+#endif

@@ -0,0 +1,152 @@+{-# LANGUAGE CPP                #-}+{-# LANGUAGE DeriveDataTypeable #-}+#if __GLASGOW_HASKELL__ >= 710+{-# LANGUAGE PatternSynonyms    #-}+{-# LANGUAGE ViewPatterns       #-}+#endif+module Data.Time.Calendar.Quarter.Compat (+    QuarterOfYear(..), addQuarters, diffQuarters,+    Quarter(..),+#if __GLASGOW_HASKELL__ >= 710+    pattern YearQuarter,+#endif+    monthOfYearQuarter,+    monthQuarter,+    dayQuarter,+    -- * time-compat extras+    fromYearQuarter,+    toYearQuarter,+) where++#if MIN_VERSION_time(1,11,0)+import Data.Time.Calendar (Year)+import Data.Time.Calendar.Quarter++-- | Part of @YearQuarter@ pattern+fromYearQuarter :: Year -> QuarterOfYear -> Quarter+fromYearQuarter = YearQuarter++-- | Part of @YearQuarter@ pattern+toYearQuarter :: Quarter -> (Year, QuarterOfYear)+toYearQuarter (YearQuarter y m) = (y, m)++#else++import Data.Data                       (Data)+import Data.Typeable                   (Typeable)+import Text.Read                       (Read (..))+import Data.Fixed                      (mod', divMod')+import Text.ParserCombinators.ReadPrec (lift)+import Text.ParserCombinators.ReadP    (char)+import Control.DeepSeq (NFData (..))+import Data.Ix (Ix (..))++import Data.Time.Calendar+import Data.Time.Calendar.Types+import Data.Time.Calendar.Private+import Data.Time.Calendar.Month.Compat++-- | Quarters of each year. Each quarter corresponds to three months.+data QuarterOfYear = Q1 | Q2 | Q3 | Q4 deriving (Eq, Ord, Data, Typeable, Read, Show)++instance NFData QuarterOfYear where+    rnf Q1 = ()+    rnf Q2 = ()+    rnf Q3 = ()+    rnf Q4 = ()++-- | maps Q1..Q4 to 1..4+instance Enum QuarterOfYear where+    toEnum i =+        case mod' i 4 of+            1 -> Q1+            2 -> Q2+            3 -> Q3+            _ -> Q4+    fromEnum Q1 = 1+    fromEnum Q2 = 2+    fromEnum Q3 = 3+    fromEnum Q4 = 4++instance Bounded QuarterOfYear where+    minBound = Q1+    maxBound = Q4++-- | An absolute count of year quarters.+-- Number is equal to @(year * 4) + (quarterOfYear - 1)@.+newtype Quarter = MkQuarter Integer deriving (Eq, Ord, Data, Typeable)++instance NFData Quarter where+    rnf (MkQuarter m) = rnf m++instance Enum Quarter where+    succ (MkQuarter a) = MkQuarter (succ a)+    pred (MkQuarter a) = MkQuarter (pred a)+    toEnum = MkQuarter . toEnum+    fromEnum (MkQuarter a) = fromEnum a+    enumFrom (MkQuarter a) = fmap MkQuarter (enumFrom a)+    enumFromThen (MkQuarter a) (MkQuarter b) = fmap MkQuarter (enumFromThen a b)+    enumFromTo (MkQuarter a) (MkQuarter b) = fmap MkQuarter (enumFromTo a b)+    enumFromThenTo (MkQuarter a) (MkQuarter b) (MkQuarter c) =+        fmap MkQuarter (enumFromThenTo a b c)++instance Ix Quarter where+    range (MkQuarter a, MkQuarter b) = fmap MkQuarter (range (a, b))+    index (MkQuarter a, MkQuarter b) (MkQuarter c) = index (a, b) c+    inRange (MkQuarter a, MkQuarter b) (MkQuarter c) = inRange (a, b) c+    rangeSize (MkQuarter a, MkQuarter b) = rangeSize (a, b)++-- | Show as @yyyy-Qn@.+instance Show Quarter where+    show q = case toYearQuarter q of+      (y, qy) -> show4 y ++ "-" ++ show qy++-- | Read as @yyyy-Qn@.+instance Read Quarter where+    readPrec = do+        y <- readPrec+        _ <- lift $ char '-'+        m <- readPrec+        return $ fromYearQuarter y m++addQuarters :: Integer -> Quarter -> Quarter+addQuarters n (MkQuarter a) = MkQuarter $ a + n++diffQuarters :: Quarter -> Quarter -> Integer+diffQuarters (MkQuarter a) (MkQuarter b) = a - b++#if __GLASGOW_HASKELL__ >= 710+-- | Bidirectional abstract constructor.+pattern YearQuarter :: Year -> QuarterOfYear -> Quarter+pattern YearQuarter y qy <- (toYearQuarter -> (y, qy))+  where YearQuarter y qy = fromYearQuarter y qy++#if __GLASGOW_HASKELL__ >= 802+{-# COMPLETE YearQuarter #-}+#endif+#endif++monthOfYearQuarter :: MonthOfYear -> QuarterOfYear+monthOfYearQuarter my | my <= 3 = Q1+monthOfYearQuarter my | my <= 6 = Q2+monthOfYearQuarter my | my <= 9 = Q3+monthOfYearQuarter _ = Q4++monthQuarter :: Month -> Quarter+monthQuarter m = case toYearMonth m of+    (y, my) -> fromYearQuarter y $ monthOfYearQuarter my++dayQuarter :: Day -> Quarter+dayQuarter d = case toMonthDay d of+    (m, _) -> monthQuarter m++-- | Part of @YearQuarter@ pattern+fromYearQuarter :: Year -> QuarterOfYear -> Quarter+fromYearQuarter y qy = MkQuarter $ y * 4 + toInteger (pred $ fromEnum qy)++-- | Part of @YearQuarter@ pattern+toYearQuarter :: Quarter -> (Year, QuarterOfYear)+toYearQuarter (MkQuarter y) = case divMod' y 4 of+    (y, qy) -> (y, toEnum (succ (fromInteger qy)))++#endif

@@ -0,0 +1,34 @@+{-# LANGUAGE CPP #-}+module Data.Time.Calendar.Types (+    Year,+    MonthOfYear,+    DayOfMonth,+    DayOfYear,+    WeekOfYear,+) where++#if MIN_VERSION_time(1,11,0)++import Data.Time.Calendar          (DayOfMonth, MonthOfYear, Year)+import Data.Time.Calendar.MonthDay (DayOfYear)+import Data.Time.Calendar.WeekDate (WeekOfYear)++#else++-- | Year of Common Era.+type Year = Integer++-- | Month of year, in range 1 (January) to 12 (December).+type MonthOfYear = Int++-- | Day of month, in range 1 to 31.+type DayOfMonth = Int++-- | Day of year, in range 1 (January 1st) to 366.+-- December 31st is 365 in a common year, 366 in a leap year.+type DayOfYear = Int++-- | Week of year, by various reckonings, generally in range 0-53 depending on reckoning+type WeekOfYear = Int++#endif

@@ -1,10 +1,201 @@+{-# LANGUAGE CPP                #-}+{-# LANGUAGE BangPatterns       #-}+{-# LANGUAGE DeriveDataTypeable #-}+#if __GLASGOW_HASKELL__ >= 710+{-# LANGUAGE PatternSynonyms    #-}+{-# LANGUAGE ViewPatterns       #-}+#endif module Data.Time.Calendar.WeekDate.Compat (+    Year, WeekOfYear, DayOfWeek(..), dayOfWeek,+    FirstWeekType (..),+    toWeekCalendar,+    fromWeekCalendar,+    fromWeekCalendarValid,+    ++    -- * ISO 8601 Week Date format     toWeekDate,     fromWeekDate,+#if __GLASGOW_HASKELL__ >= 710+    pattern YearWeekDay,+#endif     fromWeekDateValid,     showWeekDate,-    ) where+) where  import Data.Time.Orphans () +import Data.Time.Calendar import Data.Time.Calendar.WeekDate++#if !MIN_VERSION_time(1,9,0)+import Data.Time.Format+#endif++#if !MIN_VERSION_time(1,11,0)+import Data.Data (Data)+import Data.Typeable (Typeable)+import Data.Time.Calendar.Types+import Data.Time.Calendar.Private+import Data.Time.Calendar.OrdinalDate+#endif++import Control.DeepSeq (NFData (..))+++#if !MIN_VERSION_time(1,11,0)+data FirstWeekType+    = FirstWholeWeek+    -- ^ first week is the first whole week of the year+    | FirstMostWeek+    -- ^ first week is the first week with four days in the year+    deriving (Eq, Typeable)++firstDayOfWeekCalendar :: FirstWeekType -> DayOfWeek -> Year -> Day+firstDayOfWeekCalendar wt dow year = let+    jan1st = fromOrdinalDate year 1+    in case wt of+        FirstWholeWeek -> firstDayOfWeekOnAfter dow jan1st+        FirstMostWeek -> firstDayOfWeekOnAfter dow $ addDays (-3) jan1st++-- Note that the year number matches the weeks, and so is not always the same as the Gregorian year number.+toWeekCalendar ::+    FirstWeekType+    -- ^ how to reckon the first week of the year+    -> DayOfWeek+    -- ^ the first day of each week+    -> Day+    -> (Year, WeekOfYear, DayOfWeek)+toWeekCalendar wt ws d = let+    dw = dayOfWeek d+    (y0,_) = toOrdinalDate d+    j1p = firstDayOfWeekCalendar wt ws $ pred y0+    j1 = firstDayOfWeekCalendar wt ws y0+    j1s = firstDayOfWeekCalendar wt ws $ succ y0+    in if d < j1+        then (pred y0,succ $ div (fromInteger $ diffDays d j1p) 7,dw)+        else if d < j1s then (y0,succ $ div (fromInteger $ diffDays d j1) 7,dw)+        else (succ y0,succ $ div (fromInteger $ diffDays d j1s) 7,dw)++-- | Convert from the given kind of "week calendar".+-- Invalid week and day values will be clipped to the correct range.+fromWeekCalendar ::+    FirstWeekType+    -- ^ how to reckon the first week of the year+    -> DayOfWeek+    -- ^ the first day of each week+    -> Year -> WeekOfYear -> DayOfWeek -> Day+fromWeekCalendar wt ws y wy dw = let+    d1 :: Day+    d1 = firstDayOfWeekCalendar wt ws y+    wy' = clip 1 53 wy+    getday :: WeekOfYear -> Day+    getday wy'' = addDays (toInteger $ (pred wy'' * 7) + (dayOfWeekDiff dw ws)) d1+    d1s = firstDayOfWeekCalendar wt ws $ succ y+    day = getday wy'+    in if wy' == 53 then if day >= d1s then getday 52 else day else day++-- | Convert from the given kind of "week calendar".+-- Invalid week and day values will return Nothing.+fromWeekCalendarValid ::+     FirstWeekType+    -- ^ how to reckon the first week of the year+    -> DayOfWeek+    -- ^ the first day of each week+    -> Year -> WeekOfYear -> DayOfWeek -> Maybe Day+fromWeekCalendarValid wt ws y wy dw = let+    d = fromWeekCalendar wt ws y wy dw+    in if toWeekCalendar wt ws d == (y,wy,dw) then Just d else Nothing++#if __GLASGOW_HASKELL__ >= 710+-- | Bidirectional abstract constructor for ISO 8601 Week Date format.+-- Invalid week values will be clipped to the correct range.+pattern YearWeekDay :: Year -> WeekOfYear -> DayOfWeek -> Day+pattern YearWeekDay y wy dw <- (toWeekDate -> (y,wy,toEnum -> dw)) where+    YearWeekDay y wy dw = fromWeekDate y wy (fromEnum dw)++#if __GLASGOW_HASKELL__ >= 802+{-# COMPLETE YearWeekDay #-}+#endif+#endif++#endif++#if !MIN_VERSION_time(1,9,0)++data DayOfWeek+    = Monday+    | Tuesday+    | Wednesday+    | Thursday+    | Friday+    | Saturday+    | Sunday+    deriving (Eq, Ord, Show, Read, Typeable, Data)++instance NFData DayOfWeek where+    rnf !_ = ()++-- | \"Circular\", so for example @[Tuesday ..]@ gives an endless sequence.+-- Also: 'fromEnum' gives [1 .. 7] for [Monday .. Sunday], and 'toEnum' performs mod 7 to give a cycle of days.+instance Enum DayOfWeek where+    toEnum i =+        case mod i 7 of+            0 -> Sunday+            1 -> Monday+            2 -> Tuesday+            3 -> Wednesday+            4 -> Thursday+            5 -> Friday+            _ -> Saturday+    fromEnum Monday = 1+    fromEnum Tuesday = 2+    fromEnum Wednesday = 3+    fromEnum Thursday = 4+    fromEnum Friday = 5+    fromEnum Saturday = 6+    fromEnum Sunday = 7+    enumFromTo wd1 wd2+        | wd1 == wd2 = [wd1]+    enumFromTo wd1 wd2 = wd1 : enumFromTo (succ wd1) wd2+    enumFromThenTo wd1 wd2 wd3+        | wd2 == wd3 = [wd1, wd2]+    enumFromThenTo wd1 wd2 wd3 = wd1 : enumFromThenTo wd2 (toEnum $ (2 * fromEnum wd2) - (fromEnum wd1)) wd3++dayOfWeek :: Day -> DayOfWeek+dayOfWeek (ModifiedJulianDay d) = toEnum $ fromInteger $ d + 3++++-------------------------------------------------------------------------------+-- FormatTime DayOfWeek+-------------------------------------------------------------------------------++toSomeDay :: DayOfWeek -> Day+toSomeDay d = ModifiedJulianDay (fromIntegral $ fromEnum d + 4)++#if MIN_VERSION_time(1,8,0)+#define FORMAT_OPTS tl mpo i+#else+#define FORMAT_OPTS tl mpo+#endif++instance FormatTime DayOfWeek where+    formatCharacter 'u' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter 'u')+    formatCharacter 'w' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter 'w')+    formatCharacter 'a' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter 'a')+    formatCharacter 'A' = fmap (\f FORMAT_OPTS d -> f FORMAT_OPTS (toSomeDay d)) (formatCharacter 'A')+    formatCharacter _  = Nothing++#endif++#if !MIN_VERSION_time(1,11,0)+-- | @dayOfWeekDiff a b = a - b@ in range 0 to 6.+-- The number of days from b to the next a.+dayOfWeekDiff :: DayOfWeek -> DayOfWeek -> Int+dayOfWeekDiff a b = mod (fromEnum a - fromEnum b) 7++-- | The first day-of-week on or after some day+firstDayOfWeekOnAfter :: DayOfWeek -> Day -> Day+firstDayOfWeekOnAfter dw d = addDays (toInteger $ dayOfWeekDiff dw $ dayOfWeek d) d+#endif

@@ -25,10 +25,16 @@        -- * Current time     getCurrentTime,-    getTime_resolution+    getTime_resolution,++    -- * Type aliases+    Year,+    MonthOfYear,+    DayOfMonth,     ) where  import Data.Time.Orphans ()+import Data.Time.Calendar.Types  import Data.Time.Clock import Data.Fixed (Pico)

@@ -20,6 +20,7 @@ import Data.Int (Int64) import Data.Word (Word32) import Data.Typeable (Typeable)+import Data.Data (Data)  import Data.Time.Clock.TAI.Compat import Data.Time.Clock.POSIX@@ -31,7 +32,7 @@ data SystemTime = MkSystemTime     { systemSeconds ::     {-# UNPACK #-} !Int64     , systemNanoseconds :: {-# UNPACK #-} !Word32-    } deriving (Eq,Ord,Show,Typeable)+    } deriving (Eq,Ord,Show,Typeable,Data)  instance NFData SystemTime where     rnf a = a `seq` ()

@@ -11,3 +11,4 @@ import Data.Time.Clock.Compat import Data.Time.LocalTime.Compat import Data.Time.Format.Compat+

@@ -5,7 +5,9 @@      -- * UNIX-style parsing     -- ** __Note__ in compat mode acceptWS argument is ignored, it's always 'True'.-    parseTimeM, parseTimeOrError,+    parseTimeM,+    -- parseTimeMultipleM, -- TODO+    parseTimeOrError,     readSTime, readPTime,     parseTime, readTime, readsTime,     ParseTime(),@@ -120,3 +122,17 @@           -> ReadS t readsTime = readSTime True #endif++-- TODO:+--+-- #if !MIN_VERSION_time(1,11,0)+-- -- | Parses a time value given a list of pairs of format and input.+-- -- Resulting value is constructed from all provided specifiers.+-- parseTimeMultipleM+--     :: (Fail.MonadFail m, ParseTime t)+--     => Bool -- ^ Accept leading and trailing whitespace?+--     -> TimeLocale -- ^ Time locale.+--     -> [(String, String)] -- ^ Pairs of (format string, input string).+--     -> m t -- ^ Return the time value, or fail if the input could not be parsed using the given format.+-- parseTimeMultipleM = undefined -- parseTimeMultipleM' Proxy+-- #endif

@@ -41,6 +41,8 @@ import Data.Data (Data, Typeable) import Data.Semigroup (Semigroup (..)) +import Control.DeepSeq (NFData (..))+ ------------------------------------------------------------------------------- -- TimeOfDay -------------------------------------------------------------------------------@@ -94,11 +96,14 @@  -- | Additive instance Semigroup CalendarDiffTime where-     CalendarDiffTime m1 d1 <> CalendarDiffTime m2 d2 = CalendarDiffTime (m1 + m2) (d1 + d2)+ instance Monoid CalendarDiffTime where     mempty = CalendarDiffTime 0 0     mappend = (<>)++instance NFData CalendarDiffTime where+    rnf (CalendarDiffTime x y) = rnf x `seq` rnf y  instance Show CalendarDiffTime where     show (CalendarDiffTime m t) = "P" ++ show m ++ "MT" ++ showFixed True (realToFrac t :: Pico) ++ "S"

@@ -1,14 +1,36 @@ {-# LANGUAGE CPP #-}-module Data.Time.Orphans where+{-# LANGUAGE BangPatterns #-}+{-# LANGUAGE StandaloneDeriving #-}+{-# LANGUAGE DeriveDataTypeable #-}+module Data.Time.Orphans () where  import Data.Orphans ()  import Control.DeepSeq (NFData (..))+import Data.Typeable (Typeable)+import Data.Data (Data) import Data.Time import Data.Time.Clock import Data.Time.Clock.TAI import Data.Time.Format +#if MIN_VERSION_time(1,8,0)+import Data.Time.Clock.System+#endif++#if !MIN_VERSION_time(1,11,0)+import Data.Fixed (Pico)+import Text.Read (Read (..))+import Text.ParserCombinators.ReadP+import Text.ParserCombinators.ReadPrec+#endif++#if MIN_VERSION_time(1,11,0)+import Data.Ix (Ix (..))+import Data.Time.Calendar.Month+import Data.Time.Calendar.Quarter+#endif+ #if !MIN_VERSION_time(1,4,0) instance NFData Day where     rnf (ModifiedJulianDay d) = rnf d@@ -55,4 +77,101 @@  instance Read UniversalTime where     readsPrec n s = [ (localTimeToUT1 0 t, r) | (t,r) <- readsPrec n s ]+#endif+++#if MIN_VERSION_time(1,9,0) && !MIN_VERSION_time(1,11,0)+deriving instance Ord DayOfWeek+#endif++#if MIN_VERSION_time(1,9,0) && !MIN_VERSION_time(1,10,0)+#if __GLASGOW_HASKELL__ <710+deriving instance Typeable DayOfWeek+#endif+deriving instance Data DayOfWeek+#endif++#if MIN_VERSION_time(1,8,0) && !MIN_VERSION_time(1,10,0)+#if __GLASGOW_HASKELL__ <710+deriving instance Typeable SystemTime+#endif++deriving instance Data SystemTime+#endif++-- TODO: add an upper bound when it's known+#if MIN_VERSION_time(1,9,0)+instance NFData DayOfWeek where+    rnf !_ = ()+#endif++-- TODO: add an upper bound when it's known+#if MIN_VERSION_time(1,9,0)+instance NFData CalendarDiffTime where+    rnf (CalendarDiffTime x y) = rnf x `seq` rnf y+#endif++#if !MIN_VERSION_time(1,11,0)++instance Read DiffTime where+    readPrec = do+        t <- readPrec :: ReadPrec Pico+        _ <- lift $ char 's'+        return $ realToFrac t++instance Read NominalDiffTime where+    readPrec = do+        t <- readPrec :: ReadPrec Pico+        _ <- lift $ char 's'+        return $ realToFrac t++#endif++-- TODO: add an upper bound when it's known+#if MIN_VERSION_time(1,11,0)+instance NFData Month where+    rnf (MkMonth m) = rnf m++instance Enum Month where+    succ (MkMonth a) = MkMonth (succ a)+    pred (MkMonth a) = MkMonth (pred a)+    toEnum = MkMonth . toEnum+    fromEnum (MkMonth a) = fromEnum a+    enumFrom (MkMonth a) = fmap MkMonth (enumFrom a)+    enumFromThen (MkMonth a) (MkMonth b) = fmap MkMonth (enumFromThen a b)+    enumFromTo (MkMonth a) (MkMonth b) = fmap MkMonth (enumFromTo a b)+    enumFromThenTo (MkMonth a) (MkMonth b) (MkMonth c) =+        fmap MkMonth (enumFromThenTo a b c)++instance Ix Month where+    range (MkMonth a, MkMonth b) = fmap MkMonth (range (a, b))+    index (MkMonth a, MkMonth b) (MkMonth c) = index (a, b) c+    inRange (MkMonth a, MkMonth b) (MkMonth c) = inRange (a, b) c+    rangeSize (MkMonth a, MkMonth b) = rangeSize (a, b)++instance NFData QuarterOfYear where+    rnf Q1 = ()+    rnf Q2 = ()+    rnf Q3 = ()+    rnf Q4 = ()++instance NFData Quarter where+    rnf (MkQuarter m) = rnf m++instance Enum Quarter where+    succ (MkQuarter a) = MkQuarter (succ a)+    pred (MkQuarter a) = MkQuarter (pred a)+    toEnum = MkQuarter . toEnum+    fromEnum (MkQuarter a) = fromEnum a+    enumFrom (MkQuarter a) = fmap MkQuarter (enumFrom a)+    enumFromThen (MkQuarter a) (MkQuarter b) = fmap MkQuarter (enumFromThen a b)+    enumFromTo (MkQuarter a) (MkQuarter b) = fmap MkQuarter (enumFromTo a b)+    enumFromThenTo (MkQuarter a) (MkQuarter b) (MkQuarter c) =+        fmap MkQuarter (enumFromThenTo a b c)++instance Ix Quarter where+    range (MkQuarter a, MkQuarter b) = fmap MkQuarter (range (a, b))+    index (MkQuarter a, MkQuarter b) (MkQuarter c) = index (a, b) c+    inRange (MkQuarter a, MkQuarter b) (MkQuarter c) = inRange (a, b) c+    rangeSize (MkQuarter a, MkQuarter b) = rangeSize (a, b) #endif

@@ -0,0 +1,104 @@+module Main where++import Control.DeepSeq (NFData (rnf), force)++import Data.Time.Calendar.Compat+import Data.Time.Calendar.Month.Compat+import Data.Time.Calendar.Quarter.Compat+import Data.Time.Clock.System.Compat+import Data.Time.Clock.TAI.Compat+import Data.Time.Compat+import Data.Time.Format.Compat+import Test.HUnit.Base               ((@?=))++main :: IO ()+main = do+    utc <- getCurrentTime++    -- UTCTime+    putStrLn $ formatTime defaultTimeLocale rfc822DateFormat (force utc)++    -- ZonedTime+    zt <- getZonedTime+    putStrLn $ formatTime defaultTimeLocale rfc822DateFormat (force zt)++    -- SystemTime+    st <- getSystemTime+    print $ force st++    -- FormatTime DayOfWeek+    formatTime defaultTimeLocale "%u %w %a %A" Monday @?= "1 1 Mon Monday"++    -- TAI taiNominalDayStart+    show (taiNominalDayStart (ModifiedJulianDay 123)) @?= "1859-03-20 00:00:00 TAI"++_ParseTimeInstances :: [()]+_ParseTimeInstances =+    [ () -- test (undefined :: CalendarDiffTime)+    , test (undefined :: Day)+    , () -- test (undefined :: DiffTime)+    , () -- test (undefined :: NominalDiffTime)+    , test (undefined :: UTCTime)+    , test (undefined :: UniversalTime)+    , () -- test (undefined :: CalendarDiffTime)+    , test (undefined :: TimeZone)+    , test (undefined :: TimeOfDay)+    , test (undefined :: LocalTime)+    , test (undefined :: ZonedTime)+    ]+  where+    test :: ParseTime t => t -> ()+    test _ = ()++_FormatTimeInstances :: [()]+_FormatTimeInstances =+    [ () -- test (undefined :: CalendarDiffTime)+    , test (undefined :: Day)+    , () -- test (undefined :: DiffTime)+    , () -- test (undefined :: NominalDiffTime)+    , test (undefined :: UTCTime)+    , test (undefined :: UniversalTime)+    , () -- test (undefined :: CalendarDiffTime)+    , test (undefined :: TimeZone)+    , test (undefined :: TimeOfDay)+    , test (undefined :: LocalTime)+    , test (undefined :: ZonedTime)+    , test (undefined :: DayOfWeek)+    , test (undefined :: Month)+    ]+  where+    test :: FormatTime t => t -> ()+    test _ = ()++_NFDataInstances :: [()]+_NFDataInstances =+    [ test (undefined :: CalendarDiffTime)+    , test (undefined :: Day)+    , test (undefined :: DiffTime)+    , test (undefined :: NominalDiffTime)+    , test (undefined :: UTCTime)+    , test (undefined :: UniversalTime)+    , test (undefined :: CalendarDiffTime)+    , test (undefined :: TimeZone)+    , test (undefined :: TimeOfDay)+    , test (undefined :: LocalTime)+    , test (undefined :: ZonedTime)+    , test (undefined :: DayOfWeek)+    , test (undefined :: Month)+    , test (undefined :: Quarter)+    , test (undefined :: QuarterOfYear)+    ]+  where+    test :: NFData t => t -> ()+    test = rnf ++_EnumInstances :: [()]+_EnumInstances =+    [ test (undefined :: Day)+    , test (undefined :: Month)+    , test (undefined :: Quarter)+    , test (undefined :: QuarterOfYear)+    ]+  where+    test :: Enum t => t -> ()+    test _ = ()

@@ -1,68 +0,0 @@-module Main where--import Control.DeepSeq (force)--import Data.Time.Calendar.Compat-import Data.Time.Clock.System.Compat-import Data.Time.Clock.TAI.Compat-import Data.Time.Compat-import Data.Time.Format.Compat-import Test.HUnit.Base               ((@?=))--main :: IO ()-main = do-    utc <- getCurrentTime--    -- UTCTime-    putStrLn $ formatTime defaultTimeLocale rfc822DateFormat (force utc)--    -- ZonedTime-    zt <- getZonedTime-    putStrLn $ formatTime defaultTimeLocale rfc822DateFormat (force zt)--    -- SystemTime-    st <- getSystemTime-    print $ force st--    -- FormatTime DayOfWeek-    formatTime defaultTimeLocale "%u %w %a %A" Monday @?= "1 1 Mon Monday"--    -- TAI taiNominalDayStart-    show (taiNominalDayStart (ModifiedJulianDay 123)) @?= "1859-03-20 00:00:00 TAI"--_ParseTimeInstances :: [()]-_ParseTimeInstances =-    [ () -- test (undefined :: CalendarDiffTime)-    , test (undefined :: Day)-    , () -- test (undefined :: DiffTime)-    , () -- test (undefined :: NominalDiffTime)-    , test (undefined :: UTCTime)-    , test (undefined :: UniversalTime)-    , () -- test (undefined :: CalendarDiffTime)-    , test (undefined :: TimeZone)-    , test (undefined :: TimeOfDay)-    , test (undefined :: LocalTime)-    , test (undefined :: ZonedTime)-    ]-  where-    test :: ParseTime t => t -> ()-    test _ = ()--_FormatTimeInstances :: [()]-_FormatTimeInstances =-    [ () -- test (undefined :: CalendarDiffTime)-    , test (undefined :: Day)-    , () -- test (undefined :: DiffTime)-    , () -- test (undefined :: NominalDiffTime)-    , test (undefined :: UTCTime)-    , test (undefined :: UniversalTime)-    , () -- test (undefined :: CalendarDiffTime)-    , test (undefined :: TimeZone)-    , test (undefined :: TimeOfDay)-    , test (undefined :: LocalTime)-    , test (undefined :: ZonedTime)-    , test (undefined :: DayOfWeek)-    ]-  where-    test :: FormatTime t => t -> ()-    test _ = ()

@@ -1,7 +1,8 @@ module Main where -import Test.Tasty+import Test.Types() import Test.Calendar.AddDays+import Test.Calendar.CalendarProps import Test.Calendar.Calendars import Test.Calendar.ClipDates import Test.Calendar.ConvertBack@@ -14,50 +15,37 @@ import Test.Clock.Conversion import Test.Clock.Resolution import Test.Clock.TAI+import Test.Format.Compile () import Test.Format.Format-import Test.Format.ParseTime import Test.Format.ISO8601+import Test.Format.ParseTime+import Test.LocalTime.CalendarDiffTime import Test.LocalTime.Time import Test.LocalTime.TimeOfDay-import Test.LocalTime.CalendarDiffTime-+import Test.Tasty  tests :: TestTree-tests = testGroup "Time" [-    testGroup "Calendar" [-        addDaysTest,-        testCalendars,-        clipDates,-        convertBack,-        longWeekYears,-        testMonthDay,-        testEaster,-        testValid,-        testWeek,-        testDuration-        ],-    testGroup "Clock" [-        testClockConversion,-        testResolutions,-        testTAI-        ],-    testGroup "Format" [-        testFormat,-        testParseTime,-        testISO8601-        ],-    testGroup "LocalTime" [-        testTime,-        testTimeOfDay,-        testCalendarDiffTime+tests =+    testGroup+        "Time"+        [ testGroup+              "Calendar"+              [ addDaysTest+              , testCalendarProps+              , testCalendars+              , clipDates+              , convertBack+              , longWeekYears+              , testMonthDay+              , testEaster+              , testValid+              , testWeek+              , testDuration+              ]+        , testGroup "Clock" [testClockConversion, testResolutions, testTAI]+        , testGroup "Format" [testFormat, {- testParseTime, -} testISO8601]+        , testGroup "LocalTime" [testTime, testTimeOfDay, testCalendarDiffTime]         ]-    ]  main :: IO ()-main = --- on older GHC we only compile-#if __GLASGOW_HASKELL__ >=802-    defaultMain tests-#else-    return ()-#endif+main = defaultMain tests

@@ -2,16 +2,35 @@  module Test.Arbitrary where -import Data.Time.Compat-import Data.Time.Clock.POSIX.Compat- import Control.Monad+import Data.Fixed import Data.Ratio+import Data.Time.Compat+import Data.Time.Calendar.WeekDate.Compat+import Data.Time.Calendar.Month.Compat+import Data.Time.Calendar.Quarter.Compat+import Data.Time.Clock.POSIX.Compat import Test.Tasty.QuickCheck hiding (reason)  instance Arbitrary DayOfWeek where-    arbitrary = fmap toEnum $ choose (1,7)+    arbitrary = fmap toEnum $ choose (1, 7) +instance Arbitrary FirstWeekType where+    arbitrary = do+        b <- arbitrary+        return $ if b then FirstWholeWeek else FirstMostWeek++deriving instance Show FirstWeekType++instance Arbitrary Month where+    arbitrary = liftM MkMonth $ choose (-30000, 200000)++instance Arbitrary Quarter where+    arbitrary = liftM MkQuarter $ choose (-30000, 200000)++instance Arbitrary QuarterOfYear where+    arbitrary = liftM toEnum $ choose (1, 4)+ instance Arbitrary Day where     arbitrary = liftM ModifiedJulianDay $ choose (-313698, 2973483) -- 1000-01-1 to 9999-12-31     shrink day = let@@ -69,32 +88,59 @@ instance Arbitrary CalendarDiffTime where     arbitrary = liftM2 CalendarDiffTime arbitrary arbitrary +reduceDigits :: Int -> Pico -> Maybe Pico+reduceDigits (-1) _ = Nothing+reduceDigits n x = let+    d :: Pico+    d = 10 ^^ (negate n)+    r = mod' x d+    in case r of+           0 -> reduceDigits (n - 1) x+           _ -> Just $ x - r+ instance Arbitrary TimeOfDay where     arbitrary = liftM timeToTimeOfDay arbitrary+    shrink (TimeOfDay h m s) = let+        shrinkInt 0 = []+        shrinkInt 1 = [0]+        shrinkInt _ = [0, 1]+        shrinkPico 0 = []+        shrinkPico 1 = [0]+        shrinkPico p =+            case reduceDigits 12 p of+                Just p' -> [0, 1, p']+                Nothing -> [0, 1]+        in [TimeOfDay h' m s | h' <- shrinkInt h] +++           [TimeOfDay h m' s | m' <- shrinkInt m] ++ [TimeOfDay h m s' | s' <- shrinkPico s]  instance CoArbitrary TimeOfDay where     coarbitrary t = coarbitrary (timeOfDayToTime t)  instance Arbitrary LocalTime where     arbitrary = liftM2 LocalTime arbitrary arbitrary+    shrink (LocalTime d tod) = [LocalTime d' tod | d' <- shrink d] ++ [LocalTime d tod' | tod' <- shrink tod]  instance CoArbitrary LocalTime where     coarbitrary t = coarbitrary (floor (utcTimeToPOSIXSeconds (localTimeToUTC utc t)) :: Integer)  instance Arbitrary TimeZone where     arbitrary = liftM minutesToTimeZone $ choose (-720, 720)+    shrink (TimeZone 0 _ _) = []+    shrink (TimeZone _ s n) = [TimeZone 0 s n]  instance CoArbitrary TimeZone where     coarbitrary tz = coarbitrary (timeZoneMinutes tz)  instance Arbitrary ZonedTime where     arbitrary = liftM2 ZonedTime arbitrary arbitrary+    shrink (ZonedTime d tz) = [ZonedTime d' tz | d' <- shrink d] ++ [ZonedTime d tz' | tz' <- shrink tz]  instance CoArbitrary ZonedTime where     coarbitrary t = coarbitrary (floor (utcTimeToPOSIXSeconds (zonedTimeToUTC t)) :: Integer)  instance Arbitrary UTCTime where     arbitrary = liftM2 UTCTime arbitrary arbitrary+    shrink t = fmap (localTimeToUTC utc) $ shrink $ utcToLocalTime utc t  instance CoArbitrary UTCTime where     coarbitrary t = coarbitrary (floor (utcTimeToPOSIXSeconds t) :: Integer)@@ -103,6 +149,7 @@     arbitrary = liftM (\n -> ModJulianDate $ n % k) $ choose (-313698 * k, 2973483 * k) -- 1000-01-1 to 9999-12-31       where         k = 86400+    shrink t = fmap (localTimeToUT1 0) $ shrink $ ut1ToLocalTime 0 t  instance CoArbitrary UniversalTime where     coarbitrary (ModJulianDate d) = coarbitrary d

@@ -1,43 +1,43 @@-module Test.Calendar.AddDays(addDaysTest) where--import Data.Time.Calendar.Compat+module Test.Calendar.AddDays+    ( addDaysTest+    ) where +import Data.Time.Calendar+import Test.Calendar.AddDaysRef import Test.Tasty import Test.Tasty.HUnit-import Test.Calendar.AddDaysRef -days ::[Day]+days :: [Day] days =-    [-    fromGregorian 2005 2 28,-    fromGregorian 2004 2 29,-    fromGregorian 2004 1 31,-    fromGregorian 2004 12 31,-    fromGregorian 2005 7 1,-    fromGregorian 2005 4 21,-    fromGregorian 2005 6 30+    [ fromGregorian 2005 2 28+    , fromGregorian 2004 2 29+    , fromGregorian 2004 1 31+    , fromGregorian 2004 12 31+    , fromGregorian 2005 7 1+    , fromGregorian 2005 4 21+    , fromGregorian 2005 6 30     ]  increments :: [Integer]-increments = [-10,-4,-1,0,1,7,83]+increments = [-10, -4, -1, 0, 1, 7, 83] -adders :: [(String,Integer -> Day -> Day)]+adders :: [(String, Integer -> Day -> Day)] adders =-    [-    ("day",addDays),-    ("month (clip)",addGregorianMonthsClip),-    ("month (roll over)",addGregorianMonthsRollOver),-    ("year (clip)",addGregorianYearsClip),-    ("year (roll over)",addGregorianYearsRollOver)+    [ ("day", addDays)+    , ("month (clip)", addGregorianMonthsClip)+    , ("month (roll over)", addGregorianMonthsRollOver)+    , ("year (clip)", addGregorianYearsClip)+    , ("year (roll over)", addGregorianYearsRollOver)     ]  resultDays :: [String] resultDays = do-    (aname,adder) <- adders+    (aname, adder) <- adders     increment <- increments     day <- days-    return ((showGregorian day) ++ " + " ++ (show increment) ++ " * " ++ aname ++ " = " ++ showGregorian (adder increment day))+    return+        ((showGregorian day) +++         " + " ++ (show increment) ++ " * " ++ aname ++ " = " ++ showGregorian (adder increment day))  addDaysTest :: TestTree-addDaysTest = testCase "addDays" $-    assertEqual "" addDaysRef $ unlines resultDays+addDaysTest = testCase "addDays" $ assertEqual "" addDaysRef $ unlines resultDays

@@ -2,249 +2,250 @@  addDaysRef :: String addDaysRef =- unlines-  [ "2005-02-28 + -10 * day = 2005-02-18"-  , "2004-02-29 + -10 * day = 2004-02-19"-  , "2004-01-31 + -10 * day = 2004-01-21"-  , "2004-12-31 + -10 * day = 2004-12-21"-  , "2005-07-01 + -10 * day = 2005-06-21"-  , "2005-04-21 + -10 * day = 2005-04-11"-  , "2005-06-30 + -10 * day = 2005-06-20"-  , "2005-02-28 + -4 * day = 2005-02-24"-  , "2004-02-29 + -4 * day = 2004-02-25"-  , "2004-01-31 + -4 * day = 2004-01-27"-  , "2004-12-31 + -4 * day = 2004-12-27"-  , "2005-07-01 + -4 * day = 2005-06-27"-  , "2005-04-21 + -4 * day = 2005-04-17"-  , "2005-06-30 + -4 * day = 2005-06-26"-  , "2005-02-28 + -1 * day = 2005-02-27"-  , "2004-02-29 + -1 * day = 2004-02-28"-  , "2004-01-31 + -1 * day = 2004-01-30"-  , "2004-12-31 + -1 * day = 2004-12-30"-  , "2005-07-01 + -1 * day = 2005-06-30"-  , "2005-04-21 + -1 * day = 2005-04-20"-  , "2005-06-30 + -1 * day = 2005-06-29"-  , "2005-02-28 + 0 * day = 2005-02-28"-  , "2004-02-29 + 0 * day = 2004-02-29"-  , "2004-01-31 + 0 * day = 2004-01-31"-  , "2004-12-31 + 0 * day = 2004-12-31"-  , "2005-07-01 + 0 * day = 2005-07-01"-  , "2005-04-21 + 0 * day = 2005-04-21"-  , "2005-06-30 + 0 * day = 2005-06-30"-  , "2005-02-28 + 1 * day = 2005-03-01"-  , "2004-02-29 + 1 * day = 2004-03-01"-  , "2004-01-31 + 1 * day = 2004-02-01"-  , "2004-12-31 + 1 * day = 2005-01-01"-  , "2005-07-01 + 1 * day = 2005-07-02"-  , "2005-04-21 + 1 * day = 2005-04-22"-  , "2005-06-30 + 1 * day = 2005-07-01"-  , "2005-02-28 + 7 * day = 2005-03-07"-  , "2004-02-29 + 7 * day = 2004-03-07"-  , "2004-01-31 + 7 * day = 2004-02-07"-  , "2004-12-31 + 7 * day = 2005-01-07"-  , "2005-07-01 + 7 * day = 2005-07-08"-  , "2005-04-21 + 7 * day = 2005-04-28"-  , "2005-06-30 + 7 * day = 2005-07-07"-  , "2005-02-28 + 83 * day = 2005-05-22"-  , "2004-02-29 + 83 * day = 2004-05-22"-  , "2004-01-31 + 83 * day = 2004-04-23"-  , "2004-12-31 + 83 * day = 2005-03-24"-  , "2005-07-01 + 83 * day = 2005-09-22"-  , "2005-04-21 + 83 * day = 2005-07-13"-  , "2005-06-30 + 83 * day = 2005-09-21"-  , "2005-02-28 + -10 * month (clip) = 2004-04-28"-  , "2004-02-29 + -10 * month (clip) = 2003-04-29"-  , "2004-01-31 + -10 * month (clip) = 2003-03-31"-  , "2004-12-31 + -10 * month (clip) = 2004-02-29"-  , "2005-07-01 + -10 * month (clip) = 2004-09-01"-  , "2005-04-21 + -10 * month (clip) = 2004-06-21"-  , "2005-06-30 + -10 * month (clip) = 2004-08-30"-  , "2005-02-28 + -4 * month (clip) = 2004-10-28"-  , "2004-02-29 + -4 * month (clip) = 2003-10-29"-  , "2004-01-31 + -4 * month (clip) = 2003-09-30"-  , "2004-12-31 + -4 * month (clip) = 2004-08-31"-  , "2005-07-01 + -4 * month (clip) = 2005-03-01"-  , "2005-04-21 + -4 * month (clip) = 2004-12-21"-  , "2005-06-30 + -4 * month (clip) = 2005-02-28"-  , "2005-02-28 + -1 * month (clip) = 2005-01-28"-  , "2004-02-29 + -1 * month (clip) = 2004-01-29"-  , "2004-01-31 + -1 * month (clip) = 2003-12-31"-  , "2004-12-31 + -1 * month (clip) = 2004-11-30"-  , "2005-07-01 + -1 * month (clip) = 2005-06-01"-  , "2005-04-21 + -1 * month (clip) = 2005-03-21"-  , "2005-06-30 + -1 * month (clip) = 2005-05-30"-  , "2005-02-28 + 0 * month (clip) = 2005-02-28"-  , "2004-02-29 + 0 * month (clip) = 2004-02-29"-  , "2004-01-31 + 0 * month (clip) = 2004-01-31"-  , "2004-12-31 + 0 * month (clip) = 2004-12-31"-  , "2005-07-01 + 0 * month (clip) = 2005-07-01"-  , "2005-04-21 + 0 * month (clip) = 2005-04-21"-  , "2005-06-30 + 0 * month (clip) = 2005-06-30"-  , "2005-02-28 + 1 * month (clip) = 2005-03-28"-  , "2004-02-29 + 1 * month (clip) = 2004-03-29"-  , "2004-01-31 + 1 * month (clip) = 2004-02-29"-  , "2004-12-31 + 1 * month (clip) = 2005-01-31"-  , "2005-07-01 + 1 * month (clip) = 2005-08-01"-  , "2005-04-21 + 1 * month (clip) = 2005-05-21"-  , "2005-06-30 + 1 * month (clip) = 2005-07-30"-  , "2005-02-28 + 7 * month (clip) = 2005-09-28"-  , "2004-02-29 + 7 * month (clip) = 2004-09-29"-  , "2004-01-31 + 7 * month (clip) = 2004-08-31"-  , "2004-12-31 + 7 * month (clip) = 2005-07-31"-  , "2005-07-01 + 7 * month (clip) = 2006-02-01"-  , "2005-04-21 + 7 * month (clip) = 2005-11-21"-  , "2005-06-30 + 7 * month (clip) = 2006-01-30"-  , "2005-02-28 + 83 * month (clip) = 2012-01-28"-  , "2004-02-29 + 83 * month (clip) = 2011-01-29"-  , "2004-01-31 + 83 * month (clip) = 2010-12-31"-  , "2004-12-31 + 83 * month (clip) = 2011-11-30"-  , "2005-07-01 + 83 * month (clip) = 2012-06-01"-  , "2005-04-21 + 83 * month (clip) = 2012-03-21"-  , "2005-06-30 + 83 * month (clip) = 2012-05-30"-  , "2005-02-28 + -10 * month (roll over) = 2004-04-28"-  , "2004-02-29 + -10 * month (roll over) = 2003-04-29"-  , "2004-01-31 + -10 * month (roll over) = 2003-03-31"-  , "2004-12-31 + -10 * month (roll over) = 2004-03-02"-  , "2005-07-01 + -10 * month (roll over) = 2004-09-01"-  , "2005-04-21 + -10 * month (roll over) = 2004-06-21"-  , "2005-06-30 + -10 * month (roll over) = 2004-08-30"-  , "2005-02-28 + -4 * month (roll over) = 2004-10-28"-  , "2004-02-29 + -4 * month (roll over) = 2003-10-29"-  , "2004-01-31 + -4 * month (roll over) = 2003-10-01"-  , "2004-12-31 + -4 * month (roll over) = 2004-08-31"-  , "2005-07-01 + -4 * month (roll over) = 2005-03-01"-  , "2005-04-21 + -4 * month (roll over) = 2004-12-21"-  , "2005-06-30 + -4 * month (roll over) = 2005-03-02"-  , "2005-02-28 + -1 * month (roll over) = 2005-01-28"-  , "2004-02-29 + -1 * month (roll over) = 2004-01-29"-  , "2004-01-31 + -1 * month (roll over) = 2003-12-31"-  , "2004-12-31 + -1 * month (roll over) = 2004-12-01"-  , "2005-07-01 + -1 * month (roll over) = 2005-06-01"-  , "2005-04-21 + -1 * month (roll over) = 2005-03-21"-  , "2005-06-30 + -1 * month (roll over) = 2005-05-30"-  , "2005-02-28 + 0 * month (roll over) = 2005-02-28"-  , "2004-02-29 + 0 * month (roll over) = 2004-02-29"-  , "2004-01-31 + 0 * month (roll over) = 2004-01-31"-  , "2004-12-31 + 0 * month (roll over) = 2004-12-31"-  , "2005-07-01 + 0 * month (roll over) = 2005-07-01"-  , "2005-04-21 + 0 * month (roll over) = 2005-04-21"-  , "2005-06-30 + 0 * month (roll over) = 2005-06-30"-  , "2005-02-28 + 1 * month (roll over) = 2005-03-28"-  , "2004-02-29 + 1 * month (roll over) = 2004-03-29"-  , "2004-01-31 + 1 * month (roll over) = 2004-03-02"-  , "2004-12-31 + 1 * month (roll over) = 2005-01-31"-  , "2005-07-01 + 1 * month (roll over) = 2005-08-01"-  , "2005-04-21 + 1 * month (roll over) = 2005-05-21"-  , "2005-06-30 + 1 * month (roll over) = 2005-07-30"-  , "2005-02-28 + 7 * month (roll over) = 2005-09-28"-  , "2004-02-29 + 7 * month (roll over) = 2004-09-29"-  , "2004-01-31 + 7 * month (roll over) = 2004-08-31"-  , "2004-12-31 + 7 * month (roll over) = 2005-07-31"-  , "2005-07-01 + 7 * month (roll over) = 2006-02-01"-  , "2005-04-21 + 7 * month (roll over) = 2005-11-21"-  , "2005-06-30 + 7 * month (roll over) = 2006-01-30"-  , "2005-02-28 + 83 * month (roll over) = 2012-01-28"-  , "2004-02-29 + 83 * month (roll over) = 2011-01-29"-  , "2004-01-31 + 83 * month (roll over) = 2010-12-31"-  , "2004-12-31 + 83 * month (roll over) = 2011-12-01"-  , "2005-07-01 + 83 * month (roll over) = 2012-06-01"-  , "2005-04-21 + 83 * month (roll over) = 2012-03-21"-  , "2005-06-30 + 83 * month (roll over) = 2012-05-30"-  , "2005-02-28 + -10 * year (clip) = 1995-02-28"-  , "2004-02-29 + -10 * year (clip) = 1994-02-28"-  , "2004-01-31 + -10 * year (clip) = 1994-01-31"-  , "2004-12-31 + -10 * year (clip) = 1994-12-31"-  , "2005-07-01 + -10 * year (clip) = 1995-07-01"-  , "2005-04-21 + -10 * year (clip) = 1995-04-21"-  , "2005-06-30 + -10 * year (clip) = 1995-06-30"-  , "2005-02-28 + -4 * year (clip) = 2001-02-28"-  , "2004-02-29 + -4 * year (clip) = 2000-02-29"-  , "2004-01-31 + -4 * year (clip) = 2000-01-31"-  , "2004-12-31 + -4 * year (clip) = 2000-12-31"-  , "2005-07-01 + -4 * year (clip) = 2001-07-01"-  , "2005-04-21 + -4 * year (clip) = 2001-04-21"-  , "2005-06-30 + -4 * year (clip) = 2001-06-30"-  , "2005-02-28 + -1 * year (clip) = 2004-02-28"-  , "2004-02-29 + -1 * year (clip) = 2003-02-28"-  , "2004-01-31 + -1 * year (clip) = 2003-01-31"-  , "2004-12-31 + -1 * year (clip) = 2003-12-31"-  , "2005-07-01 + -1 * year (clip) = 2004-07-01"-  , "2005-04-21 + -1 * year (clip) = 2004-04-21"-  , "2005-06-30 + -1 * year (clip) = 2004-06-30"-  , "2005-02-28 + 0 * year (clip) = 2005-02-28"-  , "2004-02-29 + 0 * year (clip) = 2004-02-29"-  , "2004-01-31 + 0 * year (clip) = 2004-01-31"-  , "2004-12-31 + 0 * year (clip) = 2004-12-31"-  , "2005-07-01 + 0 * year (clip) = 2005-07-01"-  , "2005-04-21 + 0 * year (clip) = 2005-04-21"-  , "2005-06-30 + 0 * year (clip) = 2005-06-30"-  , "2005-02-28 + 1 * year (clip) = 2006-02-28"-  , "2004-02-29 + 1 * year (clip) = 2005-02-28"-  , "2004-01-31 + 1 * year (clip) = 2005-01-31"-  , "2004-12-31 + 1 * year (clip) = 2005-12-31"-  , "2005-07-01 + 1 * year (clip) = 2006-07-01"-  , "2005-04-21 + 1 * year (clip) = 2006-04-21"-  , "2005-06-30 + 1 * year (clip) = 2006-06-30"-  , "2005-02-28 + 7 * year (clip) = 2012-02-28"-  , "2004-02-29 + 7 * year (clip) = 2011-02-28"-  , "2004-01-31 + 7 * year (clip) = 2011-01-31"-  , "2004-12-31 + 7 * year (clip) = 2011-12-31"-  , "2005-07-01 + 7 * year (clip) = 2012-07-01"-  , "2005-04-21 + 7 * year (clip) = 2012-04-21"-  , "2005-06-30 + 7 * year (clip) = 2012-06-30"-  , "2005-02-28 + 83 * year (clip) = 2088-02-28"-  , "2004-02-29 + 83 * year (clip) = 2087-02-28"-  , "2004-01-31 + 83 * year (clip) = 2087-01-31"-  , "2004-12-31 + 83 * year (clip) = 2087-12-31"-  , "2005-07-01 + 83 * year (clip) = 2088-07-01"-  , "2005-04-21 + 83 * year (clip) = 2088-04-21"-  , "2005-06-30 + 83 * year (clip) = 2088-06-30"-  , "2005-02-28 + -10 * year (roll over) = 1995-02-28"-  , "2004-02-29 + -10 * year (roll over) = 1994-03-01"-  , "2004-01-31 + -10 * year (roll over) = 1994-01-31"-  , "2004-12-31 + -10 * year (roll over) = 1994-12-31"-  , "2005-07-01 + -10 * year (roll over) = 1995-07-01"-  , "2005-04-21 + -10 * year (roll over) = 1995-04-21"-  , "2005-06-30 + -10 * year (roll over) = 1995-06-30"-  , "2005-02-28 + -4 * year (roll over) = 2001-02-28"-  , "2004-02-29 + -4 * year (roll over) = 2000-02-29"-  , "2004-01-31 + -4 * year (roll over) = 2000-01-31"-  , "2004-12-31 + -4 * year (roll over) = 2000-12-31"-  , "2005-07-01 + -4 * year (roll over) = 2001-07-01"-  , "2005-04-21 + -4 * year (roll over) = 2001-04-21"-  , "2005-06-30 + -4 * year (roll over) = 2001-06-30"-  , "2005-02-28 + -1 * year (roll over) = 2004-02-28"-  , "2004-02-29 + -1 * year (roll over) = 2003-03-01"-  , "2004-01-31 + -1 * year (roll over) = 2003-01-31"-  , "2004-12-31 + -1 * year (roll over) = 2003-12-31"-  , "2005-07-01 + -1 * year (roll over) = 2004-07-01"-  , "2005-04-21 + -1 * year (roll over) = 2004-04-21"-  , "2005-06-30 + -1 * year (roll over) = 2004-06-30"-  , "2005-02-28 + 0 * year (roll over) = 2005-02-28"-  , "2004-02-29 + 0 * year (roll over) = 2004-02-29"-  , "2004-01-31 + 0 * year (roll over) = 2004-01-31"-  , "2004-12-31 + 0 * year (roll over) = 2004-12-31"-  , "2005-07-01 + 0 * year (roll over) = 2005-07-01"-  , "2005-04-21 + 0 * year (roll over) = 2005-04-21"-  , "2005-06-30 + 0 * year (roll over) = 2005-06-30"-  , "2005-02-28 + 1 * year (roll over) = 2006-02-28"-  , "2004-02-29 + 1 * year (roll over) = 2005-03-01"-  , "2004-01-31 + 1 * year (roll over) = 2005-01-31"-  , "2004-12-31 + 1 * year (roll over) = 2005-12-31"-  , "2005-07-01 + 1 * year (roll over) = 2006-07-01"-  , "2005-04-21 + 1 * year (roll over) = 2006-04-21"-  , "2005-06-30 + 1 * year (roll over) = 2006-06-30"-  , "2005-02-28 + 7 * year (roll over) = 2012-02-28"-  , "2004-02-29 + 7 * year (roll over) = 2011-03-01"-  , "2004-01-31 + 7 * year (roll over) = 2011-01-31"-  , "2004-12-31 + 7 * year (roll over) = 2011-12-31"-  , "2005-07-01 + 7 * year (roll over) = 2012-07-01"-  , "2005-04-21 + 7 * year (roll over) = 2012-04-21"-  , "2005-06-30 + 7 * year (roll over) = 2012-06-30"-  , "2005-02-28 + 83 * year (roll over) = 2088-02-28"-  , "2004-02-29 + 83 * year (roll over) = 2087-03-01"-  , "2004-01-31 + 83 * year (roll over) = 2087-01-31"-  , "2004-12-31 + 83 * year (roll over) = 2087-12-31"-  , "2005-07-01 + 83 * year (roll over) = 2088-07-01"-  , "2005-04-21 + 83 * year (roll over) = 2088-04-21"-  , "2005-06-30 + 83 * year (roll over) = 2088-06-30" ]+    unlines+        [ "2005-02-28 + -10 * day = 2005-02-18"+        , "2004-02-29 + -10 * day = 2004-02-19"+        , "2004-01-31 + -10 * day = 2004-01-21"+        , "2004-12-31 + -10 * day = 2004-12-21"+        , "2005-07-01 + -10 * day = 2005-06-21"+        , "2005-04-21 + -10 * day = 2005-04-11"+        , "2005-06-30 + -10 * day = 2005-06-20"+        , "2005-02-28 + -4 * day = 2005-02-24"+        , "2004-02-29 + -4 * day = 2004-02-25"+        , "2004-01-31 + -4 * day = 2004-01-27"+        , "2004-12-31 + -4 * day = 2004-12-27"+        , "2005-07-01 + -4 * day = 2005-06-27"+        , "2005-04-21 + -4 * day = 2005-04-17"+        , "2005-06-30 + -4 * day = 2005-06-26"+        , "2005-02-28 + -1 * day = 2005-02-27"+        , "2004-02-29 + -1 * day = 2004-02-28"+        , "2004-01-31 + -1 * day = 2004-01-30"+        , "2004-12-31 + -1 * day = 2004-12-30"+        , "2005-07-01 + -1 * day = 2005-06-30"+        , "2005-04-21 + -1 * day = 2005-04-20"+        , "2005-06-30 + -1 * day = 2005-06-29"+        , "2005-02-28 + 0 * day = 2005-02-28"+        , "2004-02-29 + 0 * day = 2004-02-29"+        , "2004-01-31 + 0 * day = 2004-01-31"+        , "2004-12-31 + 0 * day = 2004-12-31"+        , "2005-07-01 + 0 * day = 2005-07-01"+        , "2005-04-21 + 0 * day = 2005-04-21"+        , "2005-06-30 + 0 * day = 2005-06-30"+        , "2005-02-28 + 1 * day = 2005-03-01"+        , "2004-02-29 + 1 * day = 2004-03-01"+        , "2004-01-31 + 1 * day = 2004-02-01"+        , "2004-12-31 + 1 * day = 2005-01-01"+        , "2005-07-01 + 1 * day = 2005-07-02"+        , "2005-04-21 + 1 * day = 2005-04-22"+        , "2005-06-30 + 1 * day = 2005-07-01"+        , "2005-02-28 + 7 * day = 2005-03-07"+        , "2004-02-29 + 7 * day = 2004-03-07"+        , "2004-01-31 + 7 * day = 2004-02-07"+        , "2004-12-31 + 7 * day = 2005-01-07"+        , "2005-07-01 + 7 * day = 2005-07-08"+        , "2005-04-21 + 7 * day = 2005-04-28"+        , "2005-06-30 + 7 * day = 2005-07-07"+        , "2005-02-28 + 83 * day = 2005-05-22"+        , "2004-02-29 + 83 * day = 2004-05-22"+        , "2004-01-31 + 83 * day = 2004-04-23"+        , "2004-12-31 + 83 * day = 2005-03-24"+        , "2005-07-01 + 83 * day = 2005-09-22"+        , "2005-04-21 + 83 * day = 2005-07-13"+        , "2005-06-30 + 83 * day = 2005-09-21"+        , "2005-02-28 + -10 * month (clip) = 2004-04-28"+        , "2004-02-29 + -10 * month (clip) = 2003-04-29"+        , "2004-01-31 + -10 * month (clip) = 2003-03-31"+        , "2004-12-31 + -10 * month (clip) = 2004-02-29"+        , "2005-07-01 + -10 * month (clip) = 2004-09-01"+        , "2005-04-21 + -10 * month (clip) = 2004-06-21"+        , "2005-06-30 + -10 * month (clip) = 2004-08-30"+        , "2005-02-28 + -4 * month (clip) = 2004-10-28"+        , "2004-02-29 + -4 * month (clip) = 2003-10-29"+        , "2004-01-31 + -4 * month (clip) = 2003-09-30"+        , "2004-12-31 + -4 * month (clip) = 2004-08-31"+        , "2005-07-01 + -4 * month (clip) = 2005-03-01"+        , "2005-04-21 + -4 * month (clip) = 2004-12-21"+        , "2005-06-30 + -4 * month (clip) = 2005-02-28"+        , "2005-02-28 + -1 * month (clip) = 2005-01-28"+        , "2004-02-29 + -1 * month (clip) = 2004-01-29"+        , "2004-01-31 + -1 * month (clip) = 2003-12-31"+        , "2004-12-31 + -1 * month (clip) = 2004-11-30"+        , "2005-07-01 + -1 * month (clip) = 2005-06-01"+        , "2005-04-21 + -1 * month (clip) = 2005-03-21"+        , "2005-06-30 + -1 * month (clip) = 2005-05-30"+        , "2005-02-28 + 0 * month (clip) = 2005-02-28"+        , "2004-02-29 + 0 * month (clip) = 2004-02-29"+        , "2004-01-31 + 0 * month (clip) = 2004-01-31"+        , "2004-12-31 + 0 * month (clip) = 2004-12-31"+        , "2005-07-01 + 0 * month (clip) = 2005-07-01"+        , "2005-04-21 + 0 * month (clip) = 2005-04-21"+        , "2005-06-30 + 0 * month (clip) = 2005-06-30"+        , "2005-02-28 + 1 * month (clip) = 2005-03-28"+        , "2004-02-29 + 1 * month (clip) = 2004-03-29"+        , "2004-01-31 + 1 * month (clip) = 2004-02-29"+        , "2004-12-31 + 1 * month (clip) = 2005-01-31"+        , "2005-07-01 + 1 * month (clip) = 2005-08-01"+        , "2005-04-21 + 1 * month (clip) = 2005-05-21"+        , "2005-06-30 + 1 * month (clip) = 2005-07-30"+        , "2005-02-28 + 7 * month (clip) = 2005-09-28"+        , "2004-02-29 + 7 * month (clip) = 2004-09-29"+        , "2004-01-31 + 7 * month (clip) = 2004-08-31"+        , "2004-12-31 + 7 * month (clip) = 2005-07-31"+        , "2005-07-01 + 7 * month (clip) = 2006-02-01"+        , "2005-04-21 + 7 * month (clip) = 2005-11-21"+        , "2005-06-30 + 7 * month (clip) = 2006-01-30"+        , "2005-02-28 + 83 * month (clip) = 2012-01-28"+        , "2004-02-29 + 83 * month (clip) = 2011-01-29"+        , "2004-01-31 + 83 * month (clip) = 2010-12-31"+        , "2004-12-31 + 83 * month (clip) = 2011-11-30"+        , "2005-07-01 + 83 * month (clip) = 2012-06-01"+        , "2005-04-21 + 83 * month (clip) = 2012-03-21"+        , "2005-06-30 + 83 * month (clip) = 2012-05-30"+        , "2005-02-28 + -10 * month (roll over) = 2004-04-28"+        , "2004-02-29 + -10 * month (roll over) = 2003-04-29"+        , "2004-01-31 + -10 * month (roll over) = 2003-03-31"+        , "2004-12-31 + -10 * month (roll over) = 2004-03-02"+        , "2005-07-01 + -10 * month (roll over) = 2004-09-01"+        , "2005-04-21 + -10 * month (roll over) = 2004-06-21"+        , "2005-06-30 + -10 * month (roll over) = 2004-08-30"+        , "2005-02-28 + -4 * month (roll over) = 2004-10-28"+        , "2004-02-29 + -4 * month (roll over) = 2003-10-29"+        , "2004-01-31 + -4 * month (roll over) = 2003-10-01"+        , "2004-12-31 + -4 * month (roll over) = 2004-08-31"+        , "2005-07-01 + -4 * month (roll over) = 2005-03-01"+        , "2005-04-21 + -4 * month (roll over) = 2004-12-21"+        , "2005-06-30 + -4 * month (roll over) = 2005-03-02"+        , "2005-02-28 + -1 * month (roll over) = 2005-01-28"+        , "2004-02-29 + -1 * month (roll over) = 2004-01-29"+        , "2004-01-31 + -1 * month (roll over) = 2003-12-31"+        , "2004-12-31 + -1 * month (roll over) = 2004-12-01"+        , "2005-07-01 + -1 * month (roll over) = 2005-06-01"+        , "2005-04-21 + -1 * month (roll over) = 2005-03-21"+        , "2005-06-30 + -1 * month (roll over) = 2005-05-30"+        , "2005-02-28 + 0 * month (roll over) = 2005-02-28"+        , "2004-02-29 + 0 * month (roll over) = 2004-02-29"+        , "2004-01-31 + 0 * month (roll over) = 2004-01-31"+        , "2004-12-31 + 0 * month (roll over) = 2004-12-31"+        , "2005-07-01 + 0 * month (roll over) = 2005-07-01"+        , "2005-04-21 + 0 * month (roll over) = 2005-04-21"+        , "2005-06-30 + 0 * month (roll over) = 2005-06-30"+        , "2005-02-28 + 1 * month (roll over) = 2005-03-28"+        , "2004-02-29 + 1 * month (roll over) = 2004-03-29"+        , "2004-01-31 + 1 * month (roll over) = 2004-03-02"+        , "2004-12-31 + 1 * month (roll over) = 2005-01-31"+        , "2005-07-01 + 1 * month (roll over) = 2005-08-01"+        , "2005-04-21 + 1 * month (roll over) = 2005-05-21"+        , "2005-06-30 + 1 * month (roll over) = 2005-07-30"+        , "2005-02-28 + 7 * month (roll over) = 2005-09-28"+        , "2004-02-29 + 7 * month (roll over) = 2004-09-29"+        , "2004-01-31 + 7 * month (roll over) = 2004-08-31"+        , "2004-12-31 + 7 * month (roll over) = 2005-07-31"+        , "2005-07-01 + 7 * month (roll over) = 2006-02-01"+        , "2005-04-21 + 7 * month (roll over) = 2005-11-21"+        , "2005-06-30 + 7 * month (roll over) = 2006-01-30"+        , "2005-02-28 + 83 * month (roll over) = 2012-01-28"+        , "2004-02-29 + 83 * month (roll over) = 2011-01-29"+        , "2004-01-31 + 83 * month (roll over) = 2010-12-31"+        , "2004-12-31 + 83 * month (roll over) = 2011-12-01"+        , "2005-07-01 + 83 * month (roll over) = 2012-06-01"+        , "2005-04-21 + 83 * month (roll over) = 2012-03-21"+        , "2005-06-30 + 83 * month (roll over) = 2012-05-30"+        , "2005-02-28 + -10 * year (clip) = 1995-02-28"+        , "2004-02-29 + -10 * year (clip) = 1994-02-28"+        , "2004-01-31 + -10 * year (clip) = 1994-01-31"+        , "2004-12-31 + -10 * year (clip) = 1994-12-31"+        , "2005-07-01 + -10 * year (clip) = 1995-07-01"+        , "2005-04-21 + -10 * year (clip) = 1995-04-21"+        , "2005-06-30 + -10 * year (clip) = 1995-06-30"+        , "2005-02-28 + -4 * year (clip) = 2001-02-28"+        , "2004-02-29 + -4 * year (clip) = 2000-02-29"+        , "2004-01-31 + -4 * year (clip) = 2000-01-31"+        , "2004-12-31 + -4 * year (clip) = 2000-12-31"+        , "2005-07-01 + -4 * year (clip) = 2001-07-01"+        , "2005-04-21 + -4 * year (clip) = 2001-04-21"+        , "2005-06-30 + -4 * year (clip) = 2001-06-30"+        , "2005-02-28 + -1 * year (clip) = 2004-02-28"+        , "2004-02-29 + -1 * year (clip) = 2003-02-28"+        , "2004-01-31 + -1 * year (clip) = 2003-01-31"+        , "2004-12-31 + -1 * year (clip) = 2003-12-31"+        , "2005-07-01 + -1 * year (clip) = 2004-07-01"+        , "2005-04-21 + -1 * year (clip) = 2004-04-21"+        , "2005-06-30 + -1 * year (clip) = 2004-06-30"+        , "2005-02-28 + 0 * year (clip) = 2005-02-28"+        , "2004-02-29 + 0 * year (clip) = 2004-02-29"+        , "2004-01-31 + 0 * year (clip) = 2004-01-31"+        , "2004-12-31 + 0 * year (clip) = 2004-12-31"+        , "2005-07-01 + 0 * year (clip) = 2005-07-01"+        , "2005-04-21 + 0 * year (clip) = 2005-04-21"+        , "2005-06-30 + 0 * year (clip) = 2005-06-30"+        , "2005-02-28 + 1 * year (clip) = 2006-02-28"+        , "2004-02-29 + 1 * year (clip) = 2005-02-28"+        , "2004-01-31 + 1 * year (clip) = 2005-01-31"+        , "2004-12-31 + 1 * year (clip) = 2005-12-31"+        , "2005-07-01 + 1 * year (clip) = 2006-07-01"+        , "2005-04-21 + 1 * year (clip) = 2006-04-21"+        , "2005-06-30 + 1 * year (clip) = 2006-06-30"+        , "2005-02-28 + 7 * year (clip) = 2012-02-28"+        , "2004-02-29 + 7 * year (clip) = 2011-02-28"+        , "2004-01-31 + 7 * year (clip) = 2011-01-31"+        , "2004-12-31 + 7 * year (clip) = 2011-12-31"+        , "2005-07-01 + 7 * year (clip) = 2012-07-01"+        , "2005-04-21 + 7 * year (clip) = 2012-04-21"+        , "2005-06-30 + 7 * year (clip) = 2012-06-30"+        , "2005-02-28 + 83 * year (clip) = 2088-02-28"+        , "2004-02-29 + 83 * year (clip) = 2087-02-28"+        , "2004-01-31 + 83 * year (clip) = 2087-01-31"+        , "2004-12-31 + 83 * year (clip) = 2087-12-31"+        , "2005-07-01 + 83 * year (clip) = 2088-07-01"+        , "2005-04-21 + 83 * year (clip) = 2088-04-21"+        , "2005-06-30 + 83 * year (clip) = 2088-06-30"+        , "2005-02-28 + -10 * year (roll over) = 1995-02-28"+        , "2004-02-29 + -10 * year (roll over) = 1994-03-01"+        , "2004-01-31 + -10 * year (roll over) = 1994-01-31"+        , "2004-12-31 + -10 * year (roll over) = 1994-12-31"+        , "2005-07-01 + -10 * year (roll over) = 1995-07-01"+        , "2005-04-21 + -10 * year (roll over) = 1995-04-21"+        , "2005-06-30 + -10 * year (roll over) = 1995-06-30"+        , "2005-02-28 + -4 * year (roll over) = 2001-02-28"+        , "2004-02-29 + -4 * year (roll over) = 2000-02-29"+        , "2004-01-31 + -4 * year (roll over) = 2000-01-31"+        , "2004-12-31 + -4 * year (roll over) = 2000-12-31"+        , "2005-07-01 + -4 * year (roll over) = 2001-07-01"+        , "2005-04-21 + -4 * year (roll over) = 2001-04-21"+        , "2005-06-30 + -4 * year (roll over) = 2001-06-30"+        , "2005-02-28 + -1 * year (roll over) = 2004-02-28"+        , "2004-02-29 + -1 * year (roll over) = 2003-03-01"+        , "2004-01-31 + -1 * year (roll over) = 2003-01-31"+        , "2004-12-31 + -1 * year (roll over) = 2003-12-31"+        , "2005-07-01 + -1 * year (roll over) = 2004-07-01"+        , "2005-04-21 + -1 * year (roll over) = 2004-04-21"+        , "2005-06-30 + -1 * year (roll over) = 2004-06-30"+        , "2005-02-28 + 0 * year (roll over) = 2005-02-28"+        , "2004-02-29 + 0 * year (roll over) = 2004-02-29"+        , "2004-01-31 + 0 * year (roll over) = 2004-01-31"+        , "2004-12-31 + 0 * year (roll over) = 2004-12-31"+        , "2005-07-01 + 0 * year (roll over) = 2005-07-01"+        , "2005-04-21 + 0 * year (roll over) = 2005-04-21"+        , "2005-06-30 + 0 * year (roll over) = 2005-06-30"+        , "2005-02-28 + 1 * year (roll over) = 2006-02-28"+        , "2004-02-29 + 1 * year (roll over) = 2005-03-01"+        , "2004-01-31 + 1 * year (roll over) = 2005-01-31"+        , "2004-12-31 + 1 * year (roll over) = 2005-12-31"+        , "2005-07-01 + 1 * year (roll over) = 2006-07-01"+        , "2005-04-21 + 1 * year (roll over) = 2006-04-21"+        , "2005-06-30 + 1 * year (roll over) = 2006-06-30"+        , "2005-02-28 + 7 * year (roll over) = 2012-02-28"+        , "2004-02-29 + 7 * year (roll over) = 2011-03-01"+        , "2004-01-31 + 7 * year (roll over) = 2011-01-31"+        , "2004-12-31 + 7 * year (roll over) = 2011-12-31"+        , "2005-07-01 + 7 * year (roll over) = 2012-07-01"+        , "2005-04-21 + 7 * year (roll over) = 2012-04-21"+        , "2005-06-30 + 7 * year (roll over) = 2012-06-30"+        , "2005-02-28 + 83 * year (roll over) = 2088-02-28"+        , "2004-02-29 + 83 * year (roll over) = 2087-03-01"+        , "2004-01-31 + 83 * year (roll over) = 2087-01-31"+        , "2004-12-31 + 83 * year (roll over) = 2087-12-31"+        , "2005-07-01 + 83 * year (roll over) = 2088-07-01"+        , "2005-04-21 + 83 * year (roll over) = 2088-04-21"+        , "2005-06-30 + 83 * year (roll over) = 2088-06-30"+        ]

@@ -0,0 +1,34 @@+{-# LANGUAGE CPP #-}+module Test.Calendar.CalendarProps+    ( testCalendarProps+    ) where++#if __GLASGOW_HASKELL__ >= 710+import Data.Time.Calendar.Month.Compat+import Data.Time.Calendar.Quarter.Compat+import Test.TestUtil+import Test.Tasty+import Test.Arbitrary ()++testYearMonth :: TestTree+testYearMonth = nameTest "YearMonth" $ \m -> case m of+    YearMonth y my -> m == YearMonth y my++testMonthDay :: TestTree+testMonthDay = nameTest "MonthDay" $ \d -> case d of+    MonthDay m dm -> d == MonthDay m dm++testYearQuarter :: TestTree+testYearQuarter = nameTest "YearQuarter" $ \q -> case q of+    YearQuarter y qy -> q == YearQuarter y qy++testCalendarProps :: TestTree+testCalendarProps = nameTest "calender-props" [testYearMonth,testMonthDay,testYearQuarter]+#else++import Test.Tasty++testCalendarProps :: TestTree+testCalendarProps = testGroup "calendar-props" []++#endif

@@ -1,32 +1,26 @@-module Test.Calendar.Calendars(testCalendars) where--import Data.Time.Calendar.Julian.Compat-import Data.Time.Calendar.WeekDate.Compat-import Data.Time.Calendar.Compat+module Test.Calendar.Calendars+    ( testCalendars+    ) where +import Data.Time.Calendar+import Data.Time.Calendar.Julian+import Data.Time.Calendar.WeekDate+import Test.Calendar.CalendarsRef import Test.Tasty import Test.Tasty.HUnit-import Test.Calendar.CalendarsRef -showers :: [(String,Day -> String)]-showers = [-    ("MJD",show . toModifiedJulianDay),-    ("Gregorian",showGregorian),-    ("Julian",showJulian),-    ("ISO 8601",showWeekDate)+showers :: [(String, Day -> String)]+showers =+    [ ("MJD", show . toModifiedJulianDay)+    , ("Gregorian", showGregorian)+    , ("Julian", showJulian)+    , ("ISO 8601", showWeekDate)     ]  days :: [Day]-days = [-    fromGregorian 0 12 31,-    fromJulian 1752 9 2,-    fromGregorian 1752 9 14,-    fromGregorian 2005 1 23-    ]+days = [fromGregorian 0 12 31, fromJulian 1752 9 2, fromGregorian 1752 9 14, fromGregorian 2005 1 23]  testCalendars :: TestTree-testCalendars = testCase "testCalendars" $-    assertEqual "" testCalendarsRef $ unlines $ map (\d -> showShowers d) days+testCalendars = testCase "testCalendars" $ assertEqual "" testCalendarsRef $ unlines $ map (\d -> showShowers d) days   where-    showShowers day =-        concatMap (\(nm,shower) -> unwords [" ==", nm, shower day]) showers+    showShowers day = concatMap (\(nm, shower) -> unwords [" ==", nm, shower day]) showers

@@ -2,8 +2,9 @@  testCalendarsRef :: String testCalendarsRef =- unlines-  [ " == MJD -678576 == Gregorian 0000-12-31 == Julian 0001-01-02 == ISO 8601 0000-W52-7"-  , " == MJD -38780 == Gregorian 1752-09-13 == Julian 1752-09-02 == ISO 8601 1752-W37-3"-  , " == MJD -38779 == Gregorian 1752-09-14 == Julian 1752-09-03 == ISO 8601 1752-W37-4"-  , " == MJD 53393 == Gregorian 2005-01-23 == Julian 2005-01-10 == ISO 8601 2005-W03-7" ]+    unlines+        [ " == MJD -678576 == Gregorian 0000-12-31 == Julian 0001-01-02 == ISO 8601 0000-W52-7"+        , " == MJD -38780 == Gregorian 1752-09-13 == Julian 1752-09-02 == ISO 8601 1752-W37-3"+        , " == MJD -38779 == Gregorian 1752-09-14 == Julian 1752-09-03 == ISO 8601 1752-W37-4"+        , " == MJD 53393 == Gregorian 2005-01-23 == Julian 2005-01-10 == ISO 8601 2005-W03-7"+        ]

@@ -1,46 +1,43 @@-module Test.Calendar.ClipDates(clipDates) where--import Data.Time.Calendar.OrdinalDate.Compat-import Data.Time.Calendar.WeekDate.Compat-import Data.Time.Calendar.Compat+module Test.Calendar.ClipDates+    ( clipDates+    ) where +import Data.Time.Calendar+import Data.Time.Calendar.OrdinalDate+import Data.Time.Calendar.WeekDate+import Test.Calendar.ClipDatesRef import Test.Tasty import Test.Tasty.HUnit-import Test.Calendar.ClipDatesRef -yearAndDay :: (Integer,Int) -> String-yearAndDay (y,d) = (show y) ++ "-" ++ (show d) ++ " = " ++ (showOrdinalDate (fromOrdinalDate y d))+yearAndDay :: (Integer, Int) -> String+yearAndDay (y, d) = (show y) ++ "-" ++ (show d) ++ " = " ++ (showOrdinalDate (fromOrdinalDate y d)) -gregorian :: (Integer,Int,Int) -> String-gregorian (y,m,d) = (show y) ++ "-" ++ (show m) ++ "-" ++ (show d) ++ " = " ++ (showGregorian (fromGregorian y m d))+gregorian :: (Integer, Int, Int) -> String+gregorian (y, m, d) = (show y) ++ "-" ++ (show m) ++ "-" ++ (show d) ++ " = " ++ (showGregorian (fromGregorian y m d)) -iSOWeekDay :: (Integer,Int,Int) -> String-iSOWeekDay (y,w,d) = (show y) ++ "-W" ++ (show w) ++ "-" ++ (show d) ++ " = " ++ (showWeekDate (fromWeekDate y w d))+iSOWeekDay :: (Integer, Int, Int) -> String+iSOWeekDay (y, w, d) = (show y) ++ "-W" ++ (show w) ++ "-" ++ (show d) ++ " = " ++ (showWeekDate (fromWeekDate y w d))  --- tupleUp2 :: [a] -> [b] -> [(a, b)]-tupleUp2 l1 l2 = concatMap (\e -> map (e,) l2) l1+tupleUp2 l1 l2 = concatMap (\e -> map (e, ) l2) l1  tupleUp3 :: [a] -> [b] -> [c] -> [(a, b, c)]-tupleUp3 l1 l2 l3-  = let ts = tupleUp2 l2 l3+tupleUp3 l1 l2 l3 = let+    ts = tupleUp2 l2 l3     in concatMap (\e -> map (\(f, g) -> (e, f, g)) ts) l1 ---+testPairs :: String -> [String] -> [String] -> TestTree+testPairs name expected found = testGroup name $ fmap (\(e,f) -> testCase e $ assertEqual "" e f) $ zip expected found +-- clipDates :: TestTree-clipDates = testCase "clipDates" $-    let-        yad  = unlines $ map yearAndDay $-            tupleUp2 [1968,1969,1971] [-4,0,1,200,364,365,366,367,700]---        greg = unlines $ map gregorian $-            tupleUp3 [1968,1969,1971] [-20,-1,0,1,2,12,13,17] [-7,-1,0,1,2,27,28,29,30,31,32,40]--        iso  = unlines $ map iSOWeekDay $-            tupleUp3 [1968,1969,2004] [-20,-1,0,1,20,51,52,53,54] [-2,-1,0,1,4,6,7,8,9]--    in assertEqual "" clipDatesRef $-        concat [ "YearAndDay\n", yad, "Gregorian\n", greg, "ISOWeekDay\n", iso ]+clipDates =+    testGroup "clipDates"+        [+            testPairs "YearAndDay" clipDatesYearAndDayRef $ map yearAndDay $ tupleUp2 [1968, 1969, 1971] [-4, 0, 1, 200, 364, 365, 366, 367, 700],+            testPairs "Gregorian" clipDatesGregorianDayRef $ map gregorian $+                tupleUp3 [1968, 1969, 1971] [-20, -1, 0, 1, 2, 12, 13, 17] [-7, -1, 0, 1, 2, 27, 28, 29, 30, 31, 32, 40],+            testPairs "ISOWeekDay" clipDatesISOWeekDayRef $ map iSOWeekDay $+                tupleUp3 [1968, 1969, 2004] [-20, -1, 0, 1, 20, 51, 52, 53, 54] [-2, -1, 0, 1, 4, 6, 7, 8, 9]+        ]

@@ -1,566 +1,571 @@ module Test.Calendar.ClipDatesRef where -clipDatesRef :: String-clipDatesRef =- unlines-  [ "YearAndDay"-  , "1968--4 = 1968-001"-  , "1968-0 = 1968-001"-  , "1968-1 = 1968-001"-  , "1968-200 = 1968-200"-  , "1968-364 = 1968-364"-  , "1968-365 = 1968-365"-  , "1968-366 = 1968-366"-  , "1968-367 = 1968-366"-  , "1968-700 = 1968-366"-  , "1969--4 = 1969-001"-  , "1969-0 = 1969-001"-  , "1969-1 = 1969-001"-  , "1969-200 = 1969-200"-  , "1969-364 = 1969-364"-  , "1969-365 = 1969-365"-  , "1969-366 = 1969-365"-  , "1969-367 = 1969-365"-  , "1969-700 = 1969-365"-  , "1971--4 = 1971-001"-  , "1971-0 = 1971-001"-  , "1971-1 = 1971-001"-  , "1971-200 = 1971-200"-  , "1971-364 = 1971-364"-  , "1971-365 = 1971-365"-  , "1971-366 = 1971-365"-  , "1971-367 = 1971-365"-  , "1971-700 = 1971-365"-  , "Gregorian"-  , "1968--20--7 = 1968-01-01"-  , "1968--20--1 = 1968-01-01"-  , "1968--20-0 = 1968-01-01"-  , "1968--20-1 = 1968-01-01"-  , "1968--20-2 = 1968-01-02"-  , "1968--20-27 = 1968-01-27"-  , "1968--20-28 = 1968-01-28"-  , "1968--20-29 = 1968-01-29"-  , "1968--20-30 = 1968-01-30"-  , "1968--20-31 = 1968-01-31"-  , "1968--20-32 = 1968-01-31"-  , "1968--20-40 = 1968-01-31"-  , "1968--1--7 = 1968-01-01"-  , "1968--1--1 = 1968-01-01"-  , "1968--1-0 = 1968-01-01"-  , "1968--1-1 = 1968-01-01"-  , "1968--1-2 = 1968-01-02"-  , "1968--1-27 = 1968-01-27"-  , "1968--1-28 = 1968-01-28"-  , "1968--1-29 = 1968-01-29"-  , "1968--1-30 = 1968-01-30"-  , "1968--1-31 = 1968-01-31"-  , "1968--1-32 = 1968-01-31"-  , "1968--1-40 = 1968-01-31"-  , "1968-0--7 = 1968-01-01"-  , "1968-0--1 = 1968-01-01"-  , "1968-0-0 = 1968-01-01"-  , "1968-0-1 = 1968-01-01"-  , "1968-0-2 = 1968-01-02"-  , "1968-0-27 = 1968-01-27"-  , "1968-0-28 = 1968-01-28"-  , "1968-0-29 = 1968-01-29"-  , "1968-0-30 = 1968-01-30"-  , "1968-0-31 = 1968-01-31"-  , "1968-0-32 = 1968-01-31"-  , "1968-0-40 = 1968-01-31"-  , "1968-1--7 = 1968-01-01"-  , "1968-1--1 = 1968-01-01"-  , "1968-1-0 = 1968-01-01"-  , "1968-1-1 = 1968-01-01"-  , "1968-1-2 = 1968-01-02"-  , "1968-1-27 = 1968-01-27"-  , "1968-1-28 = 1968-01-28"-  , "1968-1-29 = 1968-01-29"-  , "1968-1-30 = 1968-01-30"-  , "1968-1-31 = 1968-01-31"-  , "1968-1-32 = 1968-01-31"-  , "1968-1-40 = 1968-01-31"-  , "1968-2--7 = 1968-02-01"-  , "1968-2--1 = 1968-02-01"-  , "1968-2-0 = 1968-02-01"-  , "1968-2-1 = 1968-02-01"-  , "1968-2-2 = 1968-02-02"-  , "1968-2-27 = 1968-02-27"-  , "1968-2-28 = 1968-02-28"-  , "1968-2-29 = 1968-02-29"-  , "1968-2-30 = 1968-02-29"-  , "1968-2-31 = 1968-02-29"-  , "1968-2-32 = 1968-02-29"-  , "1968-2-40 = 1968-02-29"-  , "1968-12--7 = 1968-12-01"-  , "1968-12--1 = 1968-12-01"-  , "1968-12-0 = 1968-12-01"-  , "1968-12-1 = 1968-12-01"-  , "1968-12-2 = 1968-12-02"-  , "1968-12-27 = 1968-12-27"-  , "1968-12-28 = 1968-12-28"-  , "1968-12-29 = 1968-12-29"-  , "1968-12-30 = 1968-12-30"-  , "1968-12-31 = 1968-12-31"-  , "1968-12-32 = 1968-12-31"-  , "1968-12-40 = 1968-12-31"-  , "1968-13--7 = 1968-12-01"-  , "1968-13--1 = 1968-12-01"-  , "1968-13-0 = 1968-12-01"-  , "1968-13-1 = 1968-12-01"-  , "1968-13-2 = 1968-12-02"-  , "1968-13-27 = 1968-12-27"-  , "1968-13-28 = 1968-12-28"-  , "1968-13-29 = 1968-12-29"-  , "1968-13-30 = 1968-12-30"-  , "1968-13-31 = 1968-12-31"-  , "1968-13-32 = 1968-12-31"-  , "1968-13-40 = 1968-12-31"-  , "1968-17--7 = 1968-12-01"-  , "1968-17--1 = 1968-12-01"-  , "1968-17-0 = 1968-12-01"-  , "1968-17-1 = 1968-12-01"-  , "1968-17-2 = 1968-12-02"-  , "1968-17-27 = 1968-12-27"-  , "1968-17-28 = 1968-12-28"-  , "1968-17-29 = 1968-12-29"-  , "1968-17-30 = 1968-12-30"-  , "1968-17-31 = 1968-12-31"-  , "1968-17-32 = 1968-12-31"-  , "1968-17-40 = 1968-12-31"-  , "1969--20--7 = 1969-01-01"-  , "1969--20--1 = 1969-01-01"-  , "1969--20-0 = 1969-01-01"-  , "1969--20-1 = 1969-01-01"-  , "1969--20-2 = 1969-01-02"-  , "1969--20-27 = 1969-01-27"-  , "1969--20-28 = 1969-01-28"-  , "1969--20-29 = 1969-01-29"-  , "1969--20-30 = 1969-01-30"-  , "1969--20-31 = 1969-01-31"-  , "1969--20-32 = 1969-01-31"-  , "1969--20-40 = 1969-01-31"-  , "1969--1--7 = 1969-01-01"-  , "1969--1--1 = 1969-01-01"-  , "1969--1-0 = 1969-01-01"-  , "1969--1-1 = 1969-01-01"-  , "1969--1-2 = 1969-01-02"-  , "1969--1-27 = 1969-01-27"-  , "1969--1-28 = 1969-01-28"-  , "1969--1-29 = 1969-01-29"-  , "1969--1-30 = 1969-01-30"-  , "1969--1-31 = 1969-01-31"-  , "1969--1-32 = 1969-01-31"-  , "1969--1-40 = 1969-01-31"-  , "1969-0--7 = 1969-01-01"-  , "1969-0--1 = 1969-01-01"-  , "1969-0-0 = 1969-01-01"-  , "1969-0-1 = 1969-01-01"-  , "1969-0-2 = 1969-01-02"-  , "1969-0-27 = 1969-01-27"-  , "1969-0-28 = 1969-01-28"-  , "1969-0-29 = 1969-01-29"-  , "1969-0-30 = 1969-01-30"-  , "1969-0-31 = 1969-01-31"-  , "1969-0-32 = 1969-01-31"-  , "1969-0-40 = 1969-01-31"-  , "1969-1--7 = 1969-01-01"-  , "1969-1--1 = 1969-01-01"-  , "1969-1-0 = 1969-01-01"-  , "1969-1-1 = 1969-01-01"-  , "1969-1-2 = 1969-01-02"-  , "1969-1-27 = 1969-01-27"-  , "1969-1-28 = 1969-01-28"-  , "1969-1-29 = 1969-01-29"-  , "1969-1-30 = 1969-01-30"-  , "1969-1-31 = 1969-01-31"-  , "1969-1-32 = 1969-01-31"-  , "1969-1-40 = 1969-01-31"-  , "1969-2--7 = 1969-02-01"-  , "1969-2--1 = 1969-02-01"-  , "1969-2-0 = 1969-02-01"-  , "1969-2-1 = 1969-02-01"-  , "1969-2-2 = 1969-02-02"-  , "1969-2-27 = 1969-02-27"-  , "1969-2-28 = 1969-02-28"-  , "1969-2-29 = 1969-02-28"-  , "1969-2-30 = 1969-02-28"-  , "1969-2-31 = 1969-02-28"-  , "1969-2-32 = 1969-02-28"-  , "1969-2-40 = 1969-02-28"-  , "1969-12--7 = 1969-12-01"-  , "1969-12--1 = 1969-12-01"-  , "1969-12-0 = 1969-12-01"-  , "1969-12-1 = 1969-12-01"-  , "1969-12-2 = 1969-12-02"-  , "1969-12-27 = 1969-12-27"-  , "1969-12-28 = 1969-12-28"-  , "1969-12-29 = 1969-12-29"-  , "1969-12-30 = 1969-12-30"-  , "1969-12-31 = 1969-12-31"-  , "1969-12-32 = 1969-12-31"-  , "1969-12-40 = 1969-12-31"-  , "1969-13--7 = 1969-12-01"-  , "1969-13--1 = 1969-12-01"-  , "1969-13-0 = 1969-12-01"-  , "1969-13-1 = 1969-12-01"-  , "1969-13-2 = 1969-12-02"-  , "1969-13-27 = 1969-12-27"-  , "1969-13-28 = 1969-12-28"-  , "1969-13-29 = 1969-12-29"-  , "1969-13-30 = 1969-12-30"-  , "1969-13-31 = 1969-12-31"-  , "1969-13-32 = 1969-12-31"-  , "1969-13-40 = 1969-12-31"-  , "1969-17--7 = 1969-12-01"-  , "1969-17--1 = 1969-12-01"-  , "1969-17-0 = 1969-12-01"-  , "1969-17-1 = 1969-12-01"-  , "1969-17-2 = 1969-12-02"-  , "1969-17-27 = 1969-12-27"-  , "1969-17-28 = 1969-12-28"-  , "1969-17-29 = 1969-12-29"-  , "1969-17-30 = 1969-12-30"-  , "1969-17-31 = 1969-12-31"-  , "1969-17-32 = 1969-12-31"-  , "1969-17-40 = 1969-12-31"-  , "1971--20--7 = 1971-01-01"-  , "1971--20--1 = 1971-01-01"-  , "1971--20-0 = 1971-01-01"-  , "1971--20-1 = 1971-01-01"-  , "1971--20-2 = 1971-01-02"-  , "1971--20-27 = 1971-01-27"-  , "1971--20-28 = 1971-01-28"-  , "1971--20-29 = 1971-01-29"-  , "1971--20-30 = 1971-01-30"-  , "1971--20-31 = 1971-01-31"-  , "1971--20-32 = 1971-01-31"-  , "1971--20-40 = 1971-01-31"-  , "1971--1--7 = 1971-01-01"-  , "1971--1--1 = 1971-01-01"-  , "1971--1-0 = 1971-01-01"-  , "1971--1-1 = 1971-01-01"-  , "1971--1-2 = 1971-01-02"-  , "1971--1-27 = 1971-01-27"-  , "1971--1-28 = 1971-01-28"-  , "1971--1-29 = 1971-01-29"-  , "1971--1-30 = 1971-01-30"-  , "1971--1-31 = 1971-01-31"-  , "1971--1-32 = 1971-01-31"-  , "1971--1-40 = 1971-01-31"-  , "1971-0--7 = 1971-01-01"-  , "1971-0--1 = 1971-01-01"-  , "1971-0-0 = 1971-01-01"-  , "1971-0-1 = 1971-01-01"-  , "1971-0-2 = 1971-01-02"-  , "1971-0-27 = 1971-01-27"-  , "1971-0-28 = 1971-01-28"-  , "1971-0-29 = 1971-01-29"-  , "1971-0-30 = 1971-01-30"-  , "1971-0-31 = 1971-01-31"-  , "1971-0-32 = 1971-01-31"-  , "1971-0-40 = 1971-01-31"-  , "1971-1--7 = 1971-01-01"-  , "1971-1--1 = 1971-01-01"-  , "1971-1-0 = 1971-01-01"-  , "1971-1-1 = 1971-01-01"-  , "1971-1-2 = 1971-01-02"-  , "1971-1-27 = 1971-01-27"-  , "1971-1-28 = 1971-01-28"-  , "1971-1-29 = 1971-01-29"-  , "1971-1-30 = 1971-01-30"-  , "1971-1-31 = 1971-01-31"-  , "1971-1-32 = 1971-01-31"-  , "1971-1-40 = 1971-01-31"-  , "1971-2--7 = 1971-02-01"-  , "1971-2--1 = 1971-02-01"-  , "1971-2-0 = 1971-02-01"-  , "1971-2-1 = 1971-02-01"-  , "1971-2-2 = 1971-02-02"-  , "1971-2-27 = 1971-02-27"-  , "1971-2-28 = 1971-02-28"-  , "1971-2-29 = 1971-02-28"-  , "1971-2-30 = 1971-02-28"-  , "1971-2-31 = 1971-02-28"-  , "1971-2-32 = 1971-02-28"-  , "1971-2-40 = 1971-02-28"-  , "1971-12--7 = 1971-12-01"-  , "1971-12--1 = 1971-12-01"-  , "1971-12-0 = 1971-12-01"-  , "1971-12-1 = 1971-12-01"-  , "1971-12-2 = 1971-12-02"-  , "1971-12-27 = 1971-12-27"-  , "1971-12-28 = 1971-12-28"-  , "1971-12-29 = 1971-12-29"-  , "1971-12-30 = 1971-12-30"-  , "1971-12-31 = 1971-12-31"-  , "1971-12-32 = 1971-12-31"-  , "1971-12-40 = 1971-12-31"-  , "1971-13--7 = 1971-12-01"-  , "1971-13--1 = 1971-12-01"-  , "1971-13-0 = 1971-12-01"-  , "1971-13-1 = 1971-12-01"-  , "1971-13-2 = 1971-12-02"-  , "1971-13-27 = 1971-12-27"-  , "1971-13-28 = 1971-12-28"-  , "1971-13-29 = 1971-12-29"-  , "1971-13-30 = 1971-12-30"-  , "1971-13-31 = 1971-12-31"-  , "1971-13-32 = 1971-12-31"-  , "1971-13-40 = 1971-12-31"-  , "1971-17--7 = 1971-12-01"-  , "1971-17--1 = 1971-12-01"-  , "1971-17-0 = 1971-12-01"-  , "1971-17-1 = 1971-12-01"-  , "1971-17-2 = 1971-12-02"-  , "1971-17-27 = 1971-12-27"-  , "1971-17-28 = 1971-12-28"-  , "1971-17-29 = 1971-12-29"-  , "1971-17-30 = 1971-12-30"-  , "1971-17-31 = 1971-12-31"-  , "1971-17-32 = 1971-12-31"-  , "1971-17-40 = 1971-12-31"-  , "ISOWeekDay"-  , "1968-W-20--2 = 1968-W01-1"-  , "1968-W-20--1 = 1968-W01-1"-  , "1968-W-20-0 = 1968-W01-1"-  , "1968-W-20-1 = 1968-W01-1"-  , "1968-W-20-4 = 1968-W01-4"-  , "1968-W-20-6 = 1968-W01-6"-  , "1968-W-20-7 = 1968-W01-7"-  , "1968-W-20-8 = 1968-W01-7"-  , "1968-W-20-9 = 1968-W01-7"-  , "1968-W-1--2 = 1968-W01-1"-  , "1968-W-1--1 = 1968-W01-1"-  , "1968-W-1-0 = 1968-W01-1"-  , "1968-W-1-1 = 1968-W01-1"-  , "1968-W-1-4 = 1968-W01-4"-  , "1968-W-1-6 = 1968-W01-6"-  , "1968-W-1-7 = 1968-W01-7"-  , "1968-W-1-8 = 1968-W01-7"-  , "1968-W-1-9 = 1968-W01-7"-  , "1968-W0--2 = 1968-W01-1"-  , "1968-W0--1 = 1968-W01-1"-  , "1968-W0-0 = 1968-W01-1"-  , "1968-W0-1 = 1968-W01-1"-  , "1968-W0-4 = 1968-W01-4"-  , "1968-W0-6 = 1968-W01-6"-  , "1968-W0-7 = 1968-W01-7"-  , "1968-W0-8 = 1968-W01-7"-  , "1968-W0-9 = 1968-W01-7"-  , "1968-W1--2 = 1968-W01-1"-  , "1968-W1--1 = 1968-W01-1"-  , "1968-W1-0 = 1968-W01-1"-  , "1968-W1-1 = 1968-W01-1"-  , "1968-W1-4 = 1968-W01-4"-  , "1968-W1-6 = 1968-W01-6"-  , "1968-W1-7 = 1968-W01-7"-  , "1968-W1-8 = 1968-W01-7"-  , "1968-W1-9 = 1968-W01-7"-  , "1968-W20--2 = 1968-W20-1"-  , "1968-W20--1 = 1968-W20-1"-  , "1968-W20-0 = 1968-W20-1"-  , "1968-W20-1 = 1968-W20-1"-  , "1968-W20-4 = 1968-W20-4"-  , "1968-W20-6 = 1968-W20-6"-  , "1968-W20-7 = 1968-W20-7"-  , "1968-W20-8 = 1968-W20-7"-  , "1968-W20-9 = 1968-W20-7"-  , "1968-W51--2 = 1968-W51-1"-  , "1968-W51--1 = 1968-W51-1"-  , "1968-W51-0 = 1968-W51-1"-  , "1968-W51-1 = 1968-W51-1"-  , "1968-W51-4 = 1968-W51-4"-  , "1968-W51-6 = 1968-W51-6"-  , "1968-W51-7 = 1968-W51-7"-  , "1968-W51-8 = 1968-W51-7"-  , "1968-W51-9 = 1968-W51-7"-  , "1968-W52--2 = 1968-W52-1"-  , "1968-W52--1 = 1968-W52-1"-  , "1968-W52-0 = 1968-W52-1"-  , "1968-W52-1 = 1968-W52-1"-  , "1968-W52-4 = 1968-W52-4"-  , "1968-W52-6 = 1968-W52-6"-  , "1968-W52-7 = 1968-W52-7"-  , "1968-W52-8 = 1968-W52-7"-  , "1968-W52-9 = 1968-W52-7"-  , "1968-W53--2 = 1968-W52-1"-  , "1968-W53--1 = 1968-W52-1"-  , "1968-W53-0 = 1968-W52-1"-  , "1968-W53-1 = 1968-W52-1"-  , "1968-W53-4 = 1968-W52-4"-  , "1968-W53-6 = 1968-W52-6"-  , "1968-W53-7 = 1968-W52-7"-  , "1968-W53-8 = 1968-W52-7"-  , "1968-W53-9 = 1968-W52-7"-  , "1968-W54--2 = 1968-W52-1"-  , "1968-W54--1 = 1968-W52-1"-  , "1968-W54-0 = 1968-W52-1"-  , "1968-W54-1 = 1968-W52-1"-  , "1968-W54-4 = 1968-W52-4"-  , "1968-W54-6 = 1968-W52-6"-  , "1968-W54-7 = 1968-W52-7"-  , "1968-W54-8 = 1968-W52-7"-  , "1968-W54-9 = 1968-W52-7"-  , "1969-W-20--2 = 1969-W01-1"-  , "1969-W-20--1 = 1969-W01-1"-  , "1969-W-20-0 = 1969-W01-1"-  , "1969-W-20-1 = 1969-W01-1"-  , "1969-W-20-4 = 1969-W01-4"-  , "1969-W-20-6 = 1969-W01-6"-  , "1969-W-20-7 = 1969-W01-7"-  , "1969-W-20-8 = 1969-W01-7"-  , "1969-W-20-9 = 1969-W01-7"-  , "1969-W-1--2 = 1969-W01-1"-  , "1969-W-1--1 = 1969-W01-1"-  , "1969-W-1-0 = 1969-W01-1"-  , "1969-W-1-1 = 1969-W01-1"-  , "1969-W-1-4 = 1969-W01-4"-  , "1969-W-1-6 = 1969-W01-6"-  , "1969-W-1-7 = 1969-W01-7"-  , "1969-W-1-8 = 1969-W01-7"-  , "1969-W-1-9 = 1969-W01-7"-  , "1969-W0--2 = 1969-W01-1"-  , "1969-W0--1 = 1969-W01-1"-  , "1969-W0-0 = 1969-W01-1"-  , "1969-W0-1 = 1969-W01-1"-  , "1969-W0-4 = 1969-W01-4"-  , "1969-W0-6 = 1969-W01-6"-  , "1969-W0-7 = 1969-W01-7"-  , "1969-W0-8 = 1969-W01-7"-  , "1969-W0-9 = 1969-W01-7"-  , "1969-W1--2 = 1969-W01-1"-  , "1969-W1--1 = 1969-W01-1"-  , "1969-W1-0 = 1969-W01-1"-  , "1969-W1-1 = 1969-W01-1"-  , "1969-W1-4 = 1969-W01-4"-  , "1969-W1-6 = 1969-W01-6"-  , "1969-W1-7 = 1969-W01-7"-  , "1969-W1-8 = 1969-W01-7"-  , "1969-W1-9 = 1969-W01-7"-  , "1969-W20--2 = 1969-W20-1"-  , "1969-W20--1 = 1969-W20-1"-  , "1969-W20-0 = 1969-W20-1"-  , "1969-W20-1 = 1969-W20-1"-  , "1969-W20-4 = 1969-W20-4"-  , "1969-W20-6 = 1969-W20-6"-  , "1969-W20-7 = 1969-W20-7"-  , "1969-W20-8 = 1969-W20-7"-  , "1969-W20-9 = 1969-W20-7"-  , "1969-W51--2 = 1969-W51-1"-  , "1969-W51--1 = 1969-W51-1"-  , "1969-W51-0 = 1969-W51-1"-  , "1969-W51-1 = 1969-W51-1"-  , "1969-W51-4 = 1969-W51-4"-  , "1969-W51-6 = 1969-W51-6"-  , "1969-W51-7 = 1969-W51-7"-  , "1969-W51-8 = 1969-W51-7"-  , "1969-W51-9 = 1969-W51-7"-  , "1969-W52--2 = 1969-W52-1"-  , "1969-W52--1 = 1969-W52-1"-  , "1969-W52-0 = 1969-W52-1"-  , "1969-W52-1 = 1969-W52-1"-  , "1969-W52-4 = 1969-W52-4"-  , "1969-W52-6 = 1969-W52-6"-  , "1969-W52-7 = 1969-W52-7"-  , "1969-W52-8 = 1969-W52-7"-  , "1969-W52-9 = 1969-W52-7"-  , "1969-W53--2 = 1969-W52-1"-  , "1969-W53--1 = 1969-W52-1"-  , "1969-W53-0 = 1969-W52-1"-  , "1969-W53-1 = 1969-W52-1"-  , "1969-W53-4 = 1969-W52-4"-  , "1969-W53-6 = 1969-W52-6"-  , "1969-W53-7 = 1969-W52-7"-  , "1969-W53-8 = 1969-W52-7"-  , "1969-W53-9 = 1969-W52-7"-  , "1969-W54--2 = 1969-W52-1"-  , "1969-W54--1 = 1969-W52-1"-  , "1969-W54-0 = 1969-W52-1"-  , "1969-W54-1 = 1969-W52-1"-  , "1969-W54-4 = 1969-W52-4"-  , "1969-W54-6 = 1969-W52-6"-  , "1969-W54-7 = 1969-W52-7"-  , "1969-W54-8 = 1969-W52-7"-  , "1969-W54-9 = 1969-W52-7"-  , "2004-W-20--2 = 2004-W01-1"-  , "2004-W-20--1 = 2004-W01-1"-  , "2004-W-20-0 = 2004-W01-1"-  , "2004-W-20-1 = 2004-W01-1"-  , "2004-W-20-4 = 2004-W01-4"-  , "2004-W-20-6 = 2004-W01-6"-  , "2004-W-20-7 = 2004-W01-7"-  , "2004-W-20-8 = 2004-W01-7"-  , "2004-W-20-9 = 2004-W01-7"-  , "2004-W-1--2 = 2004-W01-1"-  , "2004-W-1--1 = 2004-W01-1"-  , "2004-W-1-0 = 2004-W01-1"-  , "2004-W-1-1 = 2004-W01-1"-  , "2004-W-1-4 = 2004-W01-4"-  , "2004-W-1-6 = 2004-W01-6"-  , "2004-W-1-7 = 2004-W01-7"-  , "2004-W-1-8 = 2004-W01-7"-  , "2004-W-1-9 = 2004-W01-7"-  , "2004-W0--2 = 2004-W01-1"-  , "2004-W0--1 = 2004-W01-1"-  , "2004-W0-0 = 2004-W01-1"-  , "2004-W0-1 = 2004-W01-1"-  , "2004-W0-4 = 2004-W01-4"-  , "2004-W0-6 = 2004-W01-6"-  , "2004-W0-7 = 2004-W01-7"-  , "2004-W0-8 = 2004-W01-7"-  , "2004-W0-9 = 2004-W01-7"-  , "2004-W1--2 = 2004-W01-1"-  , "2004-W1--1 = 2004-W01-1"-  , "2004-W1-0 = 2004-W01-1"-  , "2004-W1-1 = 2004-W01-1"-  , "2004-W1-4 = 2004-W01-4"-  , "2004-W1-6 = 2004-W01-6"-  , "2004-W1-7 = 2004-W01-7"-  , "2004-W1-8 = 2004-W01-7"-  , "2004-W1-9 = 2004-W01-7"-  , "2004-W20--2 = 2004-W20-1"-  , "2004-W20--1 = 2004-W20-1"-  , "2004-W20-0 = 2004-W20-1"-  , "2004-W20-1 = 2004-W20-1"-  , "2004-W20-4 = 2004-W20-4"-  , "2004-W20-6 = 2004-W20-6"-  , "2004-W20-7 = 2004-W20-7"-  , "2004-W20-8 = 2004-W20-7"-  , "2004-W20-9 = 2004-W20-7"-  , "2004-W51--2 = 2004-W51-1"-  , "2004-W51--1 = 2004-W51-1"-  , "2004-W51-0 = 2004-W51-1"-  , "2004-W51-1 = 2004-W51-1"-  , "2004-W51-4 = 2004-W51-4"-  , "2004-W51-6 = 2004-W51-6"-  , "2004-W51-7 = 2004-W51-7"-  , "2004-W51-8 = 2004-W51-7"-  , "2004-W51-9 = 2004-W51-7"-  , "2004-W52--2 = 2004-W52-1"-  , "2004-W52--1 = 2004-W52-1"-  , "2004-W52-0 = 2004-W52-1"-  , "2004-W52-1 = 2004-W52-1"-  , "2004-W52-4 = 2004-W52-4"-  , "2004-W52-6 = 2004-W52-6"-  , "2004-W52-7 = 2004-W52-7"-  , "2004-W52-8 = 2004-W52-7"-  , "2004-W52-9 = 2004-W52-7"-  , "2004-W53--2 = 2004-W53-1"-  , "2004-W53--1 = 2004-W53-1"-  , "2004-W53-0 = 2004-W53-1"-  , "2004-W53-1 = 2004-W53-1"-  , "2004-W53-4 = 2004-W53-4"-  , "2004-W53-6 = 2004-W53-6"-  , "2004-W53-7 = 2004-W53-7"-  , "2004-W53-8 = 2004-W53-7"-  , "2004-W53-9 = 2004-W53-7"-  , "2004-W54--2 = 2004-W53-1"-  , "2004-W54--1 = 2004-W53-1"-  , "2004-W54-0 = 2004-W53-1"-  , "2004-W54-1 = 2004-W53-1"-  , "2004-W54-4 = 2004-W53-4"-  , "2004-W54-6 = 2004-W53-6"-  , "2004-W54-7 = 2004-W53-7"-  , "2004-W54-8 = 2004-W53-7"-  , "2004-W54-9 = 2004-W53-7" ]+clipDatesYearAndDayRef :: [String]+clipDatesYearAndDayRef =+        [ "1968--4 = 1968-001"+        , "1968-0 = 1968-001"+        , "1968-1 = 1968-001"+        , "1968-200 = 1968-200"+        , "1968-364 = 1968-364"+        , "1968-365 = 1968-365"+        , "1968-366 = 1968-366"+        , "1968-367 = 1968-366"+        , "1968-700 = 1968-366"+        , "1969--4 = 1969-001"+        , "1969-0 = 1969-001"+        , "1969-1 = 1969-001"+        , "1969-200 = 1969-200"+        , "1969-364 = 1969-364"+        , "1969-365 = 1969-365"+        , "1969-366 = 1969-365"+        , "1969-367 = 1969-365"+        , "1969-700 = 1969-365"+        , "1971--4 = 1971-001"+        , "1971-0 = 1971-001"+        , "1971-1 = 1971-001"+        , "1971-200 = 1971-200"+        , "1971-364 = 1971-364"+        , "1971-365 = 1971-365"+        , "1971-366 = 1971-365"+        , "1971-367 = 1971-365"+        , "1971-700 = 1971-365"+        ]++clipDatesGregorianDayRef :: [String]+clipDatesGregorianDayRef =+        [ "1968--20--7 = 1968-01-01"+        , "1968--20--1 = 1968-01-01"+        , "1968--20-0 = 1968-01-01"+        , "1968--20-1 = 1968-01-01"+        , "1968--20-2 = 1968-01-02"+        , "1968--20-27 = 1968-01-27"+        , "1968--20-28 = 1968-01-28"+        , "1968--20-29 = 1968-01-29"+        , "1968--20-30 = 1968-01-30"+        , "1968--20-31 = 1968-01-31"+        , "1968--20-32 = 1968-01-31"+        , "1968--20-40 = 1968-01-31"+        , "1968--1--7 = 1968-01-01"+        , "1968--1--1 = 1968-01-01"+        , "1968--1-0 = 1968-01-01"+        , "1968--1-1 = 1968-01-01"+        , "1968--1-2 = 1968-01-02"+        , "1968--1-27 = 1968-01-27"+        , "1968--1-28 = 1968-01-28"+        , "1968--1-29 = 1968-01-29"+        , "1968--1-30 = 1968-01-30"+        , "1968--1-31 = 1968-01-31"+        , "1968--1-32 = 1968-01-31"+        , "1968--1-40 = 1968-01-31"+        , "1968-0--7 = 1968-01-01"+        , "1968-0--1 = 1968-01-01"+        , "1968-0-0 = 1968-01-01"+        , "1968-0-1 = 1968-01-01"+        , "1968-0-2 = 1968-01-02"+        , "1968-0-27 = 1968-01-27"+        , "1968-0-28 = 1968-01-28"+        , "1968-0-29 = 1968-01-29"+        , "1968-0-30 = 1968-01-30"+        , "1968-0-31 = 1968-01-31"+        , "1968-0-32 = 1968-01-31"+        , "1968-0-40 = 1968-01-31"+        , "1968-1--7 = 1968-01-01"+        , "1968-1--1 = 1968-01-01"+        , "1968-1-0 = 1968-01-01"+        , "1968-1-1 = 1968-01-01"+        , "1968-1-2 = 1968-01-02"+        , "1968-1-27 = 1968-01-27"+        , "1968-1-28 = 1968-01-28"+        , "1968-1-29 = 1968-01-29"+        , "1968-1-30 = 1968-01-30"+        , "1968-1-31 = 1968-01-31"+        , "1968-1-32 = 1968-01-31"+        , "1968-1-40 = 1968-01-31"+        , "1968-2--7 = 1968-02-01"+        , "1968-2--1 = 1968-02-01"+        , "1968-2-0 = 1968-02-01"+        , "1968-2-1 = 1968-02-01"+        , "1968-2-2 = 1968-02-02"+        , "1968-2-27 = 1968-02-27"+        , "1968-2-28 = 1968-02-28"+        , "1968-2-29 = 1968-02-29"+        , "1968-2-30 = 1968-02-29"+        , "1968-2-31 = 1968-02-29"+        , "1968-2-32 = 1968-02-29"+        , "1968-2-40 = 1968-02-29"+        , "1968-12--7 = 1968-12-01"+        , "1968-12--1 = 1968-12-01"+        , "1968-12-0 = 1968-12-01"+        , "1968-12-1 = 1968-12-01"+        , "1968-12-2 = 1968-12-02"+        , "1968-12-27 = 1968-12-27"+        , "1968-12-28 = 1968-12-28"+        , "1968-12-29 = 1968-12-29"+        , "1968-12-30 = 1968-12-30"+        , "1968-12-31 = 1968-12-31"+        , "1968-12-32 = 1968-12-31"+        , "1968-12-40 = 1968-12-31"+        , "1968-13--7 = 1968-12-01"+        , "1968-13--1 = 1968-12-01"+        , "1968-13-0 = 1968-12-01"+        , "1968-13-1 = 1968-12-01"+        , "1968-13-2 = 1968-12-02"+        , "1968-13-27 = 1968-12-27"+        , "1968-13-28 = 1968-12-28"+        , "1968-13-29 = 1968-12-29"+        , "1968-13-30 = 1968-12-30"+        , "1968-13-31 = 1968-12-31"+        , "1968-13-32 = 1968-12-31"+        , "1968-13-40 = 1968-12-31"+        , "1968-17--7 = 1968-12-01"+        , "1968-17--1 = 1968-12-01"+        , "1968-17-0 = 1968-12-01"+        , "1968-17-1 = 1968-12-01"+        , "1968-17-2 = 1968-12-02"+        , "1968-17-27 = 1968-12-27"+        , "1968-17-28 = 1968-12-28"+        , "1968-17-29 = 1968-12-29"+        , "1968-17-30 = 1968-12-30"+        , "1968-17-31 = 1968-12-31"+        , "1968-17-32 = 1968-12-31"+        , "1968-17-40 = 1968-12-31"+        , "1969--20--7 = 1969-01-01"+        , "1969--20--1 = 1969-01-01"+        , "1969--20-0 = 1969-01-01"+        , "1969--20-1 = 1969-01-01"+        , "1969--20-2 = 1969-01-02"+        , "1969--20-27 = 1969-01-27"+        , "1969--20-28 = 1969-01-28"+        , "1969--20-29 = 1969-01-29"+        , "1969--20-30 = 1969-01-30"+        , "1969--20-31 = 1969-01-31"+        , "1969--20-32 = 1969-01-31"+        , "1969--20-40 = 1969-01-31"+        , "1969--1--7 = 1969-01-01"+        , "1969--1--1 = 1969-01-01"+        , "1969--1-0 = 1969-01-01"+        , "1969--1-1 = 1969-01-01"+        , "1969--1-2 = 1969-01-02"+        , "1969--1-27 = 1969-01-27"+        , "1969--1-28 = 1969-01-28"+        , "1969--1-29 = 1969-01-29"+        , "1969--1-30 = 1969-01-30"+        , "1969--1-31 = 1969-01-31"+        , "1969--1-32 = 1969-01-31"+        , "1969--1-40 = 1969-01-31"+        , "1969-0--7 = 1969-01-01"+        , "1969-0--1 = 1969-01-01"+        , "1969-0-0 = 1969-01-01"+        , "1969-0-1 = 1969-01-01"+        , "1969-0-2 = 1969-01-02"+        , "1969-0-27 = 1969-01-27"+        , "1969-0-28 = 1969-01-28"+        , "1969-0-29 = 1969-01-29"+        , "1969-0-30 = 1969-01-30"+        , "1969-0-31 = 1969-01-31"+        , "1969-0-32 = 1969-01-31"+        , "1969-0-40 = 1969-01-31"+        , "1969-1--7 = 1969-01-01"+        , "1969-1--1 = 1969-01-01"+        , "1969-1-0 = 1969-01-01"+        , "1969-1-1 = 1969-01-01"+        , "1969-1-2 = 1969-01-02"+        , "1969-1-27 = 1969-01-27"+        , "1969-1-28 = 1969-01-28"+        , "1969-1-29 = 1969-01-29"+        , "1969-1-30 = 1969-01-30"+        , "1969-1-31 = 1969-01-31"+        , "1969-1-32 = 1969-01-31"+        , "1969-1-40 = 1969-01-31"+        , "1969-2--7 = 1969-02-01"+        , "1969-2--1 = 1969-02-01"+        , "1969-2-0 = 1969-02-01"+        , "1969-2-1 = 1969-02-01"+        , "1969-2-2 = 1969-02-02"+        , "1969-2-27 = 1969-02-27"+        , "1969-2-28 = 1969-02-28"+        , "1969-2-29 = 1969-02-28"+        , "1969-2-30 = 1969-02-28"+        , "1969-2-31 = 1969-02-28"+        , "1969-2-32 = 1969-02-28"+        , "1969-2-40 = 1969-02-28"+        , "1969-12--7 = 1969-12-01"+        , "1969-12--1 = 1969-12-01"+        , "1969-12-0 = 1969-12-01"+        , "1969-12-1 = 1969-12-01"+        , "1969-12-2 = 1969-12-02"+        , "1969-12-27 = 1969-12-27"+        , "1969-12-28 = 1969-12-28"+        , "1969-12-29 = 1969-12-29"+        , "1969-12-30 = 1969-12-30"+        , "1969-12-31 = 1969-12-31"+        , "1969-12-32 = 1969-12-31"+        , "1969-12-40 = 1969-12-31"+        , "1969-13--7 = 1969-12-01"+        , "1969-13--1 = 1969-12-01"+        , "1969-13-0 = 1969-12-01"+        , "1969-13-1 = 1969-12-01"+        , "1969-13-2 = 1969-12-02"+        , "1969-13-27 = 1969-12-27"+        , "1969-13-28 = 1969-12-28"+        , "1969-13-29 = 1969-12-29"+        , "1969-13-30 = 1969-12-30"+        , "1969-13-31 = 1969-12-31"+        , "1969-13-32 = 1969-12-31"+        , "1969-13-40 = 1969-12-31"+        , "1969-17--7 = 1969-12-01"+        , "1969-17--1 = 1969-12-01"+        , "1969-17-0 = 1969-12-01"+        , "1969-17-1 = 1969-12-01"+        , "1969-17-2 = 1969-12-02"+        , "1969-17-27 = 1969-12-27"+        , "1969-17-28 = 1969-12-28"+        , "1969-17-29 = 1969-12-29"+        , "1969-17-30 = 1969-12-30"+        , "1969-17-31 = 1969-12-31"+        , "1969-17-32 = 1969-12-31"+        , "1969-17-40 = 1969-12-31"+        , "1971--20--7 = 1971-01-01"+        , "1971--20--1 = 1971-01-01"+        , "1971--20-0 = 1971-01-01"+        , "1971--20-1 = 1971-01-01"+        , "1971--20-2 = 1971-01-02"+        , "1971--20-27 = 1971-01-27"+        , "1971--20-28 = 1971-01-28"+        , "1971--20-29 = 1971-01-29"+        , "1971--20-30 = 1971-01-30"+        , "1971--20-31 = 1971-01-31"+        , "1971--20-32 = 1971-01-31"+        , "1971--20-40 = 1971-01-31"+        , "1971--1--7 = 1971-01-01"+        , "1971--1--1 = 1971-01-01"+        , "1971--1-0 = 1971-01-01"+        , "1971--1-1 = 1971-01-01"+        , "1971--1-2 = 1971-01-02"+        , "1971--1-27 = 1971-01-27"+        , "1971--1-28 = 1971-01-28"+        , "1971--1-29 = 1971-01-29"+        , "1971--1-30 = 1971-01-30"+        , "1971--1-31 = 1971-01-31"+        , "1971--1-32 = 1971-01-31"+        , "1971--1-40 = 1971-01-31"+        , "1971-0--7 = 1971-01-01"+        , "1971-0--1 = 1971-01-01"+        , "1971-0-0 = 1971-01-01"+        , "1971-0-1 = 1971-01-01"+        , "1971-0-2 = 1971-01-02"+        , "1971-0-27 = 1971-01-27"+        , "1971-0-28 = 1971-01-28"+        , "1971-0-29 = 1971-01-29"+        , "1971-0-30 = 1971-01-30"+        , "1971-0-31 = 1971-01-31"+        , "1971-0-32 = 1971-01-31"+        , "1971-0-40 = 1971-01-31"+        , "1971-1--7 = 1971-01-01"+        , "1971-1--1 = 1971-01-01"+        , "1971-1-0 = 1971-01-01"+        , "1971-1-1 = 1971-01-01"+        , "1971-1-2 = 1971-01-02"+        , "1971-1-27 = 1971-01-27"+        , "1971-1-28 = 1971-01-28"+        , "1971-1-29 = 1971-01-29"+        , "1971-1-30 = 1971-01-30"+        , "1971-1-31 = 1971-01-31"+        , "1971-1-32 = 1971-01-31"+        , "1971-1-40 = 1971-01-31"+        , "1971-2--7 = 1971-02-01"+        , "1971-2--1 = 1971-02-01"+        , "1971-2-0 = 1971-02-01"+        , "1971-2-1 = 1971-02-01"+        , "1971-2-2 = 1971-02-02"+        , "1971-2-27 = 1971-02-27"+        , "1971-2-28 = 1971-02-28"+        , "1971-2-29 = 1971-02-28"+        , "1971-2-30 = 1971-02-28"+        , "1971-2-31 = 1971-02-28"+        , "1971-2-32 = 1971-02-28"+        , "1971-2-40 = 1971-02-28"+        , "1971-12--7 = 1971-12-01"+        , "1971-12--1 = 1971-12-01"+        , "1971-12-0 = 1971-12-01"+        , "1971-12-1 = 1971-12-01"+        , "1971-12-2 = 1971-12-02"+        , "1971-12-27 = 1971-12-27"+        , "1971-12-28 = 1971-12-28"+        , "1971-12-29 = 1971-12-29"+        , "1971-12-30 = 1971-12-30"+        , "1971-12-31 = 1971-12-31"+        , "1971-12-32 = 1971-12-31"+        , "1971-12-40 = 1971-12-31"+        , "1971-13--7 = 1971-12-01"+        , "1971-13--1 = 1971-12-01"+        , "1971-13-0 = 1971-12-01"+        , "1971-13-1 = 1971-12-01"+        , "1971-13-2 = 1971-12-02"+        , "1971-13-27 = 1971-12-27"+        , "1971-13-28 = 1971-12-28"+        , "1971-13-29 = 1971-12-29"+        , "1971-13-30 = 1971-12-30"+        , "1971-13-31 = 1971-12-31"+        , "1971-13-32 = 1971-12-31"+        , "1971-13-40 = 1971-12-31"+        , "1971-17--7 = 1971-12-01"+        , "1971-17--1 = 1971-12-01"+        , "1971-17-0 = 1971-12-01"+        , "1971-17-1 = 1971-12-01"+        , "1971-17-2 = 1971-12-02"+        , "1971-17-27 = 1971-12-27"+        , "1971-17-28 = 1971-12-28"+        , "1971-17-29 = 1971-12-29"+        , "1971-17-30 = 1971-12-30"+        , "1971-17-31 = 1971-12-31"+        , "1971-17-32 = 1971-12-31"+        , "1971-17-40 = 1971-12-31"+        ]++clipDatesISOWeekDayRef :: [String]+clipDatesISOWeekDayRef =+        [ "1968-W-20--2 = 1968-W01-1"+        , "1968-W-20--1 = 1968-W01-1"+        , "1968-W-20-0 = 1968-W01-1"+        , "1968-W-20-1 = 1968-W01-1"+        , "1968-W-20-4 = 1968-W01-4"+        , "1968-W-20-6 = 1968-W01-6"+        , "1968-W-20-7 = 1968-W01-7"+        , "1968-W-20-8 = 1968-W01-7"+        , "1968-W-20-9 = 1968-W01-7"+        , "1968-W-1--2 = 1968-W01-1"+        , "1968-W-1--1 = 1968-W01-1"+        , "1968-W-1-0 = 1968-W01-1"+        , "1968-W-1-1 = 1968-W01-1"+        , "1968-W-1-4 = 1968-W01-4"+        , "1968-W-1-6 = 1968-W01-6"+        , "1968-W-1-7 = 1968-W01-7"+        , "1968-W-1-8 = 1968-W01-7"+        , "1968-W-1-9 = 1968-W01-7"+        , "1968-W0--2 = 1968-W01-1"+        , "1968-W0--1 = 1968-W01-1"+        , "1968-W0-0 = 1968-W01-1"+        , "1968-W0-1 = 1968-W01-1"+        , "1968-W0-4 = 1968-W01-4"+        , "1968-W0-6 = 1968-W01-6"+        , "1968-W0-7 = 1968-W01-7"+        , "1968-W0-8 = 1968-W01-7"+        , "1968-W0-9 = 1968-W01-7"+        , "1968-W1--2 = 1968-W01-1"+        , "1968-W1--1 = 1968-W01-1"+        , "1968-W1-0 = 1968-W01-1"+        , "1968-W1-1 = 1968-W01-1"+        , "1968-W1-4 = 1968-W01-4"+        , "1968-W1-6 = 1968-W01-6"+        , "1968-W1-7 = 1968-W01-7"+        , "1968-W1-8 = 1968-W01-7"+        , "1968-W1-9 = 1968-W01-7"+        , "1968-W20--2 = 1968-W20-1"+        , "1968-W20--1 = 1968-W20-1"+        , "1968-W20-0 = 1968-W20-1"+        , "1968-W20-1 = 1968-W20-1"+        , "1968-W20-4 = 1968-W20-4"+        , "1968-W20-6 = 1968-W20-6"+        , "1968-W20-7 = 1968-W20-7"+        , "1968-W20-8 = 1968-W20-7"+        , "1968-W20-9 = 1968-W20-7"+        , "1968-W51--2 = 1968-W51-1"+        , "1968-W51--1 = 1968-W51-1"+        , "1968-W51-0 = 1968-W51-1"+        , "1968-W51-1 = 1968-W51-1"+        , "1968-W51-4 = 1968-W51-4"+        , "1968-W51-6 = 1968-W51-6"+        , "1968-W51-7 = 1968-W51-7"+        , "1968-W51-8 = 1968-W51-7"+        , "1968-W51-9 = 1968-W51-7"+        , "1968-W52--2 = 1968-W52-1"+        , "1968-W52--1 = 1968-W52-1"+        , "1968-W52-0 = 1968-W52-1"+        , "1968-W52-1 = 1968-W52-1"+        , "1968-W52-4 = 1968-W52-4"+        , "1968-W52-6 = 1968-W52-6"+        , "1968-W52-7 = 1968-W52-7"+        , "1968-W52-8 = 1968-W52-7"+        , "1968-W52-9 = 1968-W52-7"+        , "1968-W53--2 = 1968-W52-1"+        , "1968-W53--1 = 1968-W52-1"+        , "1968-W53-0 = 1968-W52-1"+        , "1968-W53-1 = 1968-W52-1"+        , "1968-W53-4 = 1968-W52-4"+        , "1968-W53-6 = 1968-W52-6"+        , "1968-W53-7 = 1968-W52-7"+        , "1968-W53-8 = 1968-W52-7"+        , "1968-W53-9 = 1968-W52-7"+        , "1968-W54--2 = 1968-W52-1"+        , "1968-W54--1 = 1968-W52-1"+        , "1968-W54-0 = 1968-W52-1"+        , "1968-W54-1 = 1968-W52-1"+        , "1968-W54-4 = 1968-W52-4"+        , "1968-W54-6 = 1968-W52-6"+        , "1968-W54-7 = 1968-W52-7"+        , "1968-W54-8 = 1968-W52-7"+        , "1968-W54-9 = 1968-W52-7"+        , "1969-W-20--2 = 1969-W01-1"+        , "1969-W-20--1 = 1969-W01-1"+        , "1969-W-20-0 = 1969-W01-1"+        , "1969-W-20-1 = 1969-W01-1"+        , "1969-W-20-4 = 1969-W01-4"+        , "1969-W-20-6 = 1969-W01-6"+        , "1969-W-20-7 = 1969-W01-7"+        , "1969-W-20-8 = 1969-W01-7"+        , "1969-W-20-9 = 1969-W01-7"+        , "1969-W-1--2 = 1969-W01-1"+        , "1969-W-1--1 = 1969-W01-1"+        , "1969-W-1-0 = 1969-W01-1"+        , "1969-W-1-1 = 1969-W01-1"+        , "1969-W-1-4 = 1969-W01-4"+        , "1969-W-1-6 = 1969-W01-6"+        , "1969-W-1-7 = 1969-W01-7"+        , "1969-W-1-8 = 1969-W01-7"+        , "1969-W-1-9 = 1969-W01-7"+        , "1969-W0--2 = 1969-W01-1"+        , "1969-W0--1 = 1969-W01-1"+        , "1969-W0-0 = 1969-W01-1"+        , "1969-W0-1 = 1969-W01-1"+        , "1969-W0-4 = 1969-W01-4"+        , "1969-W0-6 = 1969-W01-6"+        , "1969-W0-7 = 1969-W01-7"+        , "1969-W0-8 = 1969-W01-7"+        , "1969-W0-9 = 1969-W01-7"+        , "1969-W1--2 = 1969-W01-1"+        , "1969-W1--1 = 1969-W01-1"+        , "1969-W1-0 = 1969-W01-1"+        , "1969-W1-1 = 1969-W01-1"+        , "1969-W1-4 = 1969-W01-4"+        , "1969-W1-6 = 1969-W01-6"+        , "1969-W1-7 = 1969-W01-7"+        , "1969-W1-8 = 1969-W01-7"+        , "1969-W1-9 = 1969-W01-7"+        , "1969-W20--2 = 1969-W20-1"+        , "1969-W20--1 = 1969-W20-1"+        , "1969-W20-0 = 1969-W20-1"+        , "1969-W20-1 = 1969-W20-1"+        , "1969-W20-4 = 1969-W20-4"+        , "1969-W20-6 = 1969-W20-6"+        , "1969-W20-7 = 1969-W20-7"+        , "1969-W20-8 = 1969-W20-7"+        , "1969-W20-9 = 1969-W20-7"+        , "1969-W51--2 = 1969-W51-1"+        , "1969-W51--1 = 1969-W51-1"+        , "1969-W51-0 = 1969-W51-1"+        , "1969-W51-1 = 1969-W51-1"+        , "1969-W51-4 = 1969-W51-4"+        , "1969-W51-6 = 1969-W51-6"+        , "1969-W51-7 = 1969-W51-7"+        , "1969-W51-8 = 1969-W51-7"+        , "1969-W51-9 = 1969-W51-7"+        , "1969-W52--2 = 1969-W52-1"+        , "1969-W52--1 = 1969-W52-1"+        , "1969-W52-0 = 1969-W52-1"+        , "1969-W52-1 = 1969-W52-1"+        , "1969-W52-4 = 1969-W52-4"+        , "1969-W52-6 = 1969-W52-6"+        , "1969-W52-7 = 1969-W52-7"+        , "1969-W52-8 = 1969-W52-7"+        , "1969-W52-9 = 1969-W52-7"+        , "1969-W53--2 = 1969-W52-1"+        , "1969-W53--1 = 1969-W52-1"+        , "1969-W53-0 = 1969-W52-1"+        , "1969-W53-1 = 1969-W52-1"+        , "1969-W53-4 = 1969-W52-4"+        , "1969-W53-6 = 1969-W52-6"+        , "1969-W53-7 = 1969-W52-7"+        , "1969-W53-8 = 1969-W52-7"+        , "1969-W53-9 = 1969-W52-7"+        , "1969-W54--2 = 1969-W52-1"+        , "1969-W54--1 = 1969-W52-1"+        , "1969-W54-0 = 1969-W52-1"+        , "1969-W54-1 = 1969-W52-1"+        , "1969-W54-4 = 1969-W52-4"+        , "1969-W54-6 = 1969-W52-6"+        , "1969-W54-7 = 1969-W52-7"+        , "1969-W54-8 = 1969-W52-7"+        , "1969-W54-9 = 1969-W52-7"+        , "2004-W-20--2 = 2004-W01-1"+        , "2004-W-20--1 = 2004-W01-1"+        , "2004-W-20-0 = 2004-W01-1"+        , "2004-W-20-1 = 2004-W01-1"+        , "2004-W-20-4 = 2004-W01-4"+        , "2004-W-20-6 = 2004-W01-6"+        , "2004-W-20-7 = 2004-W01-7"+        , "2004-W-20-8 = 2004-W01-7"+        , "2004-W-20-9 = 2004-W01-7"+        , "2004-W-1--2 = 2004-W01-1"+        , "2004-W-1--1 = 2004-W01-1"+        , "2004-W-1-0 = 2004-W01-1"+        , "2004-W-1-1 = 2004-W01-1"+        , "2004-W-1-4 = 2004-W01-4"+        , "2004-W-1-6 = 2004-W01-6"+        , "2004-W-1-7 = 2004-W01-7"+        , "2004-W-1-8 = 2004-W01-7"+        , "2004-W-1-9 = 2004-W01-7"+        , "2004-W0--2 = 2004-W01-1"+        , "2004-W0--1 = 2004-W01-1"+        , "2004-W0-0 = 2004-W01-1"+        , "2004-W0-1 = 2004-W01-1"+        , "2004-W0-4 = 2004-W01-4"+        , "2004-W0-6 = 2004-W01-6"+        , "2004-W0-7 = 2004-W01-7"+        , "2004-W0-8 = 2004-W01-7"+        , "2004-W0-9 = 2004-W01-7"+        , "2004-W1--2 = 2004-W01-1"+        , "2004-W1--1 = 2004-W01-1"+        , "2004-W1-0 = 2004-W01-1"+        , "2004-W1-1 = 2004-W01-1"+        , "2004-W1-4 = 2004-W01-4"+        , "2004-W1-6 = 2004-W01-6"+        , "2004-W1-7 = 2004-W01-7"+        , "2004-W1-8 = 2004-W01-7"+        , "2004-W1-9 = 2004-W01-7"+        , "2004-W20--2 = 2004-W20-1"+        , "2004-W20--1 = 2004-W20-1"+        , "2004-W20-0 = 2004-W20-1"+        , "2004-W20-1 = 2004-W20-1"+        , "2004-W20-4 = 2004-W20-4"+        , "2004-W20-6 = 2004-W20-6"+        , "2004-W20-7 = 2004-W20-7"+        , "2004-W20-8 = 2004-W20-7"+        , "2004-W20-9 = 2004-W20-7"+        , "2004-W51--2 = 2004-W51-1"+        , "2004-W51--1 = 2004-W51-1"+        , "2004-W51-0 = 2004-W51-1"+        , "2004-W51-1 = 2004-W51-1"+        , "2004-W51-4 = 2004-W51-4"+        , "2004-W51-6 = 2004-W51-6"+        , "2004-W51-7 = 2004-W51-7"+        , "2004-W51-8 = 2004-W51-7"+        , "2004-W51-9 = 2004-W51-7"+        , "2004-W52--2 = 2004-W52-1"+        , "2004-W52--1 = 2004-W52-1"+        , "2004-W52-0 = 2004-W52-1"+        , "2004-W52-1 = 2004-W52-1"+        , "2004-W52-4 = 2004-W52-4"+        , "2004-W52-6 = 2004-W52-6"+        , "2004-W52-7 = 2004-W52-7"+        , "2004-W52-8 = 2004-W52-7"+        , "2004-W52-9 = 2004-W52-7"+        , "2004-W53--2 = 2004-W53-1"+        , "2004-W53--1 = 2004-W53-1"+        , "2004-W53-0 = 2004-W53-1"+        , "2004-W53-1 = 2004-W53-1"+        , "2004-W53-4 = 2004-W53-4"+        , "2004-W53-6 = 2004-W53-6"+        , "2004-W53-7 = 2004-W53-7"+        , "2004-W53-8 = 2004-W53-7"+        , "2004-W53-9 = 2004-W53-7"+        , "2004-W54--2 = 2004-W53-1"+        , "2004-W54--1 = 2004-W53-1"+        , "2004-W54-0 = 2004-W53-1"+        , "2004-W54-1 = 2004-W53-1"+        , "2004-W54-4 = 2004-W53-4"+        , "2004-W54-6 = 2004-W53-6"+        , "2004-W54-7 = 2004-W53-7"+        , "2004-W54-8 = 2004-W53-7"+        , "2004-W54-9 = 2004-W53-7"+        ]

@@ -1,42 +1,39 @@-module Test.Calendar.ConvertBack(convertBack) where--import Data.Time.Calendar.OrdinalDate.Compat-import Data.Time.Calendar.Julian.Compat-import Data.Time.Calendar.WeekDate.Compat-import Data.Time.Calendar.Compat+module Test.Calendar.ConvertBack+    ( convertBack+    ) where +import Data.Time.Calendar+import Data.Time.Calendar.Julian+import Data.Time.Calendar.OrdinalDate+import Data.Time.Calendar.WeekDate import Test.Tasty import Test.Tasty.HUnit  checkDay :: (Show t) => (Day -> t) -> (t -> Day) -> (t -> Maybe Day) -> Day -> String checkDay encodeDay decodeDay decodeDayValid day = let-    st    = encodeDay day-    day'  = decodeDay st+    st = encodeDay day+    day' = decodeDay st     mday' = decodeDayValid st--    a = if day /= day'-          then unwords [ show day, "-> "-                           , show st,  "-> "-                           , show day'-                           , "(diff", show (diffDays day' day) ++ ")" ]-          else ""--    b = if Just day /= mday'-          then unwords [show day, "->", show st, "->", show mday']-          else ""+    a =+        if day /= day'+            then unwords [show day, "-> ", show st, "-> ", show day', "(diff", show (diffDays day' day) ++ ")"]+            else ""+    b =+        if Just day /= mday'+            then unwords [show day, "->", show st, "->", show mday']+            else ""     in a ++ b  checkers :: [Day -> String]-checkers-  = [ checkDay toOrdinalDate (\(y,d) -> fromOrdinalDate y d) (\(y,d) -> fromOrdinalDateValid y d)-    , checkDay toWeekDate (\(y,w,d) -> fromWeekDate y w d) (\(y,w,d) -> fromWeekDateValid y w d)-    , checkDay toGregorian (\(y,m,d) -> fromGregorian y m d) (\(y,m,d) -> fromGregorianValid y m d)-    , checkDay toJulian (\(y,m,d) -> fromJulian y m d) (\(y,m,d) -> fromJulianValid y m d) ]+checkers =+    [ checkDay toOrdinalDate (\(y, d) -> fromOrdinalDate y d) (\(y, d) -> fromOrdinalDateValid y d)+    , checkDay toWeekDate (\(y, w, d) -> fromWeekDate y w d) (\(y, w, d) -> fromWeekDateValid y w d)+    , checkDay toGregorian (\(y, m, d) -> fromGregorian y m d) (\(y, m, d) -> fromGregorianValid y m d)+    , checkDay toJulian (\(y, m, d) -> fromJulian y m d) (\(y, m, d) -> fromJulianValid y m d)+    ]  days :: [Day]-days = [ModifiedJulianDay 50000 .. ModifiedJulianDay 50200] ++-    (fmap (\year -> (fromGregorian year 1 4)) [1980..2000])+days = [ModifiedJulianDay 50000 .. ModifiedJulianDay 50200] ++ (fmap (\year -> (fromGregorian year 1 4)) [1980 .. 2000])  convertBack :: TestTree-convertBack = testCase "convertBack" $-    assertEqual "" "" $ concatMap (\ch -> concatMap ch days) checkers+convertBack = testCase "convertBack" $ assertEqual "" "" $ concatMap (\ch -> concatMap ch days) checkers

@@ -4,7 +4,6 @@  import Data.Time.Calendar.Compat import Data.Time.Calendar.Julian.Compat- import Test.Arbitrary () import Test.Tasty import Test.Tasty.HUnit@@ -25,7 +24,7 @@         ]  testClip :: (Integer, Int, Int) -> (Integer, Int, Int) -> (Integer, Integer) -> TestTree-testClip (y1,m1,d1) (y2,m2,d2) (em, ed) = let+testClip (y1, m1, d1) (y2, m2, d2) (em, ed) = let     day1 = fromGregorian y1 m1 d1     day2 = fromGregorian y2 m2 d2     expected = CalendarDiffDays em ed

@@ -1,15 +1,16 @@-module Test.Calendar.Easter(testEaster) where+module Test.Calendar.Easter+    ( testEaster+    ) where -import Data.Time.Calendar.Easter.Compat import Data.Time.Calendar.Compat+import Data.Time.Calendar.Easter.Compat import Data.Time.Format.Compat +import Test.Calendar.EasterRef import Test.Tasty import Test.Tasty.HUnit-import Test.Calendar.EasterRef  --- days :: [Day] days = [ModifiedJulianDay 53000 .. ModifiedJulianDay 53014] @@ -17,19 +18,21 @@ showWithWDay = formatTime defaultTimeLocale "%F %A"  testEaster :: TestTree-testEaster = testCase "testEaster" $ let-    ds = unlines $ map (\day ->-                   unwords [ showWithWDay day, "->"-                           , showWithWDay (sundayAfter day)]) days--    f y = unwords [ show y ++ ", Gregorian: moon,"-                          , show (gregorianPaschalMoon y) ++ ": Easter,"-                          , showWithWDay (gregorianEaster y)]-                  ++ "\n"--    g y = unwords [ show y ++ ", Orthodox : moon,"-                          , show (orthodoxPaschalMoon y) ++ ": Easter,"-                          , showWithWDay (orthodoxEaster y)]-                  ++ "\n"--    in assertEqual "" testEasterRef $ ds ++ concatMap (\y -> f y ++ g y) [2000..2020]+testEaster =+    testCase "testEaster" $ let+        ds = unlines $ map (\day -> unwords [showWithWDay day, "->", showWithWDay (sundayAfter day)]) days+        f y =+            unwords+                [ show y ++ ", Gregorian: moon,"+                , show (gregorianPaschalMoon y) ++ ": Easter,"+                , showWithWDay (gregorianEaster y)+                ] +++            "\n"+        g y =+            unwords+                [ show y ++ ", Orthodox : moon,"+                , show (orthodoxPaschalMoon y) ++ ": Easter,"+                , showWithWDay (orthodoxEaster y)+                ] +++            "\n"+        in assertEqual "" testEasterRef $ ds ++ concatMap (\y -> f y ++ g y) [2000 .. 2020]

@@ -2,61 +2,62 @@  testEasterRef :: String testEasterRef =- unlines-  [ "2003-12-27 Saturday -> 2003-12-28 Sunday"-  , "2003-12-28 Sunday -> 2004-01-04 Sunday"-  , "2003-12-29 Monday -> 2004-01-04 Sunday"-  , "2003-12-30 Tuesday -> 2004-01-04 Sunday"-  , "2003-12-31 Wednesday -> 2004-01-04 Sunday"-  , "2004-01-01 Thursday -> 2004-01-04 Sunday"-  , "2004-01-02 Friday -> 2004-01-04 Sunday"-  , "2004-01-03 Saturday -> 2004-01-04 Sunday"-  , "2004-01-04 Sunday -> 2004-01-11 Sunday"-  , "2004-01-05 Monday -> 2004-01-11 Sunday"-  , "2004-01-06 Tuesday -> 2004-01-11 Sunday"-  , "2004-01-07 Wednesday -> 2004-01-11 Sunday"-  , "2004-01-08 Thursday -> 2004-01-11 Sunday"-  , "2004-01-09 Friday -> 2004-01-11 Sunday"-  , "2004-01-10 Saturday -> 2004-01-11 Sunday"-  , "2000, Gregorian: moon, 2000-04-18: Easter, 2000-04-23 Sunday"-  , "2000, Orthodox : moon, 2000-04-23: Easter, 2000-04-30 Sunday"-  , "2001, Gregorian: moon, 2001-04-08: Easter, 2001-04-15 Sunday"-  , "2001, Orthodox : moon, 2001-04-12: Easter, 2001-04-15 Sunday"-  , "2002, Gregorian: moon, 2002-03-28: Easter, 2002-03-31 Sunday"-  , "2002, Orthodox : moon, 2002-05-01: Easter, 2002-05-05 Sunday"-  , "2003, Gregorian: moon, 2003-04-16: Easter, 2003-04-20 Sunday"-  , "2003, Orthodox : moon, 2003-04-20: Easter, 2003-04-27 Sunday"-  , "2004, Gregorian: moon, 2004-04-05: Easter, 2004-04-11 Sunday"-  , "2004, Orthodox : moon, 2004-04-09: Easter, 2004-04-11 Sunday"-  , "2005, Gregorian: moon, 2005-03-25: Easter, 2005-03-27 Sunday"-  , "2005, Orthodox : moon, 2005-04-28: Easter, 2005-05-01 Sunday"-  , "2006, Gregorian: moon, 2006-04-13: Easter, 2006-04-16 Sunday"-  , "2006, Orthodox : moon, 2006-04-17: Easter, 2006-04-23 Sunday"-  , "2007, Gregorian: moon, 2007-04-02: Easter, 2007-04-08 Sunday"-  , "2007, Orthodox : moon, 2007-04-06: Easter, 2007-04-08 Sunday"-  , "2008, Gregorian: moon, 2008-03-22: Easter, 2008-03-23 Sunday"-  , "2008, Orthodox : moon, 2008-04-25: Easter, 2008-04-27 Sunday"-  , "2009, Gregorian: moon, 2009-04-10: Easter, 2009-04-12 Sunday"-  , "2009, Orthodox : moon, 2009-04-14: Easter, 2009-04-19 Sunday"-  , "2010, Gregorian: moon, 2010-03-30: Easter, 2010-04-04 Sunday"-  , "2010, Orthodox : moon, 2010-04-03: Easter, 2010-04-04 Sunday"-  , "2011, Gregorian: moon, 2011-04-18: Easter, 2011-04-24 Sunday"-  , "2011, Orthodox : moon, 2011-04-22: Easter, 2011-04-24 Sunday"-  , "2012, Gregorian: moon, 2012-04-07: Easter, 2012-04-08 Sunday"-  , "2012, Orthodox : moon, 2012-04-11: Easter, 2012-04-15 Sunday"-  , "2013, Gregorian: moon, 2013-03-27: Easter, 2013-03-31 Sunday"-  , "2013, Orthodox : moon, 2013-04-30: Easter, 2013-05-05 Sunday"-  , "2014, Gregorian: moon, 2014-04-14: Easter, 2014-04-20 Sunday"-  , "2014, Orthodox : moon, 2014-04-18: Easter, 2014-04-20 Sunday"-  , "2015, Gregorian: moon, 2015-04-03: Easter, 2015-04-05 Sunday"-  , "2015, Orthodox : moon, 2015-04-07: Easter, 2015-04-12 Sunday"-  , "2016, Gregorian: moon, 2016-03-23: Easter, 2016-03-27 Sunday"-  , "2016, Orthodox : moon, 2016-04-26: Easter, 2016-05-01 Sunday"-  , "2017, Gregorian: moon, 2017-04-11: Easter, 2017-04-16 Sunday"-  , "2017, Orthodox : moon, 2017-04-15: Easter, 2017-04-16 Sunday"-  , "2018, Gregorian: moon, 2018-03-31: Easter, 2018-04-01 Sunday"-  , "2018, Orthodox : moon, 2018-04-04: Easter, 2018-04-08 Sunday"-  , "2019, Gregorian: moon, 2019-04-18: Easter, 2019-04-21 Sunday"-  , "2019, Orthodox : moon, 2019-04-23: Easter, 2019-04-28 Sunday"-  , "2020, Gregorian: moon, 2020-04-08: Easter, 2020-04-12 Sunday"-  , "2020, Orthodox : moon, 2020-04-12: Easter, 2020-04-19 Sunday" ]+    unlines+        [ "2003-12-27 Saturday -> 2003-12-28 Sunday"+        , "2003-12-28 Sunday -> 2004-01-04 Sunday"+        , "2003-12-29 Monday -> 2004-01-04 Sunday"+        , "2003-12-30 Tuesday -> 2004-01-04 Sunday"+        , "2003-12-31 Wednesday -> 2004-01-04 Sunday"+        , "2004-01-01 Thursday -> 2004-01-04 Sunday"+        , "2004-01-02 Friday -> 2004-01-04 Sunday"+        , "2004-01-03 Saturday -> 2004-01-04 Sunday"+        , "2004-01-04 Sunday -> 2004-01-11 Sunday"+        , "2004-01-05 Monday -> 2004-01-11 Sunday"+        , "2004-01-06 Tuesday -> 2004-01-11 Sunday"+        , "2004-01-07 Wednesday -> 2004-01-11 Sunday"+        , "2004-01-08 Thursday -> 2004-01-11 Sunday"+        , "2004-01-09 Friday -> 2004-01-11 Sunday"+        , "2004-01-10 Saturday -> 2004-01-11 Sunday"+        , "2000, Gregorian: moon, 2000-04-18: Easter, 2000-04-23 Sunday"+        , "2000, Orthodox : moon, 2000-04-23: Easter, 2000-04-30 Sunday"+        , "2001, Gregorian: moon, 2001-04-08: Easter, 2001-04-15 Sunday"+        , "2001, Orthodox : moon, 2001-04-12: Easter, 2001-04-15 Sunday"+        , "2002, Gregorian: moon, 2002-03-28: Easter, 2002-03-31 Sunday"+        , "2002, Orthodox : moon, 2002-05-01: Easter, 2002-05-05 Sunday"+        , "2003, Gregorian: moon, 2003-04-16: Easter, 2003-04-20 Sunday"+        , "2003, Orthodox : moon, 2003-04-20: Easter, 2003-04-27 Sunday"+        , "2004, Gregorian: moon, 2004-04-05: Easter, 2004-04-11 Sunday"+        , "2004, Orthodox : moon, 2004-04-09: Easter, 2004-04-11 Sunday"+        , "2005, Gregorian: moon, 2005-03-25: Easter, 2005-03-27 Sunday"+        , "2005, Orthodox : moon, 2005-04-28: Easter, 2005-05-01 Sunday"+        , "2006, Gregorian: moon, 2006-04-13: Easter, 2006-04-16 Sunday"+        , "2006, Orthodox : moon, 2006-04-17: Easter, 2006-04-23 Sunday"+        , "2007, Gregorian: moon, 2007-04-02: Easter, 2007-04-08 Sunday"+        , "2007, Orthodox : moon, 2007-04-06: Easter, 2007-04-08 Sunday"+        , "2008, Gregorian: moon, 2008-03-22: Easter, 2008-03-23 Sunday"+        , "2008, Orthodox : moon, 2008-04-25: Easter, 2008-04-27 Sunday"+        , "2009, Gregorian: moon, 2009-04-10: Easter, 2009-04-12 Sunday"+        , "2009, Orthodox : moon, 2009-04-14: Easter, 2009-04-19 Sunday"+        , "2010, Gregorian: moon, 2010-03-30: Easter, 2010-04-04 Sunday"+        , "2010, Orthodox : moon, 2010-04-03: Easter, 2010-04-04 Sunday"+        , "2011, Gregorian: moon, 2011-04-18: Easter, 2011-04-24 Sunday"+        , "2011, Orthodox : moon, 2011-04-22: Easter, 2011-04-24 Sunday"+        , "2012, Gregorian: moon, 2012-04-07: Easter, 2012-04-08 Sunday"+        , "2012, Orthodox : moon, 2012-04-11: Easter, 2012-04-15 Sunday"+        , "2013, Gregorian: moon, 2013-03-27: Easter, 2013-03-31 Sunday"+        , "2013, Orthodox : moon, 2013-04-30: Easter, 2013-05-05 Sunday"+        , "2014, Gregorian: moon, 2014-04-14: Easter, 2014-04-20 Sunday"+        , "2014, Orthodox : moon, 2014-04-18: Easter, 2014-04-20 Sunday"+        , "2015, Gregorian: moon, 2015-04-03: Easter, 2015-04-05 Sunday"+        , "2015, Orthodox : moon, 2015-04-07: Easter, 2015-04-12 Sunday"+        , "2016, Gregorian: moon, 2016-03-23: Easter, 2016-03-27 Sunday"+        , "2016, Orthodox : moon, 2016-04-26: Easter, 2016-05-01 Sunday"+        , "2017, Gregorian: moon, 2017-04-11: Easter, 2017-04-16 Sunday"+        , "2017, Orthodox : moon, 2017-04-15: Easter, 2017-04-16 Sunday"+        , "2018, Gregorian: moon, 2018-03-31: Easter, 2018-04-01 Sunday"+        , "2018, Orthodox : moon, 2018-04-04: Easter, 2018-04-08 Sunday"+        , "2019, Gregorian: moon, 2019-04-18: Easter, 2019-04-21 Sunday"+        , "2019, Orthodox : moon, 2019-04-23: Easter, 2019-04-28 Sunday"+        , "2020, Gregorian: moon, 2020-04-08: Easter, 2020-04-12 Sunday"+        , "2020, Orthodox : moon, 2020-04-12: Easter, 2020-04-19 Sunday"+        ]

@@ -1,22 +1,30 @@-module Test.Calendar.LongWeekYears(longWeekYears) where--import Data.Time.Calendar.WeekDate.Compat-import Data.Time.Calendar.Compat+module Test.Calendar.LongWeekYears+    ( longWeekYears+    ) where +import Data.Time.Calendar+import Data.Time.Calendar.WeekDate+import Test.Calendar.LongWeekYearsRef import Test.Tasty import Test.Tasty.HUnit-import Test.Calendar.LongWeekYearsRef  longYear :: Integer -> Bool-longYear year = case toWeekDate (fromGregorian year 12 31) of-    (_,53,_) -> True-    _ -> False+longYear year =+    case toWeekDate (fromGregorian year 12 31) of+        (_, 53, _) -> True+        _ -> False  showLongYear :: Integer -> String-showLongYear year-  = unwords [ show year ++ ":"-            , (if isLeapYear year then "L" else " ") ++ (if longYear year then "*" else " ") ]+showLongYear year =+    unwords+        [ show year ++ ":"+        , (if isLeapYear year+               then "L"+               else " ") +++          (if longYear year+               then "*"+               else " ")+        ]  longWeekYears :: TestTree-longWeekYears = testCase "longWeekYears" $-    assertEqual "" longWeekYearsRef $ unlines $ map showLongYear [1901 .. 2050]+longWeekYears = testCase "longWeekYears" $ assertEqual "" longWeekYearsRef $ unlines $ map showLongYear [1901 .. 2050]

@@ -2,154 +2,155 @@  longWeekYearsRef :: String longWeekYearsRef =- unlines-  [ "1901:   "-  , "1902:   "-  , "1903:  *"-  , "1904: L "-  , "1905:   "-  , "1906:   "-  , "1907:   "-  , "1908: L*"-  , "1909:   "-  , "1910:   "-  , "1911:   "-  , "1912: L "-  , "1913:   "-  , "1914:  *"-  , "1915:   "-  , "1916: L "-  , "1917:   "-  , "1918:   "-  , "1919:   "-  , "1920: L*"-  , "1921:   "-  , "1922:   "-  , "1923:   "-  , "1924: L "-  , "1925:  *"-  , "1926:   "-  , "1927:   "-  , "1928: L "-  , "1929:   "-  , "1930:   "-  , "1931:  *"-  , "1932: L "-  , "1933:   "-  , "1934:   "-  , "1935:   "-  , "1936: L*"-  , "1937:   "-  , "1938:   "-  , "1939:   "-  , "1940: L "-  , "1941:   "-  , "1942:  *"-  , "1943:   "-  , "1944: L "-  , "1945:   "-  , "1946:   "-  , "1947:   "-  , "1948: L*"-  , "1949:   "-  , "1950:   "-  , "1951:   "-  , "1952: L "-  , "1953:  *"-  , "1954:   "-  , "1955:   "-  , "1956: L "-  , "1957:   "-  , "1958:   "-  , "1959:  *"-  , "1960: L "-  , "1961:   "-  , "1962:   "-  , "1963:   "-  , "1964: L*"-  , "1965:   "-  , "1966:   "-  , "1967:   "-  , "1968: L "-  , "1969:   "-  , "1970:  *"-  , "1971:   "-  , "1972: L "-  , "1973:   "-  , "1974:   "-  , "1975:   "-  , "1976: L*"-  , "1977:   "-  , "1978:   "-  , "1979:   "-  , "1980: L "-  , "1981:  *"-  , "1982:   "-  , "1983:   "-  , "1984: L "-  , "1985:   "-  , "1986:   "-  , "1987:  *"-  , "1988: L "-  , "1989:   "-  , "1990:   "-  , "1991:   "-  , "1992: L*"-  , "1993:   "-  , "1994:   "-  , "1995:   "-  , "1996: L "-  , "1997:   "-  , "1998:  *"-  , "1999:   "-  , "2000: L "-  , "2001:   "-  , "2002:   "-  , "2003:   "-  , "2004: L*"-  , "2005:   "-  , "2006:   "-  , "2007:   "-  , "2008: L "-  , "2009:  *"-  , "2010:   "-  , "2011:   "-  , "2012: L "-  , "2013:   "-  , "2014:   "-  , "2015:  *"-  , "2016: L "-  , "2017:   "-  , "2018:   "-  , "2019:   "-  , "2020: L*"-  , "2021:   "-  , "2022:   "-  , "2023:   "-  , "2024: L "-  , "2025:   "-  , "2026:  *"-  , "2027:   "-  , "2028: L "-  , "2029:   "-  , "2030:   "-  , "2031:   "-  , "2032: L*"-  , "2033:   "-  , "2034:   "-  , "2035:   "-  , "2036: L "-  , "2037:  *"-  , "2038:   "-  , "2039:   "-  , "2040: L "-  , "2041:   "-  , "2042:   "-  , "2043:  *"-  , "2044: L "-  , "2045:   "-  , "2046:   "-  , "2047:   "-  , "2048: L*"-  , "2049:   "-  , "2050:   " ]+    unlines+        [ "1901:   "+        , "1902:   "+        , "1903:  *"+        , "1904: L "+        , "1905:   "+        , "1906:   "+        , "1907:   "+        , "1908: L*"+        , "1909:   "+        , "1910:   "+        , "1911:   "+        , "1912: L "+        , "1913:   "+        , "1914:  *"+        , "1915:   "+        , "1916: L "+        , "1917:   "+        , "1918:   "+        , "1919:   "+        , "1920: L*"+        , "1921:   "+        , "1922:   "+        , "1923:   "+        , "1924: L "+        , "1925:  *"+        , "1926:   "+        , "1927:   "+        , "1928: L "+        , "1929:   "+        , "1930:   "+        , "1931:  *"+        , "1932: L "+        , "1933:   "+        , "1934:   "+        , "1935:   "+        , "1936: L*"+        , "1937:   "+        , "1938:   "+        , "1939:   "+        , "1940: L "+        , "1941:   "+        , "1942:  *"+        , "1943:   "+        , "1944: L "+        , "1945:   "+        , "1946:   "+        , "1947:   "+        , "1948: L*"+        , "1949:   "+        , "1950:   "+        , "1951:   "+        , "1952: L "+        , "1953:  *"+        , "1954:   "+        , "1955:   "+        , "1956: L "+        , "1957:   "+        , "1958:   "+        , "1959:  *"+        , "1960: L "+        , "1961:   "+        , "1962:   "+        , "1963:   "+        , "1964: L*"+        , "1965:   "+        , "1966:   "+        , "1967:   "+        , "1968: L "+        , "1969:   "+        , "1970:  *"+        , "1971:   "+        , "1972: L "+        , "1973:   "+        , "1974:   "+        , "1975:   "+        , "1976: L*"+        , "1977:   "+        , "1978:   "+        , "1979:   "+        , "1980: L "+        , "1981:  *"+        , "1982:   "+        , "1983:   "+        , "1984: L "+        , "1985:   "+        , "1986:   "+        , "1987:  *"+        , "1988: L "+        , "1989:   "+        , "1990:   "+        , "1991:   "+        , "1992: L*"+        , "1993:   "+        , "1994:   "+        , "1995:   "+        , "1996: L "+        , "1997:   "+        , "1998:  *"+        , "1999:   "+        , "2000: L "+        , "2001:   "+        , "2002:   "+        , "2003:   "+        , "2004: L*"+        , "2005:   "+        , "2006:   "+        , "2007:   "+        , "2008: L "+        , "2009:  *"+        , "2010:   "+        , "2011:   "+        , "2012: L "+        , "2013:   "+        , "2014:   "+        , "2015:  *"+        , "2016: L "+        , "2017:   "+        , "2018:   "+        , "2019:   "+        , "2020: L*"+        , "2021:   "+        , "2022:   "+        , "2023:   "+        , "2024: L "+        , "2025:   "+        , "2026:  *"+        , "2027:   "+        , "2028: L "+        , "2029:   "+        , "2030:   "+        , "2031:   "+        , "2032: L*"+        , "2033:   "+        , "2034:   "+        , "2035:   "+        , "2036: L "+        , "2037:  *"+        , "2038:   "+        , "2039:   "+        , "2040: L "+        , "2041:   "+        , "2042:   "+        , "2043:  *"+        , "2044: L "+        , "2045:   "+        , "2046:   "+        , "2047:   "+        , "2048: L*"+        , "2049:   "+        , "2050:   "+        ]

@@ -1,24 +1,31 @@-module Test.Calendar.MonthDay(testMonthDay) where--import Data.Time.Calendar.MonthDay.Compat+module Test.Calendar.MonthDay+    ( testMonthDay+    ) where +import Data.Time.Calendar.MonthDay+import Test.Calendar.MonthDayRef import Test.Tasty import Test.Tasty.HUnit-import Test.Calendar.MonthDayRef -showCompare :: (Eq a,Show a) => a -> String -> a -> String-showCompare a1 b a2 | a1 == a2 = (show a1) ++ " == " ++ b+showCompare :: (Eq a, Show a) => a -> String -> a -> String+showCompare a1 b a2+    | a1 == a2 = (show a1) ++ " == " ++ b showCompare a1 b a2 = "DIFF: " ++ (show a1) ++ " -> " ++ b ++ " -> " ++ (show a2)  testMonthDay :: TestTree-testMonthDay = testCase "testMonthDay" $-    assertEqual "" testMonthDayRef $ concat $ map (\isL -> unlines (leap isL : yearDays isL)) [False,True]-    where-        leap isLeap = if isLeap then "Leap:" else "Regular:"-        yearDays isLeap =-            map (\yd -> let-                (m,d)  = dayOfYearToMonthAndDay isLeap yd-                yd'    = monthAndDayToDayOfYear isLeap m d-                mdtext = show m ++ "-" ++ show d-            in showCompare yd mdtext yd')-            [-2..369]+testMonthDay =+    testCase "testMonthDay" $+    assertEqual "" testMonthDayRef $ concat $ map (\isL -> unlines (leap isL : yearDays isL)) [False, True]+  where+    leap isLeap =+        if isLeap+            then "Leap:"+            else "Regular:"+    yearDays isLeap =+        map+            (\yd -> let+                 (m, d) = dayOfYearToMonthAndDay isLeap yd+                 yd' = monthAndDayToDayOfYear isLeap m d+                 mdtext = show m ++ "-" ++ show d+                 in showCompare yd mdtext yd')+            [-2 .. 369]

@@ -2,750 +2,751 @@  testMonthDayRef :: String testMonthDayRef =- unlines-  [ "Regular:"-  , "DIFF: -2 -> 1-1 -> 1"-  , "DIFF: -1 -> 1-1 -> 1"-  , "DIFF: 0 -> 1-1 -> 1"-  , "1 == 1-1"-  , "2 == 1-2"-  , "3 == 1-3"-  , "4 == 1-4"-  , "5 == 1-5"-  , "6 == 1-6"-  , "7 == 1-7"-  , "8 == 1-8"-  , "9 == 1-9"-  , "10 == 1-10"-  , "11 == 1-11"-  , "12 == 1-12"-  , "13 == 1-13"-  , "14 == 1-14"-  , "15 == 1-15"-  , "16 == 1-16"-  , "17 == 1-17"-  , "18 == 1-18"-  , "19 == 1-19"-  , "20 == 1-20"-  , "21 == 1-21"-  , "22 == 1-22"-  , "23 == 1-23"-  , "24 == 1-24"-  , "25 == 1-25"-  , "26 == 1-26"-  , "27 == 1-27"-  , "28 == 1-28"-  , "29 == 1-29"-  , "30 == 1-30"-  , "31 == 1-31"-  , "32 == 2-1"-  , "33 == 2-2"-  , "34 == 2-3"-  , "35 == 2-4"-  , "36 == 2-5"-  , "37 == 2-6"-  , "38 == 2-7"-  , "39 == 2-8"-  , "40 == 2-9"-  , "41 == 2-10"-  , "42 == 2-11"-  , "43 == 2-12"-  , "44 == 2-13"-  , "45 == 2-14"-  , "46 == 2-15"-  , "47 == 2-16"-  , "48 == 2-17"-  , "49 == 2-18"-  , "50 == 2-19"-  , "51 == 2-20"-  , "52 == 2-21"-  , "53 == 2-22"-  , "54 == 2-23"-  , "55 == 2-24"-  , "56 == 2-25"-  , "57 == 2-26"-  , "58 == 2-27"-  , "59 == 2-28"-  , "60 == 3-1"-  , "61 == 3-2"-  , "62 == 3-3"-  , "63 == 3-4"-  , "64 == 3-5"-  , "65 == 3-6"-  , "66 == 3-7"-  , "67 == 3-8"-  , "68 == 3-9"-  , "69 == 3-10"-  , "70 == 3-11"-  , "71 == 3-12"-  , "72 == 3-13"-  , "73 == 3-14"-  , "74 == 3-15"-  , "75 == 3-16"-  , "76 == 3-17"-  , "77 == 3-18"-  , "78 == 3-19"-  , "79 == 3-20"-  , "80 == 3-21"-  , "81 == 3-22"-  , "82 == 3-23"-  , "83 == 3-24"-  , "84 == 3-25"-  , "85 == 3-26"-  , "86 == 3-27"-  , "87 == 3-28"-  , "88 == 3-29"-  , "89 == 3-30"-  , "90 == 3-31"-  , "91 == 4-1"-  , "92 == 4-2"-  , "93 == 4-3"-  , "94 == 4-4"-  , "95 == 4-5"-  , "96 == 4-6"-  , "97 == 4-7"-  , "98 == 4-8"-  , "99 == 4-9"-  , "100 == 4-10"-  , "101 == 4-11"-  , "102 == 4-12"-  , "103 == 4-13"-  , "104 == 4-14"-  , "105 == 4-15"-  , "106 == 4-16"-  , "107 == 4-17"-  , "108 == 4-18"-  , "109 == 4-19"-  , "110 == 4-20"-  , "111 == 4-21"-  , "112 == 4-22"-  , "113 == 4-23"-  , "114 == 4-24"-  , "115 == 4-25"-  , "116 == 4-26"-  , "117 == 4-27"-  , "118 == 4-28"-  , "119 == 4-29"-  , "120 == 4-30"-  , "121 == 5-1"-  , "122 == 5-2"-  , "123 == 5-3"-  , "124 == 5-4"-  , "125 == 5-5"-  , "126 == 5-6"-  , "127 == 5-7"-  , "128 == 5-8"-  , "129 == 5-9"-  , "130 == 5-10"-  , "131 == 5-11"-  , "132 == 5-12"-  , "133 == 5-13"-  , "134 == 5-14"-  , "135 == 5-15"-  , "136 == 5-16"-  , "137 == 5-17"-  , "138 == 5-18"-  , "139 == 5-19"-  , "140 == 5-20"-  , "141 == 5-21"-  , "142 == 5-22"-  , "143 == 5-23"-  , "144 == 5-24"-  , "145 == 5-25"-  , "146 == 5-26"-  , "147 == 5-27"-  , "148 == 5-28"-  , "149 == 5-29"-  , "150 == 5-30"-  , "151 == 5-31"-  , "152 == 6-1"-  , "153 == 6-2"-  , "154 == 6-3"-  , "155 == 6-4"-  , "156 == 6-5"-  , "157 == 6-6"-  , "158 == 6-7"-  , "159 == 6-8"-  , "160 == 6-9"-  , "161 == 6-10"-  , "162 == 6-11"-  , "163 == 6-12"-  , "164 == 6-13"-  , "165 == 6-14"-  , "166 == 6-15"-  , "167 == 6-16"-  , "168 == 6-17"-  , "169 == 6-18"-  , "170 == 6-19"-  , "171 == 6-20"-  , "172 == 6-21"-  , "173 == 6-22"-  , "174 == 6-23"-  , "175 == 6-24"-  , "176 == 6-25"-  , "177 == 6-26"-  , "178 == 6-27"-  , "179 == 6-28"-  , "180 == 6-29"-  , "181 == 6-30"-  , "182 == 7-1"-  , "183 == 7-2"-  , "184 == 7-3"-  , "185 == 7-4"-  , "186 == 7-5"-  , "187 == 7-6"-  , "188 == 7-7"-  , "189 == 7-8"-  , "190 == 7-9"-  , "191 == 7-10"-  , "192 == 7-11"-  , "193 == 7-12"-  , "194 == 7-13"-  , "195 == 7-14"-  , "196 == 7-15"-  , "197 == 7-16"-  , "198 == 7-17"-  , "199 == 7-18"-  , "200 == 7-19"-  , "201 == 7-20"-  , "202 == 7-21"-  , "203 == 7-22"-  , "204 == 7-23"-  , "205 == 7-24"-  , "206 == 7-25"-  , "207 == 7-26"-  , "208 == 7-27"-  , "209 == 7-28"-  , "210 == 7-29"-  , "211 == 7-30"-  , "212 == 7-31"-  , "213 == 8-1"-  , "214 == 8-2"-  , "215 == 8-3"-  , "216 == 8-4"-  , "217 == 8-5"-  , "218 == 8-6"-  , "219 == 8-7"-  , "220 == 8-8"-  , "221 == 8-9"-  , "222 == 8-10"-  , "223 == 8-11"-  , "224 == 8-12"-  , "225 == 8-13"-  , "226 == 8-14"-  , "227 == 8-15"-  , "228 == 8-16"-  , "229 == 8-17"-  , "230 == 8-18"-  , "231 == 8-19"-  , "232 == 8-20"-  , "233 == 8-21"-  , "234 == 8-22"-  , "235 == 8-23"-  , "236 == 8-24"-  , "237 == 8-25"-  , "238 == 8-26"-  , "239 == 8-27"-  , "240 == 8-28"-  , "241 == 8-29"-  , "242 == 8-30"-  , "243 == 8-31"-  , "244 == 9-1"-  , "245 == 9-2"-  , "246 == 9-3"-  , "247 == 9-4"-  , "248 == 9-5"-  , "249 == 9-6"-  , "250 == 9-7"-  , "251 == 9-8"-  , "252 == 9-9"-  , "253 == 9-10"-  , "254 == 9-11"-  , "255 == 9-12"-  , "256 == 9-13"-  , "257 == 9-14"-  , "258 == 9-15"-  , "259 == 9-16"-  , "260 == 9-17"-  , "261 == 9-18"-  , "262 == 9-19"-  , "263 == 9-20"-  , "264 == 9-21"-  , "265 == 9-22"-  , "266 == 9-23"-  , "267 == 9-24"-  , "268 == 9-25"-  , "269 == 9-26"-  , "270 == 9-27"-  , "271 == 9-28"-  , "272 == 9-29"-  , "273 == 9-30"-  , "274 == 10-1"-  , "275 == 10-2"-  , "276 == 10-3"-  , "277 == 10-4"-  , "278 == 10-5"-  , "279 == 10-6"-  , "280 == 10-7"-  , "281 == 10-8"-  , "282 == 10-9"-  , "283 == 10-10"-  , "284 == 10-11"-  , "285 == 10-12"-  , "286 == 10-13"-  , "287 == 10-14"-  , "288 == 10-15"-  , "289 == 10-16"-  , "290 == 10-17"-  , "291 == 10-18"-  , "292 == 10-19"-  , "293 == 10-20"-  , "294 == 10-21"-  , "295 == 10-22"-  , "296 == 10-23"-  , "297 == 10-24"-  , "298 == 10-25"-  , "299 == 10-26"-  , "300 == 10-27"-  , "301 == 10-28"-  , "302 == 10-29"-  , "303 == 10-30"-  , "304 == 10-31"-  , "305 == 11-1"-  , "306 == 11-2"-  , "307 == 11-3"-  , "308 == 11-4"-  , "309 == 11-5"-  , "310 == 11-6"-  , "311 == 11-7"-  , "312 == 11-8"-  , "313 == 11-9"-  , "314 == 11-10"-  , "315 == 11-11"-  , "316 == 11-12"-  , "317 == 11-13"-  , "318 == 11-14"-  , "319 == 11-15"-  , "320 == 11-16"-  , "321 == 11-17"-  , "322 == 11-18"-  , "323 == 11-19"-  , "324 == 11-20"-  , "325 == 11-21"-  , "326 == 11-22"-  , "327 == 11-23"-  , "328 == 11-24"-  , "329 == 11-25"-  , "330 == 11-26"-  , "331 == 11-27"-  , "332 == 11-28"-  , "333 == 11-29"-  , "334 == 11-30"-  , "335 == 12-1"-  , "336 == 12-2"-  , "337 == 12-3"-  , "338 == 12-4"-  , "339 == 12-5"-  , "340 == 12-6"-  , "341 == 12-7"-  , "342 == 12-8"-  , "343 == 12-9"-  , "344 == 12-10"-  , "345 == 12-11"-  , "346 == 12-12"-  , "347 == 12-13"-  , "348 == 12-14"-  , "349 == 12-15"-  , "350 == 12-16"-  , "351 == 12-17"-  , "352 == 12-18"-  , "353 == 12-19"-  , "354 == 12-20"-  , "355 == 12-21"-  , "356 == 12-22"-  , "357 == 12-23"-  , "358 == 12-24"-  , "359 == 12-25"-  , "360 == 12-26"-  , "361 == 12-27"-  , "362 == 12-28"-  , "363 == 12-29"-  , "364 == 12-30"-  , "365 == 12-31"-  , "DIFF: 366 -> 12-31 -> 365"-  , "DIFF: 367 -> 12-31 -> 365"-  , "DIFF: 368 -> 12-31 -> 365"-  , "DIFF: 369 -> 12-31 -> 365"-  , "Leap:"-  , "DIFF: -2 -> 1-1 -> 1"-  , "DIFF: -1 -> 1-1 -> 1"-  , "DIFF: 0 -> 1-1 -> 1"-  , "1 == 1-1"-  , "2 == 1-2"-  , "3 == 1-3"-  , "4 == 1-4"-  , "5 == 1-5"-  , "6 == 1-6"-  , "7 == 1-7"-  , "8 == 1-8"-  , "9 == 1-9"-  , "10 == 1-10"-  , "11 == 1-11"-  , "12 == 1-12"-  , "13 == 1-13"-  , "14 == 1-14"-  , "15 == 1-15"-  , "16 == 1-16"-  , "17 == 1-17"-  , "18 == 1-18"-  , "19 == 1-19"-  , "20 == 1-20"-  , "21 == 1-21"-  , "22 == 1-22"-  , "23 == 1-23"-  , "24 == 1-24"-  , "25 == 1-25"-  , "26 == 1-26"-  , "27 == 1-27"-  , "28 == 1-28"-  , "29 == 1-29"-  , "30 == 1-30"-  , "31 == 1-31"-  , "32 == 2-1"-  , "33 == 2-2"-  , "34 == 2-3"-  , "35 == 2-4"-  , "36 == 2-5"-  , "37 == 2-6"-  , "38 == 2-7"-  , "39 == 2-8"-  , "40 == 2-9"-  , "41 == 2-10"-  , "42 == 2-11"-  , "43 == 2-12"-  , "44 == 2-13"-  , "45 == 2-14"-  , "46 == 2-15"-  , "47 == 2-16"-  , "48 == 2-17"-  , "49 == 2-18"-  , "50 == 2-19"-  , "51 == 2-20"-  , "52 == 2-21"-  , "53 == 2-22"-  , "54 == 2-23"-  , "55 == 2-24"-  , "56 == 2-25"-  , "57 == 2-26"-  , "58 == 2-27"-  , "59 == 2-28"-  , "60 == 2-29"-  , "61 == 3-1"-  , "62 == 3-2"-  , "63 == 3-3"-  , "64 == 3-4"-  , "65 == 3-5"-  , "66 == 3-6"-  , "67 == 3-7"-  , "68 == 3-8"-  , "69 == 3-9"-  , "70 == 3-10"-  , "71 == 3-11"-  , "72 == 3-12"-  , "73 == 3-13"-  , "74 == 3-14"-  , "75 == 3-15"-  , "76 == 3-16"-  , "77 == 3-17"-  , "78 == 3-18"-  , "79 == 3-19"-  , "80 == 3-20"-  , "81 == 3-21"-  , "82 == 3-22"-  , "83 == 3-23"-  , "84 == 3-24"-  , "85 == 3-25"-  , "86 == 3-26"-  , "87 == 3-27"-  , "88 == 3-28"-  , "89 == 3-29"-  , "90 == 3-30"-  , "91 == 3-31"-  , "92 == 4-1"-  , "93 == 4-2"-  , "94 == 4-3"-  , "95 == 4-4"-  , "96 == 4-5"-  , "97 == 4-6"-  , "98 == 4-7"-  , "99 == 4-8"-  , "100 == 4-9"-  , "101 == 4-10"-  , "102 == 4-11"-  , "103 == 4-12"-  , "104 == 4-13"-  , "105 == 4-14"-  , "106 == 4-15"-  , "107 == 4-16"-  , "108 == 4-17"-  , "109 == 4-18"-  , "110 == 4-19"-  , "111 == 4-20"-  , "112 == 4-21"-  , "113 == 4-22"-  , "114 == 4-23"-  , "115 == 4-24"-  , "116 == 4-25"-  , "117 == 4-26"-  , "118 == 4-27"-  , "119 == 4-28"-  , "120 == 4-29"-  , "121 == 4-30"-  , "122 == 5-1"-  , "123 == 5-2"-  , "124 == 5-3"-  , "125 == 5-4"-  , "126 == 5-5"-  , "127 == 5-6"-  , "128 == 5-7"-  , "129 == 5-8"-  , "130 == 5-9"-  , "131 == 5-10"-  , "132 == 5-11"-  , "133 == 5-12"-  , "134 == 5-13"-  , "135 == 5-14"-  , "136 == 5-15"-  , "137 == 5-16"-  , "138 == 5-17"-  , "139 == 5-18"-  , "140 == 5-19"-  , "141 == 5-20"-  , "142 == 5-21"-  , "143 == 5-22"-  , "144 == 5-23"-  , "145 == 5-24"-  , "146 == 5-25"-  , "147 == 5-26"-  , "148 == 5-27"-  , "149 == 5-28"-  , "150 == 5-29"-  , "151 == 5-30"-  , "152 == 5-31"-  , "153 == 6-1"-  , "154 == 6-2"-  , "155 == 6-3"-  , "156 == 6-4"-  , "157 == 6-5"-  , "158 == 6-6"-  , "159 == 6-7"-  , "160 == 6-8"-  , "161 == 6-9"-  , "162 == 6-10"-  , "163 == 6-11"-  , "164 == 6-12"-  , "165 == 6-13"-  , "166 == 6-14"-  , "167 == 6-15"-  , "168 == 6-16"-  , "169 == 6-17"-  , "170 == 6-18"-  , "171 == 6-19"-  , "172 == 6-20"-  , "173 == 6-21"-  , "174 == 6-22"-  , "175 == 6-23"-  , "176 == 6-24"-  , "177 == 6-25"-  , "178 == 6-26"-  , "179 == 6-27"-  , "180 == 6-28"-  , "181 == 6-29"-  , "182 == 6-30"-  , "183 == 7-1"-  , "184 == 7-2"-  , "185 == 7-3"-  , "186 == 7-4"-  , "187 == 7-5"-  , "188 == 7-6"-  , "189 == 7-7"-  , "190 == 7-8"-  , "191 == 7-9"-  , "192 == 7-10"-  , "193 == 7-11"-  , "194 == 7-12"-  , "195 == 7-13"-  , "196 == 7-14"-  , "197 == 7-15"-  , "198 == 7-16"-  , "199 == 7-17"-  , "200 == 7-18"-  , "201 == 7-19"-  , "202 == 7-20"-  , "203 == 7-21"-  , "204 == 7-22"-  , "205 == 7-23"-  , "206 == 7-24"-  , "207 == 7-25"-  , "208 == 7-26"-  , "209 == 7-27"-  , "210 == 7-28"-  , "211 == 7-29"-  , "212 == 7-30"-  , "213 == 7-31"-  , "214 == 8-1"-  , "215 == 8-2"-  , "216 == 8-3"-  , "217 == 8-4"-  , "218 == 8-5"-  , "219 == 8-6"-  , "220 == 8-7"-  , "221 == 8-8"-  , "222 == 8-9"-  , "223 == 8-10"-  , "224 == 8-11"-  , "225 == 8-12"-  , "226 == 8-13"-  , "227 == 8-14"-  , "228 == 8-15"-  , "229 == 8-16"-  , "230 == 8-17"-  , "231 == 8-18"-  , "232 == 8-19"-  , "233 == 8-20"-  , "234 == 8-21"-  , "235 == 8-22"-  , "236 == 8-23"-  , "237 == 8-24"-  , "238 == 8-25"-  , "239 == 8-26"-  , "240 == 8-27"-  , "241 == 8-28"-  , "242 == 8-29"-  , "243 == 8-30"-  , "244 == 8-31"-  , "245 == 9-1"-  , "246 == 9-2"-  , "247 == 9-3"-  , "248 == 9-4"-  , "249 == 9-5"-  , "250 == 9-6"-  , "251 == 9-7"-  , "252 == 9-8"-  , "253 == 9-9"-  , "254 == 9-10"-  , "255 == 9-11"-  , "256 == 9-12"-  , "257 == 9-13"-  , "258 == 9-14"-  , "259 == 9-15"-  , "260 == 9-16"-  , "261 == 9-17"-  , "262 == 9-18"-  , "263 == 9-19"-  , "264 == 9-20"-  , "265 == 9-21"-  , "266 == 9-22"-  , "267 == 9-23"-  , "268 == 9-24"-  , "269 == 9-25"-  , "270 == 9-26"-  , "271 == 9-27"-  , "272 == 9-28"-  , "273 == 9-29"-  , "274 == 9-30"-  , "275 == 10-1"-  , "276 == 10-2"-  , "277 == 10-3"-  , "278 == 10-4"-  , "279 == 10-5"-  , "280 == 10-6"-  , "281 == 10-7"-  , "282 == 10-8"-  , "283 == 10-9"-  , "284 == 10-10"-  , "285 == 10-11"-  , "286 == 10-12"-  , "287 == 10-13"-  , "288 == 10-14"-  , "289 == 10-15"-  , "290 == 10-16"-  , "291 == 10-17"-  , "292 == 10-18"-  , "293 == 10-19"-  , "294 == 10-20"-  , "295 == 10-21"-  , "296 == 10-22"-  , "297 == 10-23"-  , "298 == 10-24"-  , "299 == 10-25"-  , "300 == 10-26"-  , "301 == 10-27"-  , "302 == 10-28"-  , "303 == 10-29"-  , "304 == 10-30"-  , "305 == 10-31"-  , "306 == 11-1"-  , "307 == 11-2"-  , "308 == 11-3"-  , "309 == 11-4"-  , "310 == 11-5"-  , "311 == 11-6"-  , "312 == 11-7"-  , "313 == 11-8"-  , "314 == 11-9"-  , "315 == 11-10"-  , "316 == 11-11"-  , "317 == 11-12"-  , "318 == 11-13"-  , "319 == 11-14"-  , "320 == 11-15"-  , "321 == 11-16"-  , "322 == 11-17"-  , "323 == 11-18"-  , "324 == 11-19"-  , "325 == 11-20"-  , "326 == 11-21"-  , "327 == 11-22"-  , "328 == 11-23"-  , "329 == 11-24"-  , "330 == 11-25"-  , "331 == 11-26"-  , "332 == 11-27"-  , "333 == 11-28"-  , "334 == 11-29"-  , "335 == 11-30"-  , "336 == 12-1"-  , "337 == 12-2"-  , "338 == 12-3"-  , "339 == 12-4"-  , "340 == 12-5"-  , "341 == 12-6"-  , "342 == 12-7"-  , "343 == 12-8"-  , "344 == 12-9"-  , "345 == 12-10"-  , "346 == 12-11"-  , "347 == 12-12"-  , "348 == 12-13"-  , "349 == 12-14"-  , "350 == 12-15"-  , "351 == 12-16"-  , "352 == 12-17"-  , "353 == 12-18"-  , "354 == 12-19"-  , "355 == 12-20"-  , "356 == 12-21"-  , "357 == 12-22"-  , "358 == 12-23"-  , "359 == 12-24"-  , "360 == 12-25"-  , "361 == 12-26"-  , "362 == 12-27"-  , "363 == 12-28"-  , "364 == 12-29"-  , "365 == 12-30"-  , "366 == 12-31"-  , "DIFF: 367 -> 12-31 -> 366"-  , "DIFF: 368 -> 12-31 -> 366"-  , "DIFF: 369 -> 12-31 -> 366" ]+    unlines+        [ "Regular:"+        , "DIFF: -2 -> 1-1 -> 1"+        , "DIFF: -1 -> 1-1 -> 1"+        , "DIFF: 0 -> 1-1 -> 1"+        , "1 == 1-1"+        , "2 == 1-2"+        , "3 == 1-3"+        , "4 == 1-4"+        , "5 == 1-5"+        , "6 == 1-6"+        , "7 == 1-7"+        , "8 == 1-8"+        , "9 == 1-9"+        , "10 == 1-10"+        , "11 == 1-11"+        , "12 == 1-12"+        , "13 == 1-13"+        , "14 == 1-14"+        , "15 == 1-15"+        , "16 == 1-16"+        , "17 == 1-17"+        , "18 == 1-18"+        , "19 == 1-19"+        , "20 == 1-20"+        , "21 == 1-21"+        , "22 == 1-22"+        , "23 == 1-23"+        , "24 == 1-24"+        , "25 == 1-25"+        , "26 == 1-26"+        , "27 == 1-27"+        , "28 == 1-28"+        , "29 == 1-29"+        , "30 == 1-30"+        , "31 == 1-31"+        , "32 == 2-1"+        , "33 == 2-2"+        , "34 == 2-3"+        , "35 == 2-4"+        , "36 == 2-5"+        , "37 == 2-6"+        , "38 == 2-7"+        , "39 == 2-8"+        , "40 == 2-9"+        , "41 == 2-10"+        , "42 == 2-11"+        , "43 == 2-12"+        , "44 == 2-13"+        , "45 == 2-14"+        , "46 == 2-15"+        , "47 == 2-16"+        , "48 == 2-17"+        , "49 == 2-18"+        , "50 == 2-19"+        , "51 == 2-20"+        , "52 == 2-21"+        , "53 == 2-22"+        , "54 == 2-23"+        , "55 == 2-24"+        , "56 == 2-25"+        , "57 == 2-26"+        , "58 == 2-27"+        , "59 == 2-28"+        , "60 == 3-1"+        , "61 == 3-2"+        , "62 == 3-3"+        , "63 == 3-4"+        , "64 == 3-5"+        , "65 == 3-6"+        , "66 == 3-7"+        , "67 == 3-8"+        , "68 == 3-9"+        , "69 == 3-10"+        , "70 == 3-11"+        , "71 == 3-12"+        , "72 == 3-13"+        , "73 == 3-14"+        , "74 == 3-15"+        , "75 == 3-16"+        , "76 == 3-17"+        , "77 == 3-18"+        , "78 == 3-19"+        , "79 == 3-20"+        , "80 == 3-21"+        , "81 == 3-22"+        , "82 == 3-23"+        , "83 == 3-24"+        , "84 == 3-25"+        , "85 == 3-26"+        , "86 == 3-27"+        , "87 == 3-28"+        , "88 == 3-29"+        , "89 == 3-30"+        , "90 == 3-31"+        , "91 == 4-1"+        , "92 == 4-2"+        , "93 == 4-3"+        , "94 == 4-4"+        , "95 == 4-5"+        , "96 == 4-6"+        , "97 == 4-7"+        , "98 == 4-8"+        , "99 == 4-9"+        , "100 == 4-10"+        , "101 == 4-11"+        , "102 == 4-12"+        , "103 == 4-13"+        , "104 == 4-14"+        , "105 == 4-15"+        , "106 == 4-16"+        , "107 == 4-17"+        , "108 == 4-18"+        , "109 == 4-19"+        , "110 == 4-20"+        , "111 == 4-21"+        , "112 == 4-22"+        , "113 == 4-23"+        , "114 == 4-24"+        , "115 == 4-25"+        , "116 == 4-26"+        , "117 == 4-27"+        , "118 == 4-28"+        , "119 == 4-29"+        , "120 == 4-30"+        , "121 == 5-1"+        , "122 == 5-2"+        , "123 == 5-3"+        , "124 == 5-4"+        , "125 == 5-5"+        , "126 == 5-6"+        , "127 == 5-7"+        , "128 == 5-8"+        , "129 == 5-9"+        , "130 == 5-10"+        , "131 == 5-11"+        , "132 == 5-12"+        , "133 == 5-13"+        , "134 == 5-14"+        , "135 == 5-15"+        , "136 == 5-16"+        , "137 == 5-17"+        , "138 == 5-18"+        , "139 == 5-19"+        , "140 == 5-20"+        , "141 == 5-21"+        , "142 == 5-22"+        , "143 == 5-23"+        , "144 == 5-24"+        , "145 == 5-25"+        , "146 == 5-26"+        , "147 == 5-27"+        , "148 == 5-28"+        , "149 == 5-29"+        , "150 == 5-30"+        , "151 == 5-31"+        , "152 == 6-1"+        , "153 == 6-2"+        , "154 == 6-3"+        , "155 == 6-4"+        , "156 == 6-5"+        , "157 == 6-6"+        , "158 == 6-7"+        , "159 == 6-8"+        , "160 == 6-9"+        , "161 == 6-10"+        , "162 == 6-11"+        , "163 == 6-12"+        , "164 == 6-13"+        , "165 == 6-14"+        , "166 == 6-15"+        , "167 == 6-16"+        , "168 == 6-17"+        , "169 == 6-18"+        , "170 == 6-19"+        , "171 == 6-20"+        , "172 == 6-21"+        , "173 == 6-22"+        , "174 == 6-23"+        , "175 == 6-24"+        , "176 == 6-25"+        , "177 == 6-26"+        , "178 == 6-27"+        , "179 == 6-28"+        , "180 == 6-29"+        , "181 == 6-30"+        , "182 == 7-1"+        , "183 == 7-2"+        , "184 == 7-3"+        , "185 == 7-4"+        , "186 == 7-5"+        , "187 == 7-6"+        , "188 == 7-7"+        , "189 == 7-8"+        , "190 == 7-9"+        , "191 == 7-10"+        , "192 == 7-11"+        , "193 == 7-12"+        , "194 == 7-13"+        , "195 == 7-14"+        , "196 == 7-15"+        , "197 == 7-16"+        , "198 == 7-17"+        , "199 == 7-18"+        , "200 == 7-19"+        , "201 == 7-20"+        , "202 == 7-21"+        , "203 == 7-22"+        , "204 == 7-23"+        , "205 == 7-24"+        , "206 == 7-25"+        , "207 == 7-26"+        , "208 == 7-27"+        , "209 == 7-28"+        , "210 == 7-29"+        , "211 == 7-30"+        , "212 == 7-31"+        , "213 == 8-1"+        , "214 == 8-2"+        , "215 == 8-3"+        , "216 == 8-4"+        , "217 == 8-5"+        , "218 == 8-6"+        , "219 == 8-7"+        , "220 == 8-8"+        , "221 == 8-9"+        , "222 == 8-10"+        , "223 == 8-11"+        , "224 == 8-12"+        , "225 == 8-13"+        , "226 == 8-14"+        , "227 == 8-15"+        , "228 == 8-16"+        , "229 == 8-17"+        , "230 == 8-18"+        , "231 == 8-19"+        , "232 == 8-20"+        , "233 == 8-21"+        , "234 == 8-22"+        , "235 == 8-23"+        , "236 == 8-24"+        , "237 == 8-25"+        , "238 == 8-26"+        , "239 == 8-27"+        , "240 == 8-28"+        , "241 == 8-29"+        , "242 == 8-30"+        , "243 == 8-31"+        , "244 == 9-1"+        , "245 == 9-2"+        , "246 == 9-3"+        , "247 == 9-4"+        , "248 == 9-5"+        , "249 == 9-6"+        , "250 == 9-7"+        , "251 == 9-8"+        , "252 == 9-9"+        , "253 == 9-10"+        , "254 == 9-11"+        , "255 == 9-12"+        , "256 == 9-13"+        , "257 == 9-14"+        , "258 == 9-15"+        , "259 == 9-16"+        , "260 == 9-17"+        , "261 == 9-18"+        , "262 == 9-19"+        , "263 == 9-20"+        , "264 == 9-21"+        , "265 == 9-22"+        , "266 == 9-23"+        , "267 == 9-24"+        , "268 == 9-25"+        , "269 == 9-26"+        , "270 == 9-27"+        , "271 == 9-28"+        , "272 == 9-29"+        , "273 == 9-30"+        , "274 == 10-1"+        , "275 == 10-2"+        , "276 == 10-3"+        , "277 == 10-4"+        , "278 == 10-5"+        , "279 == 10-6"+        , "280 == 10-7"+        , "281 == 10-8"+        , "282 == 10-9"+        , "283 == 10-10"+        , "284 == 10-11"+        , "285 == 10-12"+        , "286 == 10-13"+        , "287 == 10-14"+        , "288 == 10-15"+        , "289 == 10-16"+        , "290 == 10-17"+        , "291 == 10-18"+        , "292 == 10-19"+        , "293 == 10-20"+        , "294 == 10-21"+        , "295 == 10-22"+        , "296 == 10-23"+        , "297 == 10-24"+        , "298 == 10-25"+        , "299 == 10-26"+        , "300 == 10-27"+        , "301 == 10-28"+        , "302 == 10-29"+        , "303 == 10-30"+        , "304 == 10-31"+        , "305 == 11-1"+        , "306 == 11-2"+        , "307 == 11-3"+        , "308 == 11-4"+        , "309 == 11-5"+        , "310 == 11-6"+        , "311 == 11-7"+        , "312 == 11-8"+        , "313 == 11-9"+        , "314 == 11-10"+        , "315 == 11-11"+        , "316 == 11-12"+        , "317 == 11-13"+        , "318 == 11-14"+        , "319 == 11-15"+        , "320 == 11-16"+        , "321 == 11-17"+        , "322 == 11-18"+        , "323 == 11-19"+        , "324 == 11-20"+        , "325 == 11-21"+        , "326 == 11-22"+        , "327 == 11-23"+        , "328 == 11-24"+        , "329 == 11-25"+        , "330 == 11-26"+        , "331 == 11-27"+        , "332 == 11-28"+        , "333 == 11-29"+        , "334 == 11-30"+        , "335 == 12-1"+        , "336 == 12-2"+        , "337 == 12-3"+        , "338 == 12-4"+        , "339 == 12-5"+        , "340 == 12-6"+        , "341 == 12-7"+        , "342 == 12-8"+        , "343 == 12-9"+        , "344 == 12-10"+        , "345 == 12-11"+        , "346 == 12-12"+        , "347 == 12-13"+        , "348 == 12-14"+        , "349 == 12-15"+        , "350 == 12-16"+        , "351 == 12-17"+        , "352 == 12-18"+        , "353 == 12-19"+        , "354 == 12-20"+        , "355 == 12-21"+        , "356 == 12-22"+        , "357 == 12-23"+        , "358 == 12-24"+        , "359 == 12-25"+        , "360 == 12-26"+        , "361 == 12-27"+        , "362 == 12-28"+        , "363 == 12-29"+        , "364 == 12-30"+        , "365 == 12-31"+        , "DIFF: 366 -> 12-31 -> 365"+        , "DIFF: 367 -> 12-31 -> 365"+        , "DIFF: 368 -> 12-31 -> 365"+        , "DIFF: 369 -> 12-31 -> 365"+        , "Leap:"+        , "DIFF: -2 -> 1-1 -> 1"+        , "DIFF: -1 -> 1-1 -> 1"+        , "DIFF: 0 -> 1-1 -> 1"+        , "1 == 1-1"+        , "2 == 1-2"+        , "3 == 1-3"+        , "4 == 1-4"+        , "5 == 1-5"+        , "6 == 1-6"+        , "7 == 1-7"+        , "8 == 1-8"+        , "9 == 1-9"+        , "10 == 1-10"+        , "11 == 1-11"+        , "12 == 1-12"+        , "13 == 1-13"+        , "14 == 1-14"+        , "15 == 1-15"+        , "16 == 1-16"+        , "17 == 1-17"+        , "18 == 1-18"+        , "19 == 1-19"+        , "20 == 1-20"+        , "21 == 1-21"+        , "22 == 1-22"+        , "23 == 1-23"+        , "24 == 1-24"+        , "25 == 1-25"+        , "26 == 1-26"+        , "27 == 1-27"+        , "28 == 1-28"+        , "29 == 1-29"+        , "30 == 1-30"+        , "31 == 1-31"+        , "32 == 2-1"+        , "33 == 2-2"+        , "34 == 2-3"+        , "35 == 2-4"+        , "36 == 2-5"+        , "37 == 2-6"+        , "38 == 2-7"+        , "39 == 2-8"+        , "40 == 2-9"+        , "41 == 2-10"+        , "42 == 2-11"+        , "43 == 2-12"+        , "44 == 2-13"+        , "45 == 2-14"+        , "46 == 2-15"+        , "47 == 2-16"+        , "48 == 2-17"+        , "49 == 2-18"+        , "50 == 2-19"+        , "51 == 2-20"+        , "52 == 2-21"+        , "53 == 2-22"+        , "54 == 2-23"+        , "55 == 2-24"+        , "56 == 2-25"+        , "57 == 2-26"+        , "58 == 2-27"+        , "59 == 2-28"+        , "60 == 2-29"+        , "61 == 3-1"+        , "62 == 3-2"+        , "63 == 3-3"+        , "64 == 3-4"+        , "65 == 3-5"+        , "66 == 3-6"+        , "67 == 3-7"+        , "68 == 3-8"+        , "69 == 3-9"+        , "70 == 3-10"+        , "71 == 3-11"+        , "72 == 3-12"+        , "73 == 3-13"+        , "74 == 3-14"+        , "75 == 3-15"+        , "76 == 3-16"+        , "77 == 3-17"+        , "78 == 3-18"+        , "79 == 3-19"+        , "80 == 3-20"+        , "81 == 3-21"+        , "82 == 3-22"+        , "83 == 3-23"+        , "84 == 3-24"+        , "85 == 3-25"+        , "86 == 3-26"+        , "87 == 3-27"+        , "88 == 3-28"+        , "89 == 3-29"+        , "90 == 3-30"+        , "91 == 3-31"+        , "92 == 4-1"+        , "93 == 4-2"+        , "94 == 4-3"+        , "95 == 4-4"+        , "96 == 4-5"+        , "97 == 4-6"+        , "98 == 4-7"+        , "99 == 4-8"+        , "100 == 4-9"+        , "101 == 4-10"+        , "102 == 4-11"+        , "103 == 4-12"+        , "104 == 4-13"+        , "105 == 4-14"+        , "106 == 4-15"+        , "107 == 4-16"+        , "108 == 4-17"+        , "109 == 4-18"+        , "110 == 4-19"+        , "111 == 4-20"+        , "112 == 4-21"+        , "113 == 4-22"+        , "114 == 4-23"+        , "115 == 4-24"+        , "116 == 4-25"+        , "117 == 4-26"+        , "118 == 4-27"+        , "119 == 4-28"+        , "120 == 4-29"+        , "121 == 4-30"+        , "122 == 5-1"+        , "123 == 5-2"+        , "124 == 5-3"+        , "125 == 5-4"+        , "126 == 5-5"+        , "127 == 5-6"+        , "128 == 5-7"+        , "129 == 5-8"+        , "130 == 5-9"+        , "131 == 5-10"+        , "132 == 5-11"+        , "133 == 5-12"+        , "134 == 5-13"+        , "135 == 5-14"+        , "136 == 5-15"+        , "137 == 5-16"+        , "138 == 5-17"+        , "139 == 5-18"+        , "140 == 5-19"+        , "141 == 5-20"+        , "142 == 5-21"+        , "143 == 5-22"+        , "144 == 5-23"+        , "145 == 5-24"+        , "146 == 5-25"+        , "147 == 5-26"+        , "148 == 5-27"+        , "149 == 5-28"+        , "150 == 5-29"+        , "151 == 5-30"+        , "152 == 5-31"+        , "153 == 6-1"+        , "154 == 6-2"+        , "155 == 6-3"+        , "156 == 6-4"+        , "157 == 6-5"+        , "158 == 6-6"+        , "159 == 6-7"+        , "160 == 6-8"+        , "161 == 6-9"+        , "162 == 6-10"+        , "163 == 6-11"+        , "164 == 6-12"+        , "165 == 6-13"+        , "166 == 6-14"+        , "167 == 6-15"+        , "168 == 6-16"+        , "169 == 6-17"+        , "170 == 6-18"+        , "171 == 6-19"+        , "172 == 6-20"+        , "173 == 6-21"+        , "174 == 6-22"+        , "175 == 6-23"+        , "176 == 6-24"+        , "177 == 6-25"+        , "178 == 6-26"+        , "179 == 6-27"+        , "180 == 6-28"+        , "181 == 6-29"+        , "182 == 6-30"+        , "183 == 7-1"+        , "184 == 7-2"+        , "185 == 7-3"+        , "186 == 7-4"+        , "187 == 7-5"+        , "188 == 7-6"+        , "189 == 7-7"+        , "190 == 7-8"+        , "191 == 7-9"+        , "192 == 7-10"+        , "193 == 7-11"+        , "194 == 7-12"+        , "195 == 7-13"+        , "196 == 7-14"+        , "197 == 7-15"+        , "198 == 7-16"+        , "199 == 7-17"+        , "200 == 7-18"+        , "201 == 7-19"+        , "202 == 7-20"+        , "203 == 7-21"+        , "204 == 7-22"+        , "205 == 7-23"+        , "206 == 7-24"+        , "207 == 7-25"+        , "208 == 7-26"+        , "209 == 7-27"+        , "210 == 7-28"+        , "211 == 7-29"+        , "212 == 7-30"+        , "213 == 7-31"+        , "214 == 8-1"+        , "215 == 8-2"+        , "216 == 8-3"+        , "217 == 8-4"+        , "218 == 8-5"+        , "219 == 8-6"+        , "220 == 8-7"+        , "221 == 8-8"+        , "222 == 8-9"+        , "223 == 8-10"+        , "224 == 8-11"+        , "225 == 8-12"+        , "226 == 8-13"+        , "227 == 8-14"+        , "228 == 8-15"+        , "229 == 8-16"+        , "230 == 8-17"+        , "231 == 8-18"+        , "232 == 8-19"+        , "233 == 8-20"+        , "234 == 8-21"+        , "235 == 8-22"+        , "236 == 8-23"+        , "237 == 8-24"+        , "238 == 8-25"+        , "239 == 8-26"+        , "240 == 8-27"+        , "241 == 8-28"+        , "242 == 8-29"+        , "243 == 8-30"+        , "244 == 8-31"+        , "245 == 9-1"+        , "246 == 9-2"+        , "247 == 9-3"+        , "248 == 9-4"+        , "249 == 9-5"+        , "250 == 9-6"+        , "251 == 9-7"+        , "252 == 9-8"+        , "253 == 9-9"+        , "254 == 9-10"+        , "255 == 9-11"+        , "256 == 9-12"+        , "257 == 9-13"+        , "258 == 9-14"+        , "259 == 9-15"+        , "260 == 9-16"+        , "261 == 9-17"+        , "262 == 9-18"+        , "263 == 9-19"+        , "264 == 9-20"+        , "265 == 9-21"+        , "266 == 9-22"+        , "267 == 9-23"+        , "268 == 9-24"+        , "269 == 9-25"+        , "270 == 9-26"+        , "271 == 9-27"+        , "272 == 9-28"+        , "273 == 9-29"+        , "274 == 9-30"+        , "275 == 10-1"+        , "276 == 10-2"+        , "277 == 10-3"+        , "278 == 10-4"+        , "279 == 10-5"+        , "280 == 10-6"+        , "281 == 10-7"+        , "282 == 10-8"+        , "283 == 10-9"+        , "284 == 10-10"+        , "285 == 10-11"+        , "286 == 10-12"+        , "287 == 10-13"+        , "288 == 10-14"+        , "289 == 10-15"+        , "290 == 10-16"+        , "291 == 10-17"+        , "292 == 10-18"+        , "293 == 10-19"+        , "294 == 10-20"+        , "295 == 10-21"+        , "296 == 10-22"+        , "297 == 10-23"+        , "298 == 10-24"+        , "299 == 10-25"+        , "300 == 10-26"+        , "301 == 10-27"+        , "302 == 10-28"+        , "303 == 10-29"+        , "304 == 10-30"+        , "305 == 10-31"+        , "306 == 11-1"+        , "307 == 11-2"+        , "308 == 11-3"+        , "309 == 11-4"+        , "310 == 11-5"+        , "311 == 11-6"+        , "312 == 11-7"+        , "313 == 11-8"+        , "314 == 11-9"+        , "315 == 11-10"+        , "316 == 11-11"+        , "317 == 11-12"+        , "318 == 11-13"+        , "319 == 11-14"+        , "320 == 11-15"+        , "321 == 11-16"+        , "322 == 11-17"+        , "323 == 11-18"+        , "324 == 11-19"+        , "325 == 11-20"+        , "326 == 11-21"+        , "327 == 11-22"+        , "328 == 11-23"+        , "329 == 11-24"+        , "330 == 11-25"+        , "331 == 11-26"+        , "332 == 11-27"+        , "333 == 11-28"+        , "334 == 11-29"+        , "335 == 11-30"+        , "336 == 12-1"+        , "337 == 12-2"+        , "338 == 12-3"+        , "339 == 12-4"+        , "340 == 12-5"+        , "341 == 12-6"+        , "342 == 12-7"+        , "343 == 12-8"+        , "344 == 12-9"+        , "345 == 12-10"+        , "346 == 12-11"+        , "347 == 12-12"+        , "348 == 12-13"+        , "349 == 12-14"+        , "350 == 12-15"+        , "351 == 12-16"+        , "352 == 12-17"+        , "353 == 12-18"+        , "354 == 12-19"+        , "355 == 12-20"+        , "356 == 12-21"+        , "357 == 12-22"+        , "358 == 12-23"+        , "359 == 12-24"+        , "360 == 12-25"+        , "361 == 12-26"+        , "362 == 12-27"+        , "363 == 12-28"+        , "364 == 12-29"+        , "365 == 12-30"+        , "366 == 12-31"+        , "DIFF: 367 -> 12-31 -> 366"+        , "DIFF: 368 -> 12-31 -> 366"+        , "DIFF: 369 -> 12-31 -> 366"+        ]

@@ -1,96 +1,152 @@-module Test.Calendar.Valid(testValid) where+module Test.Calendar.Valid+    ( testValid+    ) where  import Data.Time.Compat+import Data.Time.Calendar.Julian.Compat import Data.Time.Calendar.OrdinalDate.Compat import Data.Time.Calendar.WeekDate.Compat-import Data.Time.Calendar.Julian.Compat-+import Test.QuickCheck.Property import Test.Tasty import Test.Tasty.QuickCheck hiding (reason)-import Test.QuickCheck.Property --validResult :: (Eq c,Show c,Eq t,Show t) =>-    (s -> c) -> Bool -> (t -> c) -> (c -> t) -> (c -> Maybe t) -> s -> Result+validResult :: (Eq c, Show c, Eq t, Show t) => (s -> c) -> Bool -> (t -> c) -> (c -> t) -> (c -> Maybe t) -> s -> Result validResult sc valid toComponents fromComponents fromComponentsValid s = let     c = sc s     mt = fromComponentsValid c     t' = fromComponents c     c' = toComponents t'-    in if valid then-        case mt of-            Nothing -> rejected-            Just t -> if t' /= t-                then failed {reason = "'fromValid' gives " ++ show t ++ ", but 'from' gives " ++ show t'}-                else if c' /= c-                then failed {reason = "found valid, but converts " ++ show c ++ " -> " ++ show t' ++ " -> " ++ show c'}-                else succeeded-        else case mt of-            Nothing -> if c' /= c-                then succeeded-                else failed {reason = show c ++ " found invalid, but converts with " ++ show t'}-            Just _ -> rejected+    in if valid+           then case mt of+                    Nothing -> rejected+                    Just t ->+                        if t' /= t+                            then failed {reason = "'fromValid' gives " ++ show t ++ ", but 'from' gives " ++ show t'}+                            else if c' /= c+                                     then failed+                                              { reason =+                                                    "found valid, but converts " +++                                                    show c ++ " -> " ++ show t' ++ " -> " ++ show c'+                                              }+                                     else succeeded+           else case mt of+                    Nothing ->+                        if c' /= c+                            then succeeded+                            else failed {reason = show c ++ " found invalid, but converts with " ++ show t'}+                    Just _ -> rejected -validTest :: (Arbitrary s,Show s,Eq c,Show c,Eq t,Show t) =>-    String -> (s -> c) -> (t -> c) -> (c -> t) -> (c -> Maybe t) -> TestTree-validTest name sc toComponents fromComponents fromComponentsValid = testGroup name-    [-    testProperty "valid" $ property $ validResult sc True toComponents fromComponents fromComponentsValid,-    testProperty "invalid" $ property $ validResult sc False toComponents fromComponents fromComponentsValid-    ]+validTest ::+       (Arbitrary s, Show s, Eq c, Show c, Eq t, Show t)+    => String+    -> (s -> c)+    -> (t -> c)+    -> (c -> t)+    -> (c -> Maybe t)+    -> TestTree+validTest name sc toComponents fromComponents fromComponentsValid =+    testGroup+        name+        [ testProperty "valid" $ property $ validResult sc True toComponents fromComponents fromComponentsValid+        , testProperty "invalid" $ property $ validResult sc False toComponents fromComponents fromComponentsValid+        ] -toSundayStartWeek :: Day -> (Integer,Int,Int)+toSundayStartWeek :: Day -> (Integer, Int, Int) toSundayStartWeek day = let-    (y,_) = toOrdinalDate day-    (w,d) = sundayStartWeek day-    in (y,w,d)+    (y, _) = toOrdinalDate day+    (w, d) = sundayStartWeek day+    in (y, w, d) -toMondayStartWeek :: Day -> (Integer,Int,Int)+toMondayStartWeek :: Day -> (Integer, Int, Int) toMondayStartWeek day = let-    (y,_) = toOrdinalDate day-    (w,d) = mondayStartWeek day-    in (y,w,d)+    (y, _) = toOrdinalDate day+    (w, d) = mondayStartWeek day+    in (y, w, d) -newtype Year = MkYear Integer deriving (Eq,Show)-instance Arbitrary Year where-    arbitrary = fmap MkYear $ choose (-1000,3000)+newtype WYear =+    MkWYear Year+    deriving (Eq, Show) -newtype YearMonth = MkYearMonth Int deriving (Eq,Show)-instance Arbitrary YearMonth where-    arbitrary = fmap MkYearMonth $ choose (-5,17)+instance Arbitrary WYear where+    arbitrary = fmap MkWYear $ choose (-1000, 3000) -newtype MonthDay = MkMonthDay Int deriving (Eq,Show)-instance Arbitrary MonthDay where-    arbitrary = fmap MkMonthDay $ choose (-5,35)+newtype WMonthOfYear =+    MkWMonthOfYear MonthOfYear+    deriving (Eq, Show) -newtype YearDay = MkYearDay Int deriving (Eq,Show)-instance Arbitrary YearDay where-    arbitrary = fmap MkYearDay $ choose (-20,400)+instance Arbitrary WMonthOfYear where+    arbitrary = fmap MkWMonthOfYear $ choose (-5, 17) -newtype YearWeek = MkYearWeek Int deriving (Eq,Show)-instance Arbitrary YearWeek where-    arbitrary = fmap MkYearWeek $ choose (-5,60)+newtype WDayOfMonth =+    MkWDayOfMonth DayOfMonth+    deriving (Eq, Show) -newtype WeekDay = MkWeekDay Int deriving (Eq,Show)-instance Arbitrary WeekDay where-    arbitrary = fmap MkWeekDay $ choose (-5,15)+instance Arbitrary WDayOfMonth where+    arbitrary = fmap MkWDayOfMonth $ choose (-5, 35) -fromYMD :: (Year,YearMonth,MonthDay) -> (Integer,Int,Int)-fromYMD (MkYear y,MkYearMonth ym,MkMonthDay md) = (y,ym,md)+newtype WDayOfYear =+    MkWDayOfYear DayOfYear+    deriving (Eq, Show) -fromYD :: (Year,YearDay) -> (Integer,Int)-fromYD (MkYear y,MkYearDay yd) = (y,yd)+instance Arbitrary WDayOfYear where+    arbitrary = fmap MkWDayOfYear $ choose (-20, 400) -fromYWD :: (Year,YearWeek,WeekDay) -> (Integer,Int,Int)-fromYWD (MkYear y,MkYearWeek yw,MkWeekDay wd) = (y,yw,wd)+newtype WWeekOfYear =+    MkWWeekOfYear WeekOfYear+    deriving (Eq, Show) +instance Arbitrary WWeekOfYear where+    arbitrary = fmap MkWWeekOfYear $ choose (-5, 60)++newtype WDayOfWeek =+    MkWDayOfWeek Int+    deriving (Eq, Show)++instance Arbitrary WDayOfWeek where+    arbitrary = fmap MkWDayOfWeek $ choose (-5, 15)++fromYMD :: (WYear, WMonthOfYear, WDayOfMonth) -> (Year, MonthOfYear, DayOfMonth)+fromYMD (MkWYear y, MkWMonthOfYear ym, MkWDayOfMonth md) = (y, ym, md)++fromYD :: (WYear, WDayOfYear) -> (Year, DayOfYear)+fromYD (MkWYear y, MkWDayOfYear yd) = (y, yd)++fromYWD :: (WYear, WWeekOfYear, WDayOfWeek) -> (Year, WeekOfYear, Int)+fromYWD (MkWYear y, MkWWeekOfYear yw, MkWDayOfWeek wd) = (y, yw, wd)+ testValid :: TestTree-testValid = testGroup "testValid"-    [-    validTest "Gregorian" fromYMD toGregorian (\(y,m,d) -> fromGregorian y m d) (\(y,m,d) -> fromGregorianValid y m d),-    validTest "OrdinalDate" fromYD toOrdinalDate (\(y,d) -> fromOrdinalDate y d) (\(y,d) -> fromOrdinalDateValid y d),-    validTest "WeekDate" fromYWD toWeekDate (\(y,w,d) -> fromWeekDate y w d) (\(y,w,d) -> fromWeekDateValid y w d),-    validTest "SundayStartWeek" fromYWD toSundayStartWeek (\(y,w,d) -> fromSundayStartWeek y w d) (\(y,w,d) -> fromSundayStartWeekValid y w d),-    validTest "MondayStartWeek" fromYWD toMondayStartWeek (\(y,w,d) -> fromMondayStartWeek y w d) (\(y,w,d) -> fromMondayStartWeekValid y w d),-    validTest "Julian" fromYMD toJulian (\(y,m,d) -> fromJulian y m d) (\(y,m,d) -> fromJulianValid y m d)-    ]+testValid =+    testGroup+        "testValid"+        [ validTest+              "Gregorian"+              fromYMD+              toGregorian+              (\(y, m, d) -> fromGregorian y m d)+              (\(y, m, d) -> fromGregorianValid y m d)+        , validTest+              "OrdinalDate"+              fromYD+              toOrdinalDate+              (\(y, d) -> fromOrdinalDate y d)+              (\(y, d) -> fromOrdinalDateValid y d)+        , validTest+              "WeekDate"+              fromYWD+              toWeekDate+              (\(y, w, d) -> fromWeekDate y w d)+              (\(y, w, d) -> fromWeekDateValid y w d)+        , validTest+              "SundayStartWeek"+              fromYWD+              toSundayStartWeek+              (\(y, w, d) -> fromSundayStartWeek y w d)+              (\(y, w, d) -> fromSundayStartWeekValid y w d)+        , validTest+              "MondayStartWeek"+              fromYWD+              toMondayStartWeek+              (\(y, w, d) -> fromMondayStartWeek y w d)+              (\(y, w, d) -> fromMondayStartWeekValid y w d)+        , validTest "Julian" fromYMD toJulian (\(y, m, d) -> fromJulian y m d) (\(y, m, d) -> fromJulianValid y m d)+        ]

@@ -3,14 +3,16 @@     ) where  import Data.Time.Calendar.Compat+import Data.Time.Calendar.OrdinalDate.Compat import Data.Time.Calendar.WeekDate.Compat-+import Test.TestUtil import Test.Tasty import Test.Tasty.HUnit+import Test.Arbitrary ()  testDay :: TestTree testDay =-    testCase "day" $ do+    nameTest "day" $ do         let day = fromGregorian 2018 1 9         assertEqual "" (ModifiedJulianDay 58127) day         assertEqual "" (2018, 2, 2) $ toWeekDate day@@ -20,7 +22,7 @@ allDaysOfWeek = [Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday]  testAllDays :: String -> (DayOfWeek -> IO ()) -> TestTree-testAllDays name f = testGroup name $ fmap (\wd -> testCase (show wd) $ f wd) allDaysOfWeek+testAllDays name f = nameTest name $ fmap (\wd -> nameTest (show wd) $ f wd) allDaysOfWeek  testSucc :: TestTree testSucc = testAllDays "succ" $ \wd -> assertEqual "" (toEnum $ succ $ fromEnum wd) $ succ wd@@ -30,15 +32,15 @@  testSequences :: TestTree testSequences =-    testGroup+    nameTest         "sequence"-        [ testCase "[Monday .. Sunday]" $ assertEqual "" allDaysOfWeek [Monday .. Sunday]-        , testCase "[Wednesday .. Wednesday]" $ assertEqual "" [Wednesday] [Wednesday .. Wednesday]-        , testCase "[Sunday .. Saturday]" $+        [ nameTest "[Monday .. Sunday]" $ assertEqual "" allDaysOfWeek [Monday .. Sunday]+        , nameTest "[Wednesday .. Wednesday]" $ assertEqual "" [Wednesday] [Wednesday .. Wednesday]+        , nameTest "[Sunday .. Saturday]" $           assertEqual "" [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday] [Sunday .. Saturday]-        , testCase "[Thursday .. Wednesday]" $+        , nameTest "[Thursday .. Wednesday]" $           assertEqual "" [Thursday, Friday, Saturday, Sunday, Monday, Tuesday, Wednesday] [Thursday .. Wednesday]-        , testCase "[Tuesday ..]" $+        , nameTest "[Tuesday ..]" $           assertEqual               ""               [ Tuesday@@ -58,7 +60,7 @@               , Tuesday               ] $           take 15 [Tuesday ..]-        , testCase "[Wednesday, Tuesday ..]" $+        , nameTest "[Wednesday, Tuesday ..]" $           assertEqual               ""               [ Wednesday@@ -78,17 +80,59 @@               , Wednesday               ] $           take 15 [Wednesday,Tuesday ..]-        , testCase "[Sunday, Friday ..]" $+        , nameTest "[Sunday, Friday ..]" $           assertEqual "" [Sunday, Friday, Wednesday, Monday, Saturday, Thursday, Tuesday, Sunday] $           take 8 [Sunday,Friday ..]-        , testCase "[Monday,Sunday .. Tuesday]" $+        , nameTest "[Monday,Sunday .. Tuesday]" $           assertEqual "" [Monday, Sunday, Saturday, Friday, Thursday, Wednesday, Tuesday] [Monday,Sunday .. Tuesday]-        , testCase "[Thursday, Saturday .. Tuesday]" $+        , nameTest "[Thursday, Saturday .. Tuesday]" $           assertEqual "" [Thursday, Saturday, Monday, Wednesday, Friday, Sunday, Tuesday] [Thursday,Saturday .. Tuesday]         ]  testReadShow :: TestTree testReadShow = testAllDays "read show" $ \wd -> assertEqual "" wd $ read $ show wd +prop_firstDayOfWeekOnAfter_onAfter :: DayOfWeek -> Day -> Bool+prop_firstDayOfWeekOnAfter_onAfter dw d = firstDayOfWeekOnAfter dw d >= d++prop_firstDayOfWeekOnAfter_Day :: DayOfWeek -> Day -> Bool+prop_firstDayOfWeekOnAfter_Day dw d = dayOfWeek (firstDayOfWeekOnAfter dw d) == dw++prop_toFromWeekCalendar :: FirstWeekType -> DayOfWeek -> Day -> Bool+prop_toFromWeekCalendar wt ws d = let+    (y,wy,dw) = toWeekCalendar wt ws d+    in fromWeekCalendar wt ws y wy dw == d++prop_weekChanges :: FirstWeekType -> DayOfWeek -> Day -> Bool+prop_weekChanges wt ws d = let+    (_,wy0,_) = toWeekCalendar wt ws d+    (_,wy1,dw) = toWeekCalendar wt ws $ succ d+    in if dw == ws then wy0 /= wy1 else wy0 == wy1++prop_weekYearWholeStart :: DayOfWeek -> Year -> Bool+prop_weekYearWholeStart ws y = let+    d = fromWeekCalendar FirstWholeWeek ws y 1 ws+    (y',dy) = toOrdinalDate d+    in y == y' && dy >= 1 && dy <= 7++prop_weekYearMostStart :: DayOfWeek -> Year -> Bool+prop_weekYearMostStart ws y = let+    d = fromWeekCalendar FirstMostWeek ws y 2 ws+    (y',dy) = toOrdinalDate d+    in y == y' && dy >= 5 && dy <= 11++testDiff :: TestTree+testDiff = nameTest "diff"+    [+        nameTest "Friday - Tuesday" $ assertEqual "" 3 $ dayOfWeekDiff Friday Tuesday,+        nameTest "Tuesday - Friday" $ assertEqual "" 4 $ dayOfWeekDiff Tuesday Friday,+        nameTest "firstDayOfWeekOnAfter_onAfter" prop_firstDayOfWeekOnAfter_onAfter,+        nameTest "firstDayOfWeekOnAfter_Day" prop_firstDayOfWeekOnAfter_Day,+        nameTest "toFromWeekCalendar" prop_toFromWeekCalendar,+        nameTest "weekChanges" prop_weekChanges,+        nameTest "weekYearWholeStart" prop_weekYearWholeStart,+        nameTest "weekYearMostStart" prop_weekYearMostStart+    ]+ testWeek :: TestTree-testWeek = testGroup "Week" [testDay, testSucc, testPred, testSequences, testReadShow]+testWeek = nameTest "Week" [testDay, testSucc, testPred, testSequences, testReadShow, testDiff]

@@ -1,26 +1,25 @@-module Test.Clock.Conversion(testClockConversion) where+module Test.Clock.Conversion+    ( testClockConversion+    ) where  import Data.Time.Clock.Compat import Data.Time.Clock.System.Compat- import Test.Tasty import Test.Tasty.HUnit --testClockConversion :: TestTree;-testClockConversion = testGroup "clock conversion" $ let-    testPair :: (SystemTime,UTCTime) -> TestTree-    testPair (st,ut) = testGroup (show ut) $-        [-            testCase "systemToUTCTime" $ assertEqual (show ut) ut $ systemToUTCTime st,-            testCase "utcToSystemTime" $ assertEqual (show ut) st $ utcToSystemTime ut-        ]-    in-    [-        testPair (MkSystemTime 0 0,UTCTime systemEpochDay 0),-        testPair (MkSystemTime 86399 0,UTCTime systemEpochDay 86399),-        testPair (MkSystemTime 86399 999999999,UTCTime systemEpochDay 86399.999999999),-        testPair (MkSystemTime 86399 1000000000,UTCTime systemEpochDay 86400),-        testPair (MkSystemTime 86399 1999999999,UTCTime systemEpochDay 86400.999999999),-        testPair (MkSystemTime 86400 0,UTCTime (succ systemEpochDay) 0)-    ]+testClockConversion :: TestTree+testClockConversion =+    testGroup "clock conversion" $ let+        testPair :: (SystemTime, UTCTime) -> TestTree+        testPair (st, ut) =+            testGroup (show ut) $+            [ testCase "systemToUTCTime" $ assertEqual (show ut) ut $ systemToUTCTime st+            , testCase "utcToSystemTime" $ assertEqual (show ut) st $ utcToSystemTime ut+            ]+        in [ testPair (MkSystemTime 0 0, UTCTime systemEpochDay 0)+           , testPair (MkSystemTime 86399 0, UTCTime systemEpochDay 86399)+           , testPair (MkSystemTime 86399 999999999, UTCTime systemEpochDay 86399.999999999)+           , testPair (MkSystemTime 86399 1000000000, UTCTime systemEpochDay 86400)+           , testPair (MkSystemTime 86399 1999999999, UTCTime systemEpochDay 86400.999999999)+           , testPair (MkSystemTime 86400 0, UTCTime (succ systemEpochDay) 0)+           ]

@@ -1,10 +1,12 @@-module Test.Clock.Resolution(testResolutions) where--import Data.Time.Clock.Compat-import Data.Time.Clock.TAI.Compat+{-# LANGUAGE CPP #-}+module Test.Clock.Resolution+    ( testResolutions+    ) where  import Control.Concurrent import Data.Fixed+import Data.Time.Clock.Compat+import Data.Time.Clock.TAI.Compat import Test.Tasty import Test.Tasty.HUnit @@ -13,7 +15,7 @@ repeatN n ma = do     a <- ma     aa <- repeatN (n - 1) ma-    return $ a:aa+    return $ a : aa  gcd' :: Real a => a -> a -> a gcd' a 0 = a@@ -22,32 +24,45 @@ gcdAll :: Real a => [a] -> a gcdAll = foldr gcd' 0 -testResolution :: (Show dt,Real dt) => String -> (at -> at -> dt) -> (dt,IO at) -> TestTree-testResolution name timeDiff (res,getTime) = testCase name $ do-    t0 <- getTime-    times0 <- repeatN 100 $ do-        threadDelay 0-        getTime-    times1 <- repeatN 100 $ do -- 100us-        threadDelay 1 -- 1us-        getTime-    times2 <- repeatN 100 $ do -- 1ms-        threadDelay 10 -- 10us-        getTime-    times3 <- repeatN 100 $ do -- 10ms-        threadDelay 100 -- 100us-        getTime-    times4 <- repeatN 100 $ do -- 100ms-        threadDelay 1000 -- 1ms-        getTime-    let times = fmap (\t -> timeDiff t t0) $ times0 ++ times1 ++ times2 ++ times3 ++ times4-    assertEqual "resolution" res $ gcdAll times+testResolution :: (Show dt, Real dt) => String -> (at -> at -> dt) -> (dt, IO at) -> TestTree+testResolution name timeDiff (res, getTime) =+    testCase name $ do+        t0 <- getTime+        times0 <-+            repeatN 100 $ do+                threadDelay 0+                getTime+        times1 <-+            repeatN 100 $ -- 100us+             do+                threadDelay 1 -- 1us+                getTime+        times2 <-+            repeatN 100 $ -- 1ms+             do+                threadDelay 10 -- 10us+                getTime+        times3 <-+            repeatN 100 $ -- 10ms+             do+                threadDelay 100 -- 100us+                getTime+        times4 <-+            repeatN 100 $ -- 100ms+             do+                threadDelay 1000 -- 1ms+                getTime+        let times = fmap (\t -> timeDiff t t0) $ times0 ++ times1 ++ times2 ++ times3 ++ times4+#if MIN_VERSION_time(1,8,0)+        assertEqual "resolution" res $ gcdAll times+#else+        assertBool ("resolution " ++ show (res, gcdAll times)) (res >= gcdAll times)+#endif  testResolutions :: TestTree-testResolutions = testGroup "resolution" $-    [-    testResolution "getCurrentTime" diffUTCTime (realToFrac getTime_resolution,getCurrentTime)-    ]-    ++ case taiClock of+testResolutions =+    testGroup "resolution" $+    [testResolution "getCurrentTime" diffUTCTime (realToFrac getTime_resolution, getCurrentTime)] +++    case taiClock of         Just clock -> [testResolution "taiClock" diffAbsoluteTime clock]         Nothing -> []

@@ -1,64 +1,58 @@-#-module Test.Clock.TAI(testTAI) where+module Test.Clock.TAI+    ( testTAI+    ) where  import Data.Time.Compat import Data.Time.Clock.TAI.Compat- import Test.Tasty import Test.Tasty.HUnit import Test.TestUtil - sampleLeapSecondMap :: LeapSecondMap-sampleLeapSecondMap d | d < fromGregorian 1972 1 1 = Nothing-sampleLeapSecondMap d | d < fromGregorian 1972 7 1 = Just 10-sampleLeapSecondMap d | d < fromGregorian 1975 1 1 = Just 11+sampleLeapSecondMap d+    | d < fromGregorian 1972 1 1 = Nothing+sampleLeapSecondMap d+    | d < fromGregorian 1972 7 1 = Just 10+sampleLeapSecondMap d+    | d < fromGregorian 1975 1 1 = Just 11 sampleLeapSecondMap _ = Nothing -testTAI :: TestTree;-testTAI = testGroup "leap second transition" $ let-    dayA = fromGregorian 1972 6 30-    dayB = fromGregorian 1972 7 1--    utcTime1 = UTCTime dayA 86399-    utcTime2 = UTCTime dayA 86400-    utcTime3 = UTCTime dayB 0--    mAbsTime1 = utcToTAITime sampleLeapSecondMap utcTime1-    mAbsTime2 = utcToTAITime sampleLeapSecondMap utcTime2-    mAbsTime3 = utcToTAITime sampleLeapSecondMap utcTime3-    in-    [-        testCase "mapping" $ do-            assertEqual "dayA" (Just 10) $ sampleLeapSecondMap dayA-            assertEqual "dayB" (Just 11) $ sampleLeapSecondMap dayB-        ,-        testCase "day length" $ do-            assertEqual "dayA" (Just 86401) $ utcDayLength sampleLeapSecondMap dayA-            assertEqual "dayB" (Just 86400) $ utcDayLength sampleLeapSecondMap dayB-        ,-        testCase "differences" $ do-            absTime1 <- assertJust mAbsTime1-            absTime2 <- assertJust mAbsTime2-            absTime3 <- assertJust mAbsTime3-            assertEqual "absTime2 - absTime1" 1 $ diffAbsoluteTime absTime2 absTime1-            assertEqual "absTime3 - absTime2" 1 $ diffAbsoluteTime absTime3 absTime2-        ,-        testGroup "round-trip"-        [-            testCase "1" $ do-                absTime <- assertJust mAbsTime1-                utcTime <- assertJust $ taiToUTCTime sampleLeapSecondMap absTime-                assertEqual "round-trip" utcTime1 utcTime-            ,-            testCase "2" $ do-                absTime <- assertJust mAbsTime2-                utcTime <- assertJust $ taiToUTCTime sampleLeapSecondMap absTime-                assertEqual "round-trip" utcTime2 utcTime-            ,-            testCase "3" $ do-                absTime <- assertJust mAbsTime3-                utcTime <- assertJust $ taiToUTCTime sampleLeapSecondMap absTime-                assertEqual "round-trip" utcTime3 utcTime-        ]-    ]+testTAI :: TestTree+testTAI =+    testGroup "leap second transition" $ let+        dayA = fromGregorian 1972 6 30+        dayB = fromGregorian 1972 7 1+        utcTime1 = UTCTime dayA 86399+        utcTime2 = UTCTime dayA 86400+        utcTime3 = UTCTime dayB 0+        mAbsTime1 = utcToTAITime sampleLeapSecondMap utcTime1+        mAbsTime2 = utcToTAITime sampleLeapSecondMap utcTime2+        mAbsTime3 = utcToTAITime sampleLeapSecondMap utcTime3+        in [ testCase "mapping" $ do+                 assertEqual "dayA" (Just 10) $ sampleLeapSecondMap dayA+                 assertEqual "dayB" (Just 11) $ sampleLeapSecondMap dayB+           , testCase "day length" $ do+                 assertEqual "dayA" (Just 86401) $ utcDayLength sampleLeapSecondMap dayA+                 assertEqual "dayB" (Just 86400) $ utcDayLength sampleLeapSecondMap dayB+           , testCase "differences" $ do+                 absTime1 <- assertJust mAbsTime1+                 absTime2 <- assertJust mAbsTime2+                 absTime3 <- assertJust mAbsTime3+                 assertEqual "absTime2 - absTime1" 1 $ diffAbsoluteTime absTime2 absTime1+                 assertEqual "absTime3 - absTime2" 1 $ diffAbsoluteTime absTime3 absTime2+           , testGroup+                 "round-trip"+                 [ testCase "1" $ do+                       absTime <- assertJust mAbsTime1+                       utcTime <- assertJust $ taiToUTCTime sampleLeapSecondMap absTime+                       assertEqual "round-trip" utcTime1 utcTime+                 , testCase "2" $ do+                       absTime <- assertJust mAbsTime2+                       utcTime <- assertJust $ taiToUTCTime sampleLeapSecondMap absTime+                       assertEqual "round-trip" utcTime2 utcTime+                 , testCase "3" $ do+                       absTime <- assertJust mAbsTime3+                       utcTime <- assertJust $ taiToUTCTime sampleLeapSecondMap absTime+                       assertEqual "round-trip" utcTime3 utcTime+                 ]+           ]

@@ -0,0 +1,18 @@+-- Tests succeed if module compiles+{-# LANGUAGE GeneralizedNewtypeDeriving #-}++module Test.Format.Compile+    (+    ) where++-- Doesn't work with old time+-- +-- import Data.Time.Compat+-- +-- newtype WrappedUTCTime =+--     MkWrappedUTCTime UTCTime+--     deriving (FormatTime, ParseTime)+-- +-- newtype Wrapped t =+--     MkWrapped t+--     deriving (FormatTime, ParseTime)

@@ -1,14 +1,13 @@-module Test.Format.Format(testFormat) where--import Data.Time.Compat+module Test.Format.Format+    ( testFormat+    ) where -import Control.Monad (when) import Data.Proxy+import Data.Time.Compat import Test.Tasty import Test.Tasty.HUnit import Test.TestUtil - -- as found in http://www.opengroup.org/onlinepubs/007908799/xsh/strftime.html -- plus FgGklz -- f not supported@@ -22,39 +21,35 @@ modifiers = "_-0^"  widths :: [String]-widths = ["","1","2","9","12"]+widths = ["", "1", "2", "9", "12"]  formats :: [String]-formats =  ["%G-W%V-%u","%U-%w","%W-%u"] ++ (fmap (\char -> '%':[char]) chars)- ++ (concat $ fmap (\char -> concat $ fmap (\width -> fmap (\modifier -> "%" ++ [modifier] ++ width ++ [char]) modifiers) widths) chars)+formats =+    ["%G-W%V-%u", "%U-%w", "%W-%u"] +++    (fmap (\char -> '%' : [char]) chars) +++    (concat $+     fmap+         (\char -> concat $ fmap (\width -> fmap (\modifier -> "%" ++ [modifier] ++ width ++ [char]) modifiers) widths)+         chars)  somestrings :: [String] somestrings = ["", " ", "-", "\n"] -brokenFormats :: [String]-brokenFormats =-    [ "%Z","%_Z","%-Z","%0Z"-    ,"%4Ez", "%4EZ"-    ,"%5Ez", "%5EZ"-    ,"%6Ez", "%6EZ"-    ,"%Ez", "%EZ"-    ]--compareExpected :: (Eq t,Show t,ParseTime t) => String -> String -> String -> proxy t -> TestTree-compareExpected testname fmt str proxy = testCase testname $-    when (fmt `notElem` brokenFormats) $ do+compareExpected :: (Eq t, Show t, ParseTime t) => String -> String -> String -> Proxy t -> TestTree+compareExpected testname fmt str proxy =+    testCase testname $ do         let-            found :: ParseTime t => proxy t -> Maybe t+            found :: ParseTime t => Proxy t -> Maybe t             found _ = parseTimeM False defaultTimeLocale fmt str         assertEqual "" Nothing $ found proxy  checkParse :: String -> String -> [TestTree]-checkParse fmt str = [-    compareExpected "Day" fmt str (Proxy :: Proxy Day),-    compareExpected "TimeOfDay" fmt str (Proxy :: Proxy TimeOfDay),-    compareExpected "LocalTime" fmt str (Proxy :: Proxy LocalTime),-    compareExpected "TimeZone" fmt str (Proxy :: Proxy TimeZone),-    compareExpected "UTCTime" fmt str (Proxy :: Proxy UTCTime)+checkParse fmt str =+    [ compareExpected "Day" fmt str (Proxy :: Proxy Day)+    , compareExpected "TimeOfDay" fmt str (Proxy :: Proxy TimeOfDay)+    , compareExpected "LocalTime" fmt str (Proxy :: Proxy LocalTime)+    , compareExpected "TimeZone" fmt str (Proxy :: Proxy TimeZone)+    , compareExpected "UTCTime" fmt str (Proxy :: Proxy UTCTime)     ]  testCheckParse :: TestTree@@ -64,109 +59,155 @@ days = [(fromGregorian 2018 1 5) .. (fromGregorian 2018 1 26)]  testDayOfWeek :: TestTree-testDayOfWeek  = testGroup "DayOfWeek" $ tgroup "uwaA" $ \fmt -> tgroup days $ \day -> let-    dayFormat = formatTime defaultTimeLocale ['%',fmt] day-    dowFormat = formatTime defaultTimeLocale ['%',fmt] $ dayOfWeek day-    in assertEqual "" dayFormat dowFormat+testDayOfWeek =+    testGroup "DayOfWeek" $+    tgroup "uwaA" $ \fmt ->+        tgroup days $ \day -> let+            dayFormat = formatTime defaultTimeLocale ['%', fmt] day+            dowFormat = formatTime defaultTimeLocale ['%', fmt] $ dayOfWeek day+            in assertEqual "" dayFormat dowFormat -{- testZone :: String -> String -> Int -> TestTree-testZone fmt expected minutes = testCase (show fmt) $ assertEqual "" expected $ formatTime defaultTimeLocale fmt $ TimeZone minutes False ""+testZone fmt expected minutes =+    testCase (show fmt) $ assertEqual "" expected $ formatTime defaultTimeLocale fmt $ TimeZone minutes False ""  testZonePair :: String -> String -> Int -> TestTree-testZonePair mods expected minutes = testGroup (show mods ++ " " ++ show minutes)-    [-        testZone ("%" ++ mods ++ "z") expected minutes,-        testZone ("%" ++ mods ++ "Z") expected minutes-    ]+testZonePair mods expected minutes =+    testGroup+        (show mods ++ " " ++ show minutes)+        [testZone ("%" ++ mods ++ "z") expected minutes, testZone ("%" ++ mods ++ "Z") expected minutes]  testTimeZone :: TestTree-testTimeZone = testGroup "TimeZone"-    [-    testZonePair "" "+0000" 0,-    testZonePair "E" "+00:00" 0,-    testZonePair "" "+0500" 300,-    testZonePair "E" "+05:00" 300,-    testZonePair "3" "+0500" 300,-    testZonePair "4E" "+05:00" 300,-    testZonePair "4" "+0500" 300,-    testZonePair "5E" "+05:00" 300,-    testZonePair "5" "+00500" 300,-    testZonePair "6E" "+005:00" 300,-    testZonePair "" "-0700" (-420),-    testZonePair "E" "-07:00" (-420),-    testZonePair "" "+1015" 615,-    testZonePair "E" "+10:15" 615,-    testZonePair "3" "+1015" 615,-    testZonePair "4E" "+10:15" 615,-    testZonePair "4" "+1015" 615,-    testZonePair "5E" "+10:15" 615,-    testZonePair "5" "+01015" 615,-    testZonePair "6E" "+010:15" 615,-    testZonePair "" "-1130" (-690),-    testZonePair "E" "-11:30" (-690)-    ]+testTimeZone =+    testGroup+        "TimeZone"+        [ testZonePair "" "+0000" 0+        , testZonePair "E" "+00:00" 0+        , testZonePair "" "+0500" 300+        , testZonePair "E" "+05:00" 300+        , testZonePair "3" "+0500" 300+        , testZonePair "4E" "+05:00" 300+        , testZonePair "4" "+0500" 300+        , testZonePair "5E" "+05:00" 300+        , testZonePair "5" "+00500" 300+        , testZonePair "6E" "+005:00" 300+        , testZonePair "" "-0700" (-420)+        , testZonePair "E" "-07:00" (-420)+        , testZonePair "" "+1015" 615+        , testZonePair "E" "+10:15" 615+        , testZonePair "3" "+1015" 615+        , testZonePair "4E" "+10:15" 615+        , testZonePair "4" "+1015" 615+        , testZonePair "5E" "+10:15" 615+        , testZonePair "5" "+01015" 615+        , testZonePair "6E" "+010:15" 615+        , testZonePair "" "-1130" (-690)+        , testZonePair "E" "-11:30" (-690)+        ]  testAFormat :: FormatTime t => String -> String -> t -> TestTree testAFormat fmt expected t = testCase fmt $ assertEqual "" expected $ formatTime defaultTimeLocale fmt t  testNominalDiffTime :: TestTree-testNominalDiffTime = testGroup "NominalDiffTime"-    [-        testAFormat "%ww%Dd%Hh%Mm%ESs" "3w2d2h22m8.21s" $ (fromRational $ 23 * 86400 + 8528.21 :: NominalDiffTime),-        testAFormat "%dd %hh %mm %ss %Ess" "0d 0h 0m 0s 0.74s" $ (fromRational $ 0.74 :: NominalDiffTime),-        testAFormat "%dd %hh %mm %ss %Ess" "0d 0h 0m 0s -0.74s" $ (fromRational $ negate $ 0.74 :: NominalDiffTime),-        testAFormat "%dd %hh %mm %ss %Ess %0Ess" "23d 554h 33262m 1995728s 1995728.21s 1995728.210000000000s" $ (fromRational $ 23 * 86400 + 8528.21 :: NominalDiffTime),-        testAFormat "%ww%Dd%Hh%Mm%Ss" "-3w-2d-2h-22m-8s" $ (fromRational $ negate $ 23 * 86400 + 8528.21 :: NominalDiffTime),-        testAFormat "%ww%Dd%Hh%Mm%ESs" "-3w-2d-2h-22m-8.21s" $ (fromRational $ negate $ 23 * 86400 + 8528.21 :: NominalDiffTime),-        testAFormat "%ww%Dd%Hh%Mm%Ss" "-3w-2d-2h-22m0s" $ (fromRational $ negate $ 23 * 86400 + 8520.21 :: NominalDiffTime),-        testAFormat "%ww%Dd%Hh%Mm%ESs" "-3w-2d-2h-22m-0.21s" $ (fromRational $ negate $ 23 * 86400 + 8520.21 :: NominalDiffTime),-        testAFormat "%dd %hh %mm %Ess" "-23d -554h -33262m -1995728.21s" $ (fromRational $ negate $ 23 * 86400 + 8528.21 :: NominalDiffTime)-    ]+testNominalDiffTime =+    testGroup+        "NominalDiffTime"+        []+{-+        [ testAFormat "%ww%Dd%Hh%Mm%ESs" "3w2d2h22m8.21s" $ (fromRational $ 23 * 86400 + 8528.21 :: NominalDiffTime)+        , testAFormat "%dd %hh %mm %ss %Ess" "0d 0h 0m 0s 0.74s" $ (fromRational $ 0.74 :: NominalDiffTime)+        , testAFormat "%dd %hh %mm %ss %Ess" "0d 0h 0m 0s -0.74s" $ (fromRational $ negate $ 0.74 :: NominalDiffTime)+        , testAFormat "%dd %hh %mm %ss %Ess %0Ess" "23d 554h 33262m 1995728s 1995728.21s 1995728.210000000000s" $+          (fromRational $ 23 * 86400 + 8528.21 :: NominalDiffTime)+        , testAFormat "%ww%Dd%Hh%Mm%Ss" "-3w-2d-2h-22m-8s" $+          (fromRational $ negate $ 23 * 86400 + 8528.21 :: NominalDiffTime)+        , testAFormat "%ww%Dd%Hh%Mm%ESs" "-3w-2d-2h-22m-8.21s" $+          (fromRational $ negate $ 23 * 86400 + 8528.21 :: NominalDiffTime)+        , testAFormat "%ww%Dd%Hh%Mm%Ss" "-3w-2d-2h-22m0s" $+          (fromRational $ negate $ 23 * 86400 + 8520.21 :: NominalDiffTime)+        , testAFormat "%ww%Dd%Hh%Mm%ESs" "-3w-2d-2h-22m-0.21s" $+          (fromRational $ negate $ 23 * 86400 + 8520.21 :: NominalDiffTime)+        , testAFormat "%dd %hh %mm %Ess" "-23d -554h -33262m -1995728.21s" $+          (fromRational $ negate $ 23 * 86400 + 8528.21 :: NominalDiffTime)+        , testAFormat "%3Es" "1.200" (1.2 :: NominalDiffTime)+        , testAFormat "%3ES" "01.200" (1.2 :: NominalDiffTime)+        , testAFormat "%3ES" "01.200" (61.2 :: NominalDiffTime)+        , testAFormat "%3Es" "1.245" (1.24582 :: NominalDiffTime)+        , testAFormat "%3ES" "01.245" (1.24582 :: NominalDiffTime)+        , testAFormat "%3ES" "01.245" (61.24582 :: NominalDiffTime)+        ]+-}  testDiffTime :: TestTree-testDiffTime = testGroup "DiffTime"-    [-        testAFormat "%ww%Dd%Hh%Mm%ESs" "3w2d2h22m8.21s" $ (fromRational $ 23 * 86400 + 8528.21 :: DiffTime),-        testAFormat "%dd %hh %mm %ss %Ess" "0d 0h 0m 0s 0.74s" $ (fromRational $ 0.74 :: DiffTime),-        testAFormat "%dd %hh %mm %ss %Ess" "0d 0h 0m 0s -0.74s" $ (fromRational $ negate $ 0.74 :: DiffTime),-        testAFormat "%dd %hh %mm %ss %Ess %0Ess" "23d 554h 33262m 1995728s 1995728.21s 1995728.210000000000s" $ (fromRational $ 23 * 86400 + 8528.21 :: DiffTime),-        testAFormat "%ww%Dd%Hh%Mm%Ss" "-3w-2d-2h-22m-8s" $ (fromRational $ negate $ 23 * 86400 + 8528.21 :: DiffTime),-        testAFormat "%ww%Dd%Hh%Mm%ESs" "-3w-2d-2h-22m-8.21s" $ (fromRational $ negate $ 23 * 86400 + 8528.21 :: DiffTime),-        testAFormat "%ww%Dd%Hh%Mm%Ss" "-3w-2d-2h-22m0s" $ (fromRational $ negate $ 23 * 86400 + 8520.21 :: DiffTime),-        testAFormat "%ww%Dd%Hh%Mm%ESs" "-3w-2d-2h-22m-0.21s" $ (fromRational $ negate $ 23 * 86400 + 8520.21 :: DiffTime),-        testAFormat "%dd %hh %mm %Ess" "-23d -554h -33262m -1995728.21s" $ (fromRational $ negate $ 23 * 86400 + 8528.21 :: DiffTime)-    ]+testDiffTime =+    testGroup+        "DiffTime"+        []+{-+        [ testAFormat "%ww%Dd%Hh%Mm%ESs" "3w2d2h22m8.21s" $ (fromRational $ 23 * 86400 + 8528.21 :: DiffTime)+        , testAFormat "%dd %hh %mm %ss %Ess" "0d 0h 0m 0s 0.74s" $ (fromRational $ 0.74 :: DiffTime)+        , testAFormat "%dd %hh %mm %ss %Ess" "0d 0h 0m 0s -0.74s" $ (fromRational $ negate $ 0.74 :: DiffTime)+        , testAFormat "%dd %hh %mm %ss %Ess %0Ess" "23d 554h 33262m 1995728s 1995728.21s 1995728.210000000000s" $+          (fromRational $ 23 * 86400 + 8528.21 :: DiffTime)+        , testAFormat "%ww%Dd%Hh%Mm%Ss" "-3w-2d-2h-22m-8s" $ (fromRational $ negate $ 23 * 86400 + 8528.21 :: DiffTime)+        , testAFormat "%ww%Dd%Hh%Mm%ESs" "-3w-2d-2h-22m-8.21s" $+          (fromRational $ negate $ 23 * 86400 + 8528.21 :: DiffTime)+        , testAFormat "%ww%Dd%Hh%Mm%Ss" "-3w-2d-2h-22m0s" $ (fromRational $ negate $ 23 * 86400 + 8520.21 :: DiffTime)+        , testAFormat "%ww%Dd%Hh%Mm%ESs" "-3w-2d-2h-22m-0.21s" $+          (fromRational $ negate $ 23 * 86400 + 8520.21 :: DiffTime)+        , testAFormat "%dd %hh %mm %Ess" "-23d -554h -33262m -1995728.21s" $+          (fromRational $ negate $ 23 * 86400 + 8528.21 :: DiffTime)+        , testAFormat "%3Es" "1.200" (1.2 :: DiffTime)+        , testAFormat "%3ES" "01.200" (1.2 :: DiffTime)+        , testAFormat "%3ES" "01.200" (61.2 :: DiffTime)+        , testAFormat "%3Es" "1.245" (1.24582 :: DiffTime)+        , testAFormat "%3ES" "01.245" (1.24582 :: DiffTime)+        , testAFormat "%3ES" "01.245" (61.24582 :: DiffTime)+        ]+-}  testCalenderDiffDays :: TestTree-testCalenderDiffDays = testGroup "CalenderDiffDays"-    [-        testAFormat "%yy%Bm%ww%Dd" "5y4m3w2d" $ CalendarDiffDays 64 23,-        testAFormat "%bm %dd" "64m 23d" $ CalendarDiffDays 64 23,-        testAFormat "%yy%Bm%ww%Dd" "-5y-4m-3w-2d" $ CalendarDiffDays (-64) (-23),-        testAFormat "%bm %dd" "-64m -23d" $ CalendarDiffDays (-64) (-23)-    ]+testCalenderDiffDays =+    testGroup+        "CalenderDiffDays"+        []+{-+        [ testAFormat "%yy%Bm%ww%Dd" "5y4m3w2d" $ CalendarDiffDays 64 23+        , testAFormat "%bm %dd" "64m 23d" $ CalendarDiffDays 64 23+        , testAFormat "%yy%Bm%ww%Dd" "-5y-4m-3w-2d" $ CalendarDiffDays (-64) (-23)+        , testAFormat "%bm %dd" "-64m -23d" $ CalendarDiffDays (-64) (-23)+        ]+-}  testCalenderDiffTime :: TestTree-testCalenderDiffTime = testGroup "CalenderDiffTime"-    [-        testAFormat "%yy%Bm%ww%Dd%Hh%Mm%Ss" "5y4m3w2d2h22m8s" $ CalendarDiffTime 64 $ 23 * 86400 + 8528.21,-        testAFormat "%yy%Bm%ww%Dd%Hh%Mm%ESs" "5y4m3w2d2h22m8.21s" $ CalendarDiffTime 64 $ 23 * 86400 + 8528.21,-        testAFormat "%yy%Bm%ww%Dd%Hh%Mm%0ESs" "5y4m3w2d2h22m08.210000000000s" $ CalendarDiffTime 64 $ 23 * 86400 + 8528.21,-        testAFormat "%bm %dd %hh %mm %Ess" "64m 23d 554h 33262m 1995728.21s" $ CalendarDiffTime 64 $ 23 * 86400 + 8528.21,-        testAFormat "%yy%Bm%ww%Dd%Hh%Mm%Ss" "-5y-4m-3w-2d-2h-22m-8s" $ CalendarDiffTime (-64) $ negate $ 23 * 86400 + 8528.21,-        testAFormat "%yy%Bm%ww%Dd%Hh%Mm%ESs" "-5y-4m-3w-2d-2h-22m-8.21s" $ CalendarDiffTime (-64) $ negate $ 23 * 86400 + 8528.21,-        testAFormat "%bm %dd %hh %mm %Ess" "-64m -23d -554h -33262m -1995728.21s" $ CalendarDiffTime (-64) $ negate $ 23 * 86400 + 8528.21-    ]+testCalenderDiffTime =+    testGroup+        "CalenderDiffTime"+        []+{-+        [ testAFormat "%yy%Bm%ww%Dd%Hh%Mm%Ss" "5y4m3w2d2h22m8s" $ CalendarDiffTime 64 $ 23 * 86400 + 8528.21+        , testAFormat "%yy%Bm%ww%Dd%Hh%Mm%ESs" "5y4m3w2d2h22m8.21s" $ CalendarDiffTime 64 $ 23 * 86400 + 8528.21+        , testAFormat "%yy%Bm%ww%Dd%Hh%Mm%0ESs" "5y4m3w2d2h22m08.210000000000s" $+          CalendarDiffTime 64 $ 23 * 86400 + 8528.21+        , testAFormat "%bm %dd %hh %mm %Ess" "64m 23d 554h 33262m 1995728.21s" $+          CalendarDiffTime 64 $ 23 * 86400 + 8528.21+        , testAFormat "%yy%Bm%ww%Dd%Hh%Mm%Ss" "-5y-4m-3w-2d-2h-22m-8s" $+          CalendarDiffTime (-64) $ negate $ 23 * 86400 + 8528.21+        , testAFormat "%yy%Bm%ww%Dd%Hh%Mm%ESs" "-5y-4m-3w-2d-2h-22m-8.21s" $+          CalendarDiffTime (-64) $ negate $ 23 * 86400 + 8528.21+        , testAFormat "%bm %dd %hh %mm %Ess" "-64m -23d -554h -33262m -1995728.21s" $+          CalendarDiffTime (-64) $ negate $ 23 * 86400 + 8528.21+        ] -}  testFormat :: TestTree-testFormat = testGroup "testFormat" $ [-    testCheckParse,-    testDayOfWeek---    testTimeZone,---    testNominalDiffTime,---    testDiffTime,---    testCalenderDiffDays,---    testCalenderDiffTime+testFormat =+    testGroup "testFormat" $+    [ -- testCheckParse+     testDayOfWeek+--    , testTimeZone+    , testNominalDiffTime+    , testDiffTime+    , testCalenderDiffDays+    , testCalenderDiffTime     ]

@@ -1,48 +1,49 @@ {-# OPTIONS -fno-warn-orphans #-}-module Test.Format.ISO8601(testISO8601) where -import Data.Time.Compat-import Data.Time.Format.ISO8601.Compat+module Test.Format.ISO8601+    ( testISO8601+    ) where  import Data.Ratio+import Data.Time.Compat+import Data.Time.Format.ISO8601.Compat+import Test.Arbitrary () import Test.QuickCheck.Property import Test.Tasty import Test.Tasty.HUnit import Test.Tasty.QuickCheck hiding (reason) import Test.TestUtil-import Test.Arbitrary() - deriving instance Eq ZonedTime -readShowProperty :: (Eq a,Show a) => Format a -> a -> Property-readShowProperty fmt val = case formatShowM fmt val of-    Nothing -> property Discard-    Just str -> let-        found = formatParseM fmt str-        expected = Just val-        in property $ if expected == found then succeeded else-            failed {reason = show str ++ ": expected " ++ (show expected) ++ ", found " ++ (show found)}+readShowProperty :: (Eq a, Show a) => Format a -> a -> Property+readShowProperty fmt val =+    case formatShowM fmt val of+        Nothing -> property Discard+        Just str -> let+            found = formatParseM fmt str+            expected = Just val+            in property $+               if expected == found+                   then succeeded+                   else failed {reason = show str ++ ": expected " ++ (show expected) ++ ", found " ++ (show found)}  readBoth :: NameTest t => (FormatExtension -> t) -> [TestTree]-readBoth fmts =-    [-        nameTest "extended" $ fmts ExtendedFormat,-        nameTest "basic" $ fmts BasicFormat-    ]+readBoth fmts = [nameTest "extended" $ fmts ExtendedFormat, nameTest "basic" $ fmts BasicFormat] -readShowProperties :: (Eq a,Show a,Arbitrary a) => (FormatExtension -> Format a) -> [TestTree]+readShowProperties :: (Eq a, Show a, Arbitrary a) => (FormatExtension -> Format a) -> [TestTree] readShowProperties fmts = readBoth $ \fe -> readShowProperty $ fmts fe -newtype Durational t = MkDurational t+newtype Durational t =+    MkDurational t  instance Show t => Show (Durational t) where     show (MkDurational t) = show t  instance Arbitrary (Durational CalendarDiffDays) where     arbitrary = do-        mm <- choose (-10000,10000)-        dd <- choose (-40,40)+        mm <- choose (-10000, 10000)+        dd <- choose (-40, 40)         return $ MkDurational $ CalendarDiffDays mm dd  instance Arbitrary (Durational CalendarDiffTime) where@@ -50,242 +51,196 @@         limit = 40 * 86400         picofactor = 10 ^ (12 :: Int)         in do-            mm <- choose (-10000,10000)-            ss <- choose (negate limit * picofactor, limit * picofactor)-            return $ MkDurational $ CalendarDiffTime mm $ fromRational $ ss % picofactor+               mm <- choose (-10000, 10000)+               ss <- choose (negate limit * picofactor, limit * picofactor)+               return $ MkDurational $ CalendarDiffTime mm $ fromRational $ ss % picofactor  testReadShowFormat :: TestTree-testReadShowFormat = nameTest "read-show format"-    [-        nameTest "calendarFormat" $ readShowProperties $ calendarFormat,-        nameTest "yearMonthFormat" $ readShowProperty $ yearMonthFormat,-        nameTest "yearFormat" $ readShowProperty $ yearFormat,-        nameTest "centuryFormat" $ readShowProperty $ centuryFormat,-        nameTest "expandedCalendarFormat" $ readShowProperties $ expandedCalendarFormat 6,-        nameTest "expandedYearMonthFormat" $ readShowProperty $ expandedYearMonthFormat 6,-        nameTest "expandedYearFormat" $ readShowProperty $ expandedYearFormat 6,-        nameTest "expandedCenturyFormat" $ readShowProperty $ expandedCenturyFormat 4,-        nameTest "ordinalDateFormat" $ readShowProperties $ ordinalDateFormat,-        nameTest "expandedOrdinalDateFormat" $ readShowProperties $ expandedOrdinalDateFormat 6,-        nameTest "weekDateFormat" $ readShowProperties $ weekDateFormat,-        nameTest "yearWeekFormat" $ readShowProperties $ yearWeekFormat,-        nameTest "expandedWeekDateFormat" $ readShowProperties $ expandedWeekDateFormat 6,-        nameTest "expandedYearWeekFormat" $ readShowProperties $ expandedYearWeekFormat 6,-        nameTest "timeOfDayFormat" $ readShowProperties $ timeOfDayFormat,-        nameTest "hourMinuteFormat" $ readShowProperties $ hourMinuteFormat,-        nameTest "hourFormat" $ readShowProperty $ hourFormat,-        nameTest "withTimeDesignator" $ readShowProperties $ \fe -> withTimeDesignator $ timeOfDayFormat fe,-        nameTest "withUTCDesignator" $ readShowProperties $ \fe -> withUTCDesignator $ timeOfDayFormat fe,-        nameTest "timeOffsetFormat" $ readShowProperties $ timeOffsetFormat,-        nameTest "timeOfDayAndOffsetFormat" $ readShowProperties $ timeOfDayAndOffsetFormat,-        nameTest "localTimeFormat" $ readShowProperties $ \fe -> localTimeFormat (calendarFormat fe) (timeOfDayFormat fe),-        nameTest "zonedTimeFormat" $ readShowProperties $ \fe -> zonedTimeFormat (calendarFormat fe) (timeOfDayFormat fe) fe,-        nameTest "utcTimeFormat" $ readShowProperties $ \fe -> utcTimeFormat (calendarFormat fe) (timeOfDayFormat fe),-        nameTest "dayAndTimeFormat" $ readShowProperties $ \fe -> dayAndTimeFormat (calendarFormat fe) (timeOfDayFormat fe),-        nameTest "timeAndOffsetFormat" $ readShowProperties $ \fe -> timeAndOffsetFormat (timeOfDayFormat fe) fe,-        nameTest "durationDaysFormat" $ readShowProperty $ durationDaysFormat,-        nameTest "durationTimeFormat" $ readShowProperty $ durationTimeFormat,-        nameTest "alternativeDurationDaysFormat" $ readBoth $ \fe (MkDurational t) -> readShowProperty (alternativeDurationDaysFormat fe) t,-        nameTest "alternativeDurationTimeFormat" $ readBoth $ \fe (MkDurational t) -> readShowProperty (alternativeDurationTimeFormat fe) t,-        nameTest "intervalFormat" $ readShowProperties $ \fe -> intervalFormat (localTimeFormat (calendarFormat fe) (timeOfDayFormat fe)) durationTimeFormat,-        nameTest "recurringIntervalFormat" $ readShowProperties $ \fe -> recurringIntervalFormat (localTimeFormat (calendarFormat fe) (timeOfDayFormat fe)) durationTimeFormat-    ]+testReadShowFormat =+    nameTest+        "read-show format"+        [ nameTest "calendarFormat" $ readShowProperties $ calendarFormat+        , nameTest "yearMonthFormat" $ readShowProperty $ yearMonthFormat+        , nameTest "yearFormat" $ readShowProperty $ yearFormat+        , nameTest "centuryFormat" $ readShowProperty $ centuryFormat+        , nameTest "expandedCalendarFormat" $ readShowProperties $ expandedCalendarFormat 6+        , nameTest "expandedYearMonthFormat" $ readShowProperty $ expandedYearMonthFormat 6+        , nameTest "expandedYearFormat" $ readShowProperty $ expandedYearFormat 6+        , nameTest "expandedCenturyFormat" $ readShowProperty $ expandedCenturyFormat 4+        , nameTest "ordinalDateFormat" $ readShowProperties $ ordinalDateFormat+        , nameTest "expandedOrdinalDateFormat" $ readShowProperties $ expandedOrdinalDateFormat 6+        , nameTest "weekDateFormat" $ readShowProperties $ weekDateFormat+        , nameTest "yearWeekFormat" $ readShowProperties $ yearWeekFormat+        , nameTest "expandedWeekDateFormat" $ readShowProperties $ expandedWeekDateFormat 6+        , nameTest "expandedYearWeekFormat" $ readShowProperties $ expandedYearWeekFormat 6+        , nameTest "timeOfDayFormat" $ readShowProperties $ timeOfDayFormat+        , nameTest "hourMinuteFormat" $ readShowProperties $ hourMinuteFormat+        , nameTest "hourFormat" $ readShowProperty $ hourFormat+        , nameTest "withTimeDesignator" $ readShowProperties $ \fe -> withTimeDesignator $ timeOfDayFormat fe+        , nameTest "withUTCDesignator" $ readShowProperties $ \fe -> withUTCDesignator $ timeOfDayFormat fe+        , nameTest "timeOffsetFormat" $ readShowProperties $ timeOffsetFormat+        , nameTest "timeOfDayAndOffsetFormat" $ readShowProperties $ timeOfDayAndOffsetFormat+        , nameTest "localTimeFormat" $+          readShowProperties $ \fe -> localTimeFormat (calendarFormat fe) (timeOfDayFormat fe)+        , nameTest "zonedTimeFormat" $+          readShowProperties $ \fe -> zonedTimeFormat (calendarFormat fe) (timeOfDayFormat fe) fe+        , nameTest "utcTimeFormat" $ readShowProperties $ \fe -> utcTimeFormat (calendarFormat fe) (timeOfDayFormat fe)+        , nameTest "dayAndTimeFormat" $+          readShowProperties $ \fe -> dayAndTimeFormat (calendarFormat fe) (timeOfDayFormat fe)+        , nameTest "timeAndOffsetFormat" $ readShowProperties $ \fe -> timeAndOffsetFormat (timeOfDayFormat fe) fe+        , nameTest "durationDaysFormat" $ readShowProperty $ durationDaysFormat+        , nameTest "durationTimeFormat" $ readShowProperty $ durationTimeFormat+        , nameTest "alternativeDurationDaysFormat" $+          readBoth $ \fe (MkDurational t) -> readShowProperty (alternativeDurationDaysFormat fe) t+        , nameTest "alternativeDurationTimeFormat" $+          readBoth $ \fe (MkDurational t) -> readShowProperty (alternativeDurationTimeFormat fe) t+        , nameTest "intervalFormat" $+          readShowProperties $ \fe ->+              intervalFormat (localTimeFormat (calendarFormat fe) (timeOfDayFormat fe)) durationTimeFormat+        , nameTest "recurringIntervalFormat" $+          readShowProperties $ \fe ->+              recurringIntervalFormat (localTimeFormat (calendarFormat fe) (timeOfDayFormat fe)) durationTimeFormat+        ]  testShowFormat :: String -> Format t -> String -> t -> TestTree-testShowFormat name fmt str t = nameTest (name ++ ": " ++ str) $-    assertEqual "" (Just str) $ formatShowM fmt t+testShowFormat name fmt str t = nameTest (name ++ ": " ++ str) $ assertEqual "" (Just str) $ formatShowM fmt t  testShowFormats :: TestTree-testShowFormats = nameTest "show format"-    [-        testShowFormat "durationDaysFormat" durationDaysFormat "P0D" $ CalendarDiffDays 0 0,-        testShowFormat "durationDaysFormat" durationDaysFormat "P4Y" $ CalendarDiffDays 48 0,-        testShowFormat "durationDaysFormat" durationDaysFormat "P7M" $ CalendarDiffDays 7 0,-        testShowFormat "durationDaysFormat" durationDaysFormat "P5D" $ CalendarDiffDays 0 5,-        testShowFormat "durationDaysFormat" durationDaysFormat "P2Y3M81D" $ CalendarDiffDays 27 81,-        testShowFormat "durationTimeFormat" durationTimeFormat "P0D" $ CalendarDiffTime 0 0,-        testShowFormat "durationTimeFormat" durationTimeFormat "P4Y" $ CalendarDiffTime 48 0,-        testShowFormat "durationTimeFormat" durationTimeFormat "P7M" $ CalendarDiffTime 7 0,-        testShowFormat "durationTimeFormat" durationTimeFormat "P5D" $ CalendarDiffTime 0 $ 5 * nominalDay,-        testShowFormat "durationTimeFormat" durationTimeFormat "P2Y3M81D" $ CalendarDiffTime 27 $ 81 * nominalDay,-        testShowFormat "durationTimeFormat" durationTimeFormat "PT2H" $ CalendarDiffTime 0 $ 7200,-        testShowFormat "durationTimeFormat" durationTimeFormat "PT3M" $ CalendarDiffTime 0 $ 180,-        testShowFormat "durationTimeFormat" durationTimeFormat "PT12S" $ CalendarDiffTime 0 $ 12,-        testShowFormat "durationTimeFormat" durationTimeFormat "PT1M18.77634S" $ CalendarDiffTime 0 $ 78.77634,-        testShowFormat "durationTimeFormat" durationTimeFormat "PT2H1M18.77634S" $ CalendarDiffTime 0 $ 7278.77634,-        testShowFormat "durationTimeFormat" durationTimeFormat "P5DT2H1M18.77634S" $ CalendarDiffTime 0 $ 5 * nominalDay + 7278.77634,-        testShowFormat "durationTimeFormat" durationTimeFormat "P7Y10M5DT2H1M18.77634S" $ CalendarDiffTime 94 $ 5 * nominalDay + 7278.77634,-        testShowFormat "durationTimeFormat" durationTimeFormat "P7Y10MT2H1M18.77634S" $ CalendarDiffTime 94 $ 7278.77634,-        testShowFormat "durationTimeFormat" durationTimeFormat "P8YT2H1M18.77634S" $ CalendarDiffTime 96 $ 7278.77634,-        testShowFormat "alternativeDurationDaysFormat" (alternativeDurationDaysFormat ExtendedFormat) "P0001-00-00" $ CalendarDiffDays 12 0,-        testShowFormat "alternativeDurationDaysFormat" (alternativeDurationDaysFormat ExtendedFormat) "P0002-03-29" $ CalendarDiffDays 27 29,-        testShowFormat "alternativeDurationDaysFormat" (alternativeDurationDaysFormat ExtendedFormat) "P0561-08-29" $ CalendarDiffDays (561 * 12 + 8) 29,-        testShowFormat "alternativeDurationTimeFormat" (alternativeDurationTimeFormat ExtendedFormat) "P0000-00-01T00:00:00" $ CalendarDiffTime 0 86400,-        testShowFormat "alternativeDurationTimeFormat" (alternativeDurationTimeFormat ExtendedFormat) "P0007-10-05T02:01:18.77634" $ CalendarDiffTime 94 $ 5 * nominalDay + 7278.77634,-        testShowFormat "alternativeDurationTimeFormat" (alternativeDurationTimeFormat ExtendedFormat) "P4271-10-05T02:01:18.77634" $ CalendarDiffTime (12 * 4271 + 10) $ 5 * nominalDay + 7278.77634,-        testShowFormat "centuryFormat" centuryFormat "02" 2,-        testShowFormat "centuryFormat" centuryFormat "21" 21,-        testShowFormat "intervalFormat etc."-            (intervalFormat (localTimeFormat (calendarFormat ExtendedFormat) (timeOfDayFormat ExtendedFormat)) durationTimeFormat)-            "2015-06-13T21:13:56/P1Y2M7DT5H33M2.34S"-            (LocalTime (fromGregorian 2015 6 13) (TimeOfDay 21 13 56),CalendarDiffTime 14 $ 7 * nominalDay + 5 * 3600 + 33 * 60 + 2.34),-        testShowFormat "recurringIntervalFormat etc."-            (recurringIntervalFormat (localTimeFormat (calendarFormat ExtendedFormat) (timeOfDayFormat ExtendedFormat)) durationTimeFormat)-            "R74/2015-06-13T21:13:56/P1Y2M7DT5H33M2.34S"-            (74,LocalTime (fromGregorian 2015 6 13) (TimeOfDay 21 13 56),CalendarDiffTime 14 $ 7 * nominalDay + 5 * 3600 + 33 * 60 + 2.34),-        testShowFormat "recurringIntervalFormat etc."-            (recurringIntervalFormat (calendarFormat ExtendedFormat) durationDaysFormat)-            "R74/2015-06-13/P1Y2M7D"-            (74,fromGregorian 2015 6 13,CalendarDiffDays 14 7),-        testShowFormat "timeOffsetFormat"-            iso8601Format-            "-06:30"-            (minutesToTimeZone (-390)),-        testShowFormat "timeOffsetFormat"-            iso8601Format-            "+00:00"-            (minutesToTimeZone 0),-        testShowFormat "timeOffsetFormat"-            (timeOffsetFormat BasicFormat)-            "+0000"-            (minutesToTimeZone 0),-        testShowFormat "timeOffsetFormat"-            iso8601Format-            "+00:10"-            (minutesToTimeZone 10),-        testShowFormat "timeOffsetFormat"-            iso8601Format-            "-00:10"-            (minutesToTimeZone (-10)),-        testShowFormat "timeOffsetFormat"-            iso8601Format-            "+01:35"-            (minutesToTimeZone 95),-        testShowFormat "timeOffsetFormat"-            iso8601Format-            "-01:35"-            (minutesToTimeZone (-95)),-        testShowFormat "timeOffsetFormat"-            (timeOffsetFormat BasicFormat)-            "+0135"-            (minutesToTimeZone 95),-        testShowFormat "timeOffsetFormat"-            (timeOffsetFormat BasicFormat)-            "-0135"-            (minutesToTimeZone (-95)),-        testShowFormat "timeOffsetFormat"-            (timeOffsetFormat BasicFormat)-            "-1100"-            (minutesToTimeZone $ negate $ 11 * 60),-        testShowFormat "timeOffsetFormat"-            (timeOffsetFormat BasicFormat)-            "+1015"-            (minutesToTimeZone $ 615),-        testShowFormat "zonedTimeFormat"-            iso8601Format-            "2024-07-06T08:45:56.553-06:30"-            (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone (-390))),-        testShowFormat "zonedTimeFormat"-            iso8601Format-            "2024-07-06T08:45:56.553+06:30"-            (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone 390)),-        testShowFormat "utcTimeFormat"-            iso8601Format-            "2024-07-06T08:45:56.553Z"-            (UTCTime (fromGregorian 2024 07 06) (timeOfDayToTime $ TimeOfDay 8 45 56.553)),-        testShowFormat "utcTimeFormat"-            iso8601Format-            "2028-12-31T23:59:60.9Z"-            (UTCTime (fromGregorian 2028 12 31) (timeOfDayToTime $ TimeOfDay 23 59 60.9)),-        testShowFormat "weekDateFormat"-            (weekDateFormat ExtendedFormat)-            "1994-W52-7"-            (fromGregorian 1995 1 1),-        testShowFormat "weekDateFormat"-            (weekDateFormat ExtendedFormat)-            "1995-W01-1"-            (fromGregorian 1995 1 2),-        testShowFormat "weekDateFormat"-            (weekDateFormat ExtendedFormat)-            "1996-W52-7"-            (fromGregorian 1996 12 29),-        testShowFormat "weekDateFormat"-            (weekDateFormat ExtendedFormat)-            "1997-W01-2"-            (fromGregorian 1996 12 31),-        testShowFormat "weekDateFormat"-            (weekDateFormat ExtendedFormat)-            "1997-W01-3"-            (fromGregorian 1997 1 1),-        testShowFormat "weekDateFormat"-            (weekDateFormat ExtendedFormat)-            "1974-W32-6"-            (fromGregorian 1974 8 10),-        testShowFormat "weekDateFormat"-            (weekDateFormat BasicFormat)-            "1974W326"-            (fromGregorian 1974 8 10),-        testShowFormat "weekDateFormat"-            (weekDateFormat ExtendedFormat)-            "1995-W05-6"-            (fromGregorian 1995 2 4),-        testShowFormat "weekDateFormat"-            (weekDateFormat BasicFormat)-            "1995W056"-            (fromGregorian 1995 2 4),-        testShowFormat "weekDateFormat"-            (expandedWeekDateFormat 6 ExtendedFormat)-            "+001995-W05-6"-            (fromGregorian 1995 2 4),-        testShowFormat "weekDateFormat"-            (expandedWeekDateFormat 6 BasicFormat)-            "+001995W056"-            (fromGregorian 1995 2 4),-        testShowFormat "ordinalDateFormat"-            (ordinalDateFormat ExtendedFormat)-            "1846-235"-            (fromGregorian 1846 8 23),-        testShowFormat "ordinalDateFormat"-            (ordinalDateFormat BasicFormat)-            "1844236"-            (fromGregorian 1844 8 23),-        testShowFormat "ordinalDateFormat"-            (expandedOrdinalDateFormat 5 ExtendedFormat)-            "+01846-235"-            (fromGregorian 1846 8 23),-        testShowFormat "hourMinuteFormat"-            (hourMinuteFormat ExtendedFormat)-            "13:17.25"-            (TimeOfDay 13 17 15),-        testShowFormat "hourMinuteFormat"-            (hourMinuteFormat ExtendedFormat)-            "01:12.4"-            (TimeOfDay 1 12 24),-        testShowFormat "hourMinuteFormat"-            (hourMinuteFormat BasicFormat)-            "1317.25"-            (TimeOfDay 13 17 15),-        testShowFormat "hourMinuteFormat"-            (hourMinuteFormat BasicFormat)-            "0112.4"-            (TimeOfDay 1 12 24),-        testShowFormat "hourFormat"-            hourFormat-            "22"-            (TimeOfDay 22 0 0),-        testShowFormat "hourFormat"-            hourFormat-            "06"-            (TimeOfDay 6 0 0),-        testShowFormat "hourFormat"-            hourFormat-            "18.9475"-            (TimeOfDay 18 56 51)-    ]+testShowFormats =+    nameTest+        "show format"+        [ testShowFormat "durationDaysFormat" durationDaysFormat "P0D" $ CalendarDiffDays 0 0+        , testShowFormat "durationDaysFormat" durationDaysFormat "P4Y" $ CalendarDiffDays 48 0+        , testShowFormat "durationDaysFormat" durationDaysFormat "P7M" $ CalendarDiffDays 7 0+        , testShowFormat "durationDaysFormat" durationDaysFormat "P5D" $ CalendarDiffDays 0 5+        , testShowFormat "durationDaysFormat" durationDaysFormat "P2Y3M81D" $ CalendarDiffDays 27 81+        , testShowFormat "durationTimeFormat" durationTimeFormat "P0D" $ CalendarDiffTime 0 0+        , testShowFormat "durationTimeFormat" durationTimeFormat "P4Y" $ CalendarDiffTime 48 0+        , testShowFormat "durationTimeFormat" durationTimeFormat "P7M" $ CalendarDiffTime 7 0+        , testShowFormat "durationTimeFormat" durationTimeFormat "P5D" $ CalendarDiffTime 0 $ 5 * nominalDay+        , testShowFormat "durationTimeFormat" durationTimeFormat "P2Y3M81D" $ CalendarDiffTime 27 $ 81 * nominalDay+        , testShowFormat "durationTimeFormat" durationTimeFormat "PT2H" $ CalendarDiffTime 0 $ 7200+        , testShowFormat "durationTimeFormat" durationTimeFormat "PT3M" $ CalendarDiffTime 0 $ 180+        , testShowFormat "durationTimeFormat" durationTimeFormat "PT12S" $ CalendarDiffTime 0 $ 12+        , testShowFormat "durationTimeFormat" durationTimeFormat "PT1M18.77634S" $ CalendarDiffTime 0 $ 78.77634+        , testShowFormat "durationTimeFormat" durationTimeFormat "PT2H1M18.77634S" $ CalendarDiffTime 0 $ 7278.77634+        , testShowFormat "durationTimeFormat" durationTimeFormat "P5DT2H1M18.77634S" $+          CalendarDiffTime 0 $ 5 * nominalDay + 7278.77634+        , testShowFormat "durationTimeFormat" durationTimeFormat "P7Y10M5DT2H1M18.77634S" $+          CalendarDiffTime 94 $ 5 * nominalDay + 7278.77634+        , testShowFormat "durationTimeFormat" durationTimeFormat "P7Y10MT2H1M18.77634S" $+          CalendarDiffTime 94 $ 7278.77634+        , testShowFormat "durationTimeFormat" durationTimeFormat "P8YT2H1M18.77634S" $ CalendarDiffTime 96 $ 7278.77634+        , testShowFormat "alternativeDurationDaysFormat" (alternativeDurationDaysFormat ExtendedFormat) "P0001-00-00" $+          CalendarDiffDays 12 0+        , testShowFormat "alternativeDurationDaysFormat" (alternativeDurationDaysFormat ExtendedFormat) "P0002-03-29" $+          CalendarDiffDays 27 29+        , testShowFormat "alternativeDurationDaysFormat" (alternativeDurationDaysFormat ExtendedFormat) "P0561-08-29" $+          CalendarDiffDays (561 * 12 + 8) 29+        , testShowFormat+              "alternativeDurationTimeFormat"+              (alternativeDurationTimeFormat ExtendedFormat)+              "P0000-00-01T00:00:00" $+          CalendarDiffTime 0 86400+        , testShowFormat+              "alternativeDurationTimeFormat"+              (alternativeDurationTimeFormat ExtendedFormat)+              "P0007-10-05T02:01:18.77634" $+          CalendarDiffTime 94 $ 5 * nominalDay + 7278.77634+        , testShowFormat+              "alternativeDurationTimeFormat"+              (alternativeDurationTimeFormat ExtendedFormat)+              "P4271-10-05T02:01:18.77634" $+          CalendarDiffTime (12 * 4271 + 10) $ 5 * nominalDay + 7278.77634+        , testShowFormat "centuryFormat" centuryFormat "02" 2+        , testShowFormat "centuryFormat" centuryFormat "21" 21+        , testShowFormat+              "intervalFormat etc."+              (intervalFormat+                   (localTimeFormat (calendarFormat ExtendedFormat) (timeOfDayFormat ExtendedFormat))+                   durationTimeFormat)+              "2015-06-13T21:13:56/P1Y2M7DT5H33M2.34S"+              ( LocalTime (fromGregorian 2015 6 13) (TimeOfDay 21 13 56)+              , CalendarDiffTime 14 $ 7 * nominalDay + 5 * 3600 + 33 * 60 + 2.34)+        , testShowFormat+              "recurringIntervalFormat etc."+              (recurringIntervalFormat+                   (localTimeFormat (calendarFormat ExtendedFormat) (timeOfDayFormat ExtendedFormat))+                   durationTimeFormat)+              "R74/2015-06-13T21:13:56/P1Y2M7DT5H33M2.34S"+              ( 74+              , LocalTime (fromGregorian 2015 6 13) (TimeOfDay 21 13 56)+              , CalendarDiffTime 14 $ 7 * nominalDay + 5 * 3600 + 33 * 60 + 2.34)+        , testShowFormat+              "recurringIntervalFormat etc."+              (recurringIntervalFormat (calendarFormat ExtendedFormat) durationDaysFormat)+              "R74/2015-06-13/P1Y2M7D"+              (74, fromGregorian 2015 6 13, CalendarDiffDays 14 7)+        , testShowFormat "timeOffsetFormat" iso8601Format "-06:30" (minutesToTimeZone (-390))+        , testShowFormat "timeOffsetFormat" iso8601Format "+00:00" (minutesToTimeZone 0)+        , testShowFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "+0000" (minutesToTimeZone 0)+        , testShowFormat "timeOffsetFormat" iso8601Format "+00:10" (minutesToTimeZone 10)+        , testShowFormat "timeOffsetFormat" iso8601Format "-00:10" (minutesToTimeZone (-10))+        , testShowFormat "timeOffsetFormat" iso8601Format "+01:35" (minutesToTimeZone 95)+        , testShowFormat "timeOffsetFormat" iso8601Format "-01:35" (minutesToTimeZone (-95))+        , testShowFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "+0135" (minutesToTimeZone 95)+        , testShowFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "-0135" (minutesToTimeZone (-95))+        , testShowFormat+              "timeOffsetFormat"+              (timeOffsetFormat BasicFormat)+              "-1100"+              (minutesToTimeZone $ negate $ 11 * 60)+        , testShowFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "+1015" (minutesToTimeZone $ 615)+        , testShowFormat+              "zonedTimeFormat"+              iso8601Format+              "2024-07-06T08:45:56.553-06:30"+              (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone (-390)))+        , testShowFormat+              "zonedTimeFormat"+              iso8601Format+              "2024-07-06T08:45:56.553+06:30"+              (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone 390))+        , testShowFormat+              "utcTimeFormat"+              iso8601Format+              "2024-07-06T08:45:56.553Z"+              (UTCTime (fromGregorian 2024 07 06) (timeOfDayToTime $ TimeOfDay 8 45 56.553))+        , testShowFormat+              "utcTimeFormat"+              iso8601Format+              "2028-12-31T23:59:60.9Z"+              (UTCTime (fromGregorian 2028 12 31) (timeOfDayToTime $ TimeOfDay 23 59 60.9))+        , testShowFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1994-W52-7" (fromGregorian 1995 1 1)+        , testShowFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1995-W01-1" (fromGregorian 1995 1 2)+        , testShowFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1996-W52-7" (fromGregorian 1996 12 29)+        , testShowFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1997-W01-2" (fromGregorian 1996 12 31)+        , testShowFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1997-W01-3" (fromGregorian 1997 1 1)+        , testShowFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1974-W32-6" (fromGregorian 1974 8 10)+        , testShowFormat "weekDateFormat" (weekDateFormat BasicFormat) "1974W326" (fromGregorian 1974 8 10)+        , testShowFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1995-W05-6" (fromGregorian 1995 2 4)+        , testShowFormat "weekDateFormat" (weekDateFormat BasicFormat) "1995W056" (fromGregorian 1995 2 4)+        , testShowFormat+              "weekDateFormat"+              (expandedWeekDateFormat 6 ExtendedFormat)+              "+001995-W05-6"+              (fromGregorian 1995 2 4)+        , testShowFormat "weekDateFormat" (expandedWeekDateFormat 6 BasicFormat) "+001995W056" (fromGregorian 1995 2 4)+        , testShowFormat "ordinalDateFormat" (ordinalDateFormat ExtendedFormat) "1846-235" (fromGregorian 1846 8 23)+        , testShowFormat "ordinalDateFormat" (ordinalDateFormat BasicFormat) "1844236" (fromGregorian 1844 8 23)+        , testShowFormat+              "ordinalDateFormat"+              (expandedOrdinalDateFormat 5 ExtendedFormat)+              "+01846-235"+              (fromGregorian 1846 8 23)+        , testShowFormat "hourMinuteFormat" (hourMinuteFormat ExtendedFormat) "13:17.25" (TimeOfDay 13 17 15)+        , testShowFormat "hourMinuteFormat" (hourMinuteFormat ExtendedFormat) "01:12.4" (TimeOfDay 1 12 24)+        , testShowFormat "hourMinuteFormat" (hourMinuteFormat BasicFormat) "1317.25" (TimeOfDay 13 17 15)+        , testShowFormat "hourMinuteFormat" (hourMinuteFormat BasicFormat) "0112.4" (TimeOfDay 1 12 24)+        , testShowFormat "hourFormat" hourFormat "22" (TimeOfDay 22 0 0)+        , testShowFormat "hourFormat" hourFormat "06" (TimeOfDay 6 0 0)+        , testShowFormat "hourFormat" hourFormat "18.9475" (TimeOfDay 18 56 51)+        ]  testISO8601 :: TestTree-testISO8601 = nameTest "ISO8601"-    [-        testShowFormats,-        testReadShowFormat-    ]+testISO8601 = nameTest "ISO8601" [testShowFormats, testReadShowFormat]

@@ -1,34 +1,127 @@ {-# OPTIONS -fno-warn-orphans #-}-module Test.Format.ParseTime(testParseTime,test_parse_format) where -import Data.Time.Compat-import Data.Time.Calendar.OrdinalDate.Compat-import Data.Time.Calendar.WeekDate.Compat+module Test.Format.ParseTime+    ( testParseTime+    , test_parse_format+    ) where +#if MIN_VERSION_base(4,11,0)+#else+import Data.Semigroup hiding (option)+#endif import Control.Monad import Data.Char-import Text.Read.Compat+import Data.Maybe+import Data.Proxy+import Data.Time.Compat+import Data.Time.Calendar.OrdinalDate.Compat+import Data.Time.Calendar.WeekDate.Compat+import Data.Time.Calendar.Month.Compat+import Data.Time.Calendar.Quarter.Compat+import Test.Arbitrary () import Test.QuickCheck.Property import Test.Tasty import Test.Tasty.HUnit import Test.Tasty.QuickCheck hiding (reason) import Test.TestUtil-import Test.Arbitrary()+import Text.Read.Compat +format :: FormatTime t => String -> t -> String+format f t = formatTime defaultTimeLocale f t +parse :: ParseTime t => Bool -> String -> String -> Maybe t+parse sp f t = parseTimeM sp defaultTimeLocale f t++data FormatOnly++data ParseAndFormat++data FormatCode pf t = MkFormatCode+    { fcModifier :: String+    , fcWidth :: Maybe Int+    , fcAlt :: Bool+    , fcSpecifier :: Char+    }++instance Show (FormatCode pf t) where+    show (MkFormatCode m w a s) = let+        ms = m+        ws = fromMaybe "" $ fmap show w+        as =+            if a+                then "E"+                else ""+        ss = [s]+        in '%' : (ms <> ws <> as <> ss)++formatCode :: FormatTime t => FormatCode pf t -> t -> String+formatCode fc = format $ show fc++parseCode :: ParseTime t => FormatCode ParseAndFormat t -> String -> Maybe t+parseCode fc = parse False $ show fc++class HasFormatCodes t where+    allFormatCodes :: Proxy t -> [(Bool, Char)]+    incompleteS :: Maybe t+    incompleteS = Nothing++minCodeWidth :: Char -> Int+minCodeWidth _ = 0++fcShrink :: FormatCode pf t -> [FormatCode pf t]+fcShrink fc = let+    fc1 =+        case fcWidth fc of+            Nothing -> []+            Just w+                | w > (minCodeWidth $ fcSpecifier fc) -> [fc {fcWidth = Nothing}, fc {fcWidth = Just $ w - 1}]+            Just _ -> [fc {fcWidth = Nothing}]+    fc2 =+        case fcAlt fc of+            False -> []+            True -> [fc {fcAlt = False}]+    fc3 =+        case fcModifier fc of+            "" -> []+            _ -> [fc {fcModifier = ""}]+    in fc1 ++ fc2 ++ fc3++instance HasFormatCodes t => Arbitrary (FormatCode FormatOnly t) where+    arbitrary = do+        m <- oneof [return "", oneof $ fmap return ["", "-", "_", "0", "^", "#"]]+        (a, s) <- oneof $ fmap return $ allFormatCodes (Proxy :: Proxy t)+        w <-+            case minCodeWidth s of+                0 -> return Nothing+                mw -> oneof [return Nothing, fmap Just $ choose (mw, 15)]+        return $ MkFormatCode m w a s+    shrink = fcShrink++instance HasFormatCodes t => Arbitrary (FormatCode ParseAndFormat t) where+    arbitrary = do+        (a, s) <- oneof $ fmap return $ allFormatCodes (Proxy :: Proxy t)+        m <-+            case s of+                'Z' -> return ""+                'z' -> return ""+                _ -> oneof [return "", oneof $ fmap return ["", "-", "_", "0"]]+        return $ MkFormatCode m Nothing a s+    shrink = fcShrink+ testParseTime :: TestTree-testParseTime = testGroup "testParseTime"-    [-    readOtherTypesTest,-    readTests,-    simpleFormatTests,-    extests,-    particularParseTests,-    badParseTests,-    defaultTimeZoneTests,-    militaryTimeZoneTests,-    propertyTests-    ]+testParseTime =+    testGroup+        "testParseTime"+        [ readOtherTypesTest+        , readTests+        , simpleFormatTests+        , extests+        , particularParseTests+        , badParseTests+        , defaultTimeZoneTests+        , militaryTimeZoneTests+        , propertyTests+        ]  yearDays :: Integer -> [Day] yearDays y = [(fromGregorian y 1 1) .. (fromGregorian y 12 31)]@@ -37,62 +130,74 @@ makeExhaustiveTest name cases f = testGroup name (fmap f cases)  extests :: TestTree-extests = testGroup "exhaustive" ([-    makeExhaustiveTest "parse %y" [0..99] parseYY,-    makeExhaustiveTest "parse %-C %y 1900s" [0,1,50,99] (parseCYY 19),-    makeExhaustiveTest "parse %-C %y 2000s" [0,1,50,99] (parseCYY 20),-    makeExhaustiveTest "parse %-C %y 1400s" [0,1,50,99] (parseCYY 14),-    makeExhaustiveTest "parse %C %y 0700s" [0,1,50,99] (parseCYY2 7),-    makeExhaustiveTest "parse %-C %y 700s" [0,1,50,99] (parseCYY 7),-    makeExhaustiveTest "parse %-C %y 10000s" [0,1,50,99] (parseCYY 100),-    makeExhaustiveTest "parse %-C centuries" [20..100] (parseCentury " "),-    makeExhaustiveTest "parse %-C century X" [1,10,20,100] (parseCentury "X"),-    makeExhaustiveTest "parse %-C century 2sp" [1,10,20,100] (parseCentury "  "),-    makeExhaustiveTest "parse %-C century 5sp" [1,10,20,100] (parseCentury "     ")-    ] ++-    (concat $ fmap-    (\y -> [-    (makeExhaustiveTest "parse %Y%m%d" (yearDays y) parseYMD),-    (makeExhaustiveTest "parse %Y %m %d" (yearDays y) parseYearDayD),-    (makeExhaustiveTest "parse %Y %-m %e" (yearDays y) parseYearDayE)-    ]) [1,4,20,753,2000,2011,10001]))+extests =+    testGroup+        "exhaustive"+        ([ makeExhaustiveTest "parse %y" [0 .. 99] parseYY+         , makeExhaustiveTest "parse %-C %y 1900s" [0, 1, 50, 99] (parseCYY 19)+         , makeExhaustiveTest "parse %-C %y 2000s" [0, 1, 50, 99] (parseCYY 20)+         , makeExhaustiveTest "parse %-C %y 1400s" [0, 1, 50, 99] (parseCYY 14)+         , makeExhaustiveTest "parse %C %y 0700s" [0, 1, 50, 99] (parseCYY2 7)+         , makeExhaustiveTest "parse %-C %y 700s" [0, 1, 50, 99] (parseCYY 7)+         , makeExhaustiveTest "parse %-C %y -700s" [0, 1, 50, 99] (parseCYY (-7))+         , makeExhaustiveTest "parse %-C %y -70000s" [0, 1, 50, 99] (parseCYY (-70000))+         , makeExhaustiveTest "parse %-C %y 10000s" [0, 1, 50, 99] (parseCYY 100)+         , makeExhaustiveTest "parse %-C centuries" [20 .. 100] (parseCentury " ")+         , makeExhaustiveTest "parse %-C century X" [1, 10, 20, 100] (parseCentury "X")+         , makeExhaustiveTest "parse %-C century 2sp" [1, 10, 20, 100] (parseCentury "  ")+         , makeExhaustiveTest "parse %-C century 5sp" [1, 10, 20, 100] (parseCentury "     ")+         ] +++         (concat $+          fmap+              (\y ->+                   [ (makeExhaustiveTest "parse %Y%m%d" (yearDays y) parseYMD)+                   , (makeExhaustiveTest "parse %Y %m %d" (yearDays y) parseYearDayD)+                   , (makeExhaustiveTest "parse %Y %-m %e" (yearDays y) parseYearDayE)+                   ])+              [1, 4, 20, 753, 2000, 2011, 10001 ])) -- , (-1166)])) -readTest :: (Eq a,Show a,Read a) => [(a,String)] -> String -> TestTree+readTest :: (Eq a, Show a, Read a) => [(a, String)] -> String -> TestTree readTest expected target = let     found = reads target     result = assertEqual "" expected found     name = show target     in Test.Tasty.HUnit.testCase name result -readTestsParensSpaces :: forall a. (Eq a,Show a,Read a) => a -> String -> TestTree-readTestsParensSpaces expected target = testGroup target-    [-    readTest [(expected,"")] $ target,-    readTest [(expected,"")] $ "("++target++")",-    readTest [(expected,"")] $ " ("++target++")",-    readTest [(expected," ")] $ " ( "++target++" ) ",-    readTest [(expected," ")] $ " (( "++target++" )) ",-    readTest ([] :: [(a,String)]) $ "("++target,-    readTest [(expected,")")] $ ""++target++")",-    readTest [(expected,"")] $ "(("++target++"))",-    readTest [(expected," ")] $ "  (   (     "++target++"   )  ) "-    ] where+readTestsParensSpaces ::+       forall a. (Eq a, Show a, Read a)+    => a+    -> String+    -> TestTree+readTestsParensSpaces expected target =+    testGroup+        target+        [ readTest [(expected, "")] $ target+        , readTest [(expected, "")] $ "(" ++ target ++ ")"+        , readTest [(expected, "")] $ " (" ++ target ++ ")"+        , readTest [(expected, " ")] $ " ( " ++ target ++ " ) "+        , readTest [(expected, " ")] $ " (( " ++ target ++ " )) "+        , readTest ([] :: [(a, String)]) $ "(" ++ target+        , readTest [(expected, ")")] $ "" ++ target ++ ")"+        , readTest [(expected, "")] $ "((" ++ target ++ "))"+        , readTest [(expected, " ")] $ "  (   (     " ++ target ++ "   )  ) "+        ]+  where + readOtherTypesTest :: TestTree-readOtherTypesTest = testGroup "read other types"-    [-    readTestsParensSpaces (3 :: Integer) "3",-    readTestsParensSpaces "a" "\"a\""-    ]+readOtherTypesTest =+    testGroup "read other types" [readTestsParensSpaces (3 :: Integer) "3", readTestsParensSpaces "a" "\"a\""]  readTests :: TestTree-readTests = testGroup "read times"-    [-    readTestsParensSpaces testDay "1912-07-08",+readTests =+    testGroup+        "read times"+        [ readTestsParensSpaces testDay "1912-07-08"     --readTestsParensSpaces testDay "1912-7-8",-    readTestsParensSpaces testTimeOfDay "08:04:02"+        , readTestsParensSpaces testTimeOfDay "08:04:02"     --,readTestsParensSpaces testTimeOfDay "8:4:2"-    ] where+        ]+  where     testDay = fromGregorian 1912 7 8     testTimeOfDay = TimeOfDay 8 4 2 @@ -100,30 +205,32 @@ epoch = LocalTime (fromGregorian 1970 0 0) midnight  simpleFormatTests :: TestTree-simpleFormatTests = testGroup "simple"-    [-    readsTest [(epoch,"")] "" "",-    readsTest [(epoch," ")] "" " ",-    readsTest [(epoch,"")] " " " ",-    readsTest [(epoch,"")] " " "  ",-    readsTest [(epoch,"")] "%k" "0",-    readsTest [(epoch,"")] "%k" " 0",-    readsTest [(epoch,"")] "%m" "01",-    readsTest [(epoch," ")] "%m" "01 ",-    readsTest [(epoch," ")] " %m" " 01 ",-    readsTest [(epoch,"")] " %m" " 01",+simpleFormatTests =+    testGroup+        "simple"+        [ readsTest [(epoch, "")] "" ""+        , readsTest [(epoch, " ")] "" " "+        , readsTest [(epoch, "")] " " " "+        , readsTest [(epoch, "")] " " "  "+        , readsTest [(epoch, "")] "%k" "0"+        , readsTest [(epoch, "")] "%k" " 0"+        , readsTest [(epoch, "")] "%m" "01"+        , readsTest [(epoch, " ")] "%m" "01 "+        , readsTest [(epoch, " ")] " %m" " 01 "+        , readsTest [(epoch, "")] " %m" " 01"     -- https://ghc.haskell.org/trac/ghc/ticket/9150-    readsTest [(epoch,"")] " %M" " 00",-    readsTest [(epoch,"")] "%M " "00 ",-    readsTest [(epoch,"")] "%Q" "",-    readsTest [(epoch," ")] "%Q" " ",-    readsTest [(epoch,"X")] "%Q" "X",-    readsTest [(epoch," X")] "%Q" " X",-    readsTest [(epoch,"")] "%Q " " ",-    readsTest [(epoch,"")] "%Q X" " X",-    readsTest [(epoch,"")] "%QX" "X"-    ] where-    readsTest :: (Show a, Eq a, ParseTime a) => [(a,String)] -> String -> String -> TestTree+        , readsTest [(epoch, "")] " %M" " 00"+        , readsTest [(epoch, "")] "%M " "00 "+        , readsTest [(epoch, "")] "%Q" ""+        , readsTest [(epoch, " ")] "%Q" " "+        , readsTest [(epoch, "X")] "%Q" "X"+        , readsTest [(epoch, " X")] "%Q" " X"+        , readsTest [(epoch, "")] "%Q " " "+        , readsTest [(epoch, "")] "%Q X" " X"+        , readsTest [(epoch, "")] "%QX" "X"+        ]+  where+    readsTest :: (Show a, Eq a, ParseTime a) => [(a, String)] -> String -> String -> TestTree     readsTest expected formatStr target = let         found = readSTime False defaultTimeLocale formatStr target         result = assertEqual "" expected found@@ -131,55 +238,58 @@         in Test.Tasty.HUnit.testCase name result  spacingTests :: (Show t, Eq t, ParseTime t) => t -> String -> String -> TestTree-spacingTests expected formatStr target = testGroup "particular"-    [-        parseTest False (Just expected) formatStr target,-        parseTest True (Just expected) formatStr target,-        parseTest False (Just expected) (formatStr ++ " ") (target ++ " "),-        parseTest True (Just expected) (formatStr ++ " ") (target ++ " "),-        parseTest False (Just expected) (" " ++ formatStr) (" " ++ target),-        parseTest True (Just expected) (" " ++ formatStr) (" " ++ target),-        parseTest True (Just expected) ("" ++ formatStr) (" " ++ target),-        parseTest True (Just expected) (" " ++ formatStr) ("  " ++ target)-    ]+spacingTests expected formatStr target =+    testGroup+        "particular"+        [ parseTest False (Just expected) formatStr target+        , parseTest True (Just expected) formatStr target+        , parseTest False (Just expected) (formatStr ++ " ") (target ++ " ")+        , parseTest True (Just expected) (formatStr ++ " ") (target ++ " ")+        , parseTest False (Just expected) (" " ++ formatStr) (" " ++ target)+        , parseTest True (Just expected) (" " ++ formatStr) (" " ++ target)+        , parseTest True (Just expected) ("" ++ formatStr) (" " ++ target)+        , parseTest True (Just expected) (" " ++ formatStr) ("  " ++ target)+        ]  particularParseTests :: TestTree-particularParseTests = testGroup "particular"-    [-        spacingTests epoch "%Q" "",-        spacingTests epoch "%Q" ".0",-        spacingTests epoch "%k" " 0",-        spacingTests epoch "%M" "00",-        spacingTests epoch "%m" "01",-        spacingTests (TimeZone 120 False "") "%z" "+0200",-        spacingTests (TimeZone 120 False "") "%Z" "+0200",-        spacingTests (TimeZone (-480) False "PST") "%Z" "PST"-    ]+particularParseTests =+    testGroup+        "particular"+        [ spacingTests epoch "%Q" ""+        , spacingTests epoch "%Q" ".0"+        , spacingTests epoch "%k" " 0"+        , spacingTests epoch "%M" "00"+        , spacingTests epoch "%m" "01"+        , spacingTests (TimeZone 120 False "") "%z" "+0200"+        , spacingTests (TimeZone 120 False "") "%Z" "+0200"+        , spacingTests (TimeZone (-480) False "PST") "%Z" "PST"+        ]  badParseTests :: TestTree-badParseTests = testGroup "bad"-    [-        parseTest False (Nothing :: Maybe Day) "%Y" ""-    ]+badParseTests = testGroup "bad" [parseTest False (Nothing :: Maybe Day) "%Y" ""]  parseYMD :: Day -> TestTree-parseYMD day = case toGregorian day of-    (y,m,d) -> parseTest False (Just day) "%Y%m%d" ((show y) ++ (show2 m) ++ (show2 d))+parseYMD day =+    case toGregorian day of+        (y, m, d) -> parseTest False (Just day) "%Y%m%d" ((show y) ++ (show2 m) ++ (show2 d))  parseYearDayD :: Day -> TestTree-parseYearDayD day = case toGregorian day of-    (y,m,d) -> parseTest False (Just day) "%Y %m %d" ((show y) ++ " " ++ (show2 m) ++ " " ++ (show2 d))+parseYearDayD day =+    case toGregorian day of+        (y, m, d) -> parseTest False (Just day) "%Y %m %d" ((show y) ++ " " ++ (show2 m) ++ " " ++ (show2 d))  parseYearDayE :: Day -> TestTree-parseYearDayE day = case toGregorian day of-    (y,m,d) -> parseTest False (Just day) "%Y %-m %e" ((show y) ++ " " ++ (show m) ++ " " ++ (show d))+parseYearDayE day =+    case toGregorian day of+        (y, m, d) -> parseTest False (Just day) "%Y %-m %e" ((show y) ++ " " ++ (show m) ++ " " ++ (show d))  -- | 1969 - 2068 expectedYear :: Integer -> Integer-expectedYear i | i >= 69 = 1900 + i+expectedYear i+    | i >= 69 = 1900 + i expectedYear i = 2000 + i -show2 :: (Show n,Integral n) => n -> String+show2 :: (Show n, Integral n) => n -> String show2 i = (show (div i 10)) ++ (show (mod i 10))  parseYY :: Integer -> TestTree@@ -192,27 +302,36 @@ parseCYY2 c i = parseTest False (Just (fromGregorian ((c * 100) + i) 1 1)) "%C %y" ((show2 c) ++ " " ++ (show2 i))  parseCentury :: String -> Integer -> TestTree-parseCentury int c = parseTest False (Just (fromGregorian (c * 100) 1 1)) ("%-C" ++ int ++ "%y") ((show c) ++ int ++ "00")+parseCentury int c =+    parseTest False (Just (fromGregorian (c * 100) 1 1)) ("%-C" ++ int ++ "%y") ((show c) ++ int ++ "00")  parseTest :: (Show t, Eq t, ParseTime t) => Bool -> Maybe t -> String -> String -> TestTree parseTest sp expected formatStr target = let     found = parse sp formatStr target     result = assertEqual "" expected found-    name = (show formatStr) ++ " of " ++ (show target) ++ (if sp then " allowing spaces" else "")+    name =+        (show formatStr) +++        " of " +++        (show target) +++        (if sp+             then " allowing spaces"+             else "")     in Test.Tasty.HUnit.testCase name result+ {- readsTest :: forall t. (Show t, Eq t, ParseTime t) => Maybe t -> String -> String -> TestTree readsTest (Just e) = readsTest' [(e,"")] readsTest Nothing = readsTest' ([] :: [(t,String)]) -}- enumAdd :: (Enum a) => Int -> a -> a enumAdd i a = toEnum (i + fromEnum a)  getMilZoneLetter :: Int -> Char getMilZoneLetter 0 = 'Z'-getMilZoneLetter h | h < 0 = enumAdd (negate h) 'M'-getMilZoneLetter h | h < 10 = enumAdd (h - 1) 'A'+getMilZoneLetter h+    | h < 0 = enumAdd (negate h) 'M'+getMilZoneLetter h+    | h < 10 = enumAdd (h - 1) 'A' getMilZoneLetter h = enumAdd (h - 10) 'K'  getMilZone :: Int -> TimeZone@@ -221,56 +340,55 @@ testParseTimeZone :: TimeZone -> TestTree testParseTimeZone tz = parseTest False (Just tz) "%Z" (timeZoneName tz) -#if !MIN_VERSION_time(1,5,0)-knownTimeZones _ = []-#endif- defaultTimeZoneTests :: TestTree-defaultTimeZoneTests = testGroup "default time zones" (fmap testParseTimeZone (knownTimeZones defaultTimeLocale))+defaultTimeZoneTests = testGroup "default time zones" [] -- (fmap testParseTimeZone (knownTimeZones defaultTimeLocale))  militaryTimeZoneTests :: TestTree militaryTimeZoneTests = testGroup "military time zones" (fmap (testParseTimeZone . getMilZone) [-12 .. 12]) --parse :: ParseTime t => Bool -> String -> String -> Maybe t-parse sp f t = parseTimeM sp defaultTimeLocale f t--format :: (FormatTime t) => String -> t -> String-format f t = formatTime defaultTimeLocale f t- -- missing from the time package instance Eq ZonedTime where     ZonedTime t1 tz1 == ZonedTime t2 tz2 = t1 == t2 && tz1 == tz2 -compareResult' :: (Eq a,Show a) => String -> a -> a -> Result+compareResult' :: (Eq a, Show a) => String -> a -> a -> Result compareResult' extra expected found     | expected == found = succeeded     | otherwise = failed {reason = "expected " ++ (show expected) ++ ", found " ++ (show found) ++ extra} -compareResult :: (Eq a,Show a) => a -> a -> Result+compareResult :: (Eq a, Show a) => a -> a -> Result compareResult = compareResult' "" -compareParse :: forall a. (Eq a,Show a,ParseTime a) => a -> String -> String -> Result+compareParse ::+       forall a. (Eq a, Show a, ParseTime a)+    => a+    -> String+    -> String+    -> Result compareParse expected fmt text = compareResult' (", parsing " ++ (show text)) (Just expected) (parse False fmt text)  -- -- * tests for debugging failing cases ----test_parse_format :: (FormatTime t,ParseTime t,Show t) => String -> t -> (String,String,Maybe t)-test_parse_format f t = let s = format f t in (show t, s, parse False f s `asTypeOf` Just t)+test_parse_format :: (FormatTime t, ParseTime t, Show t) => String -> t -> (String, String, Maybe t)+test_parse_format f t = let+    s = format f t+    in (show t, s, parse False f s `asTypeOf` Just t)  -- -- * show and read --- prop_read_show :: (Read a, Show a, Eq a) => a -> Result prop_read_show t = compareResult (Just t) (readMaybe (show t)) +prop_read_show_ZonedUTC :: ZonedTime -> Result+prop_read_show_ZonedUTC t = compareResult (Just $ zonedTimeToUTC t) (readMaybe (show t))++prop_read_show_LocalUTC :: LocalTime -> Result+prop_read_show_LocalUTC t = compareResult (Just $ localTimeToUTC utc t) (readMaybe (show t))+ -- -- * special show functions --- prop_parse_showWeekDate :: Day -> Result prop_parse_showWeekDate d = compareParse d "%G-W%V-%u" (showWeekDate d) @@ -283,66 +401,107 @@ -- -- * fromMondayStartWeek and fromSundayStartWeek --- prop_fromMondayStartWeek :: Day -> Result-prop_fromMondayStartWeek d =-    let (w,wd)  = mondayStartWeek d-        (y,_,_) = toGregorian d-     in compareResult d (fromMondayStartWeek y w wd)+prop_fromMondayStartWeek d = let+    (w, wd) = mondayStartWeek d+    (y, _, _) = toGregorian d+    in compareResult d (fromMondayStartWeek y w wd)  prop_fromSundayStartWeek :: Day -> Result-prop_fromSundayStartWeek d =-    let (w,wd)  = sundayStartWeek d-        (y,_,_) = toGregorian d-     in compareResult d (fromSundayStartWeek y w wd)------- * format and parse---+prop_fromSundayStartWeek d = let+    (w, wd) = sundayStartWeek d+    (y, _, _) = toGregorian d+    in compareResult d (fromSundayStartWeek y w wd) +-- t == parse (format t) prop_parse_format :: (Eq t, FormatTime t, ParseTime t, Show t) => FormatString t -> t -> Result prop_parse_format (FormatString f) t = compareParse t f (format f t) --- Verify case-insensitivity with upper case.+-- t == parse (upper (format t)) prop_parse_format_upper :: (Eq t, FormatTime t, ParseTime t, Show t) => FormatString t -> t -> Result prop_parse_format_upper (FormatString f) t = compareParse t f (map toUpper $ format f t) --- Verify case-insensitivity with lower case.+-- t == parse (lower (format t)) prop_parse_format_lower :: (Eq t, FormatTime t, ParseTime t, Show t) => FormatString t -> t -> Result prop_parse_format_lower (FormatString f) t = compareParse t f (map toLower $ format f t) -prop_format_parse_format :: (FormatTime t, ParseTime t) => FormatString t -> t -> Result-prop_format_parse_format (FormatString f) t = compareResult-    (Just (format f t))-    (fmap (format f) (parse False f (format f t) `asTypeOf` Just t))+-- Default time is 1970-01-01 00:00:00 +0000 (which was a Thursday)+in1970 :: Maybe String -> Char -> String -> Maybe String+in1970 _ 'j' "366" = Nothing -- 1970 was not a leap year+in1970 _ 'U' "53" = Nothing -- last day of 1970 was Sunday-start-week 52+in1970 _ 'W' "53" = Nothing -- last day of 1970 was Monday-start-week 52+in1970 (Just s) 'S' "60" = Just s -- no leap second without other data+in1970 _ _ s = Just s +-- format t == format (parse (format t))+prop_format_parse_format ::+       forall t. (HasFormatCodes t, FormatTime t, ParseTime t)+    => Proxy t+    -> FormatCode ParseAndFormat t+    -> t+    -> Result+prop_format_parse_format _ fc v = let+    s1 = formatCode fc v+    ms1 = in1970 (fmap (formatCode fc) (incompleteS :: Maybe t)) (fcSpecifier fc) s1+    mv2 :: Maybe t+    mv2 = parseCode fc s1+    ms2 = fmap (formatCode fc) mv2+    in compareResult ms1 ms2++instance HasFormatCodes Day where+    allFormatCodes _ = [(False, s) | s <- "DFxYyCBbhmdejfVUW"]++instance HasFormatCodes TimeOfDay where+    allFormatCodes _ = [(False, s) | s <- "RTXrPpHkIlMSqQ"]++instance HasFormatCodes LocalTime where+    allFormatCodes _ = allFormatCodes (Proxy :: Proxy Day) ++ allFormatCodes (Proxy :: Proxy TimeOfDay)++instance HasFormatCodes TimeZone where+    allFormatCodes _ = [(a, s) | a <- [False, True], s <- "zZ"]++instance HasFormatCodes ZonedTime where+    allFormatCodes _ =+        [(False, s) | s <- "cs"] +++        allFormatCodes (Proxy :: Proxy LocalTime) ++ allFormatCodes (Proxy :: Proxy TimeZone)++instance HasFormatCodes UTCTime where+    allFormatCodes _ = [(False, s) | s <- "cs"] ++ allFormatCodes (Proxy :: Proxy LocalTime)+    incompleteS = Just $ UTCTime (fromGregorian 2000 1 1) 0++instance HasFormatCodes UniversalTime where+    allFormatCodes _ = allFormatCodes (Proxy :: Proxy LocalTime)+ -- -- * crashes in parse ----newtype Input = Input String+newtype Input =+    Input String  instance Show Input where     show (Input s) = s  instance Arbitrary Input where     arbitrary = liftM Input $ list cs-      where cs = elements (['0'..'9'] ++ ['-',' ','/'] ++ ['a'..'z'] ++ ['A' .. 'Z'])-            list g = sized (\n -> choose (0,n) >>= \l -> replicateM l g)+      where+        cs = elements (['0' .. '9'] ++ ['-', ' ', '/'] ++ ['a' .. 'z'] ++ ['A' .. 'Z'])+        list g = sized (\n -> choose (0, n) >>= \l -> replicateM l g)+ instance CoArbitrary Input where     coarbitrary (Input s) = coarbitrary (sum (map ord s))  prop_no_crash_bad_input :: (Eq t, ParseTime t) => FormatString t -> Input -> Property-prop_no_crash_bad_input fs@(FormatString f) (Input s) = property $+prop_no_crash_bad_input fs@(FormatString f) (Input s) =+    property $     case parse False f s of-      Nothing -> True-      Just t  -> t == t `asTypeOf` formatType fs+        Nothing -> True+        Just t -> t == t `asTypeOf` formatType fs  -- -- ----newtype FormatString a = FormatString String+newtype FormatString a =+    FormatString String  formatType :: FormatString t -> t formatType _ = undefined@@ -351,179 +510,322 @@     show (FormatString f) = show f  typedTests :: (forall t. (Eq t, FormatTime t, ParseTime t, Show t) => FormatString t -> t -> Result) -> [TestTree]-typedTests prop = [-    nameTest "Day" $ tgroup dayFormats prop,-    nameTest "TimeOfDay" $ tgroup timeOfDayFormats prop,-    nameTest "LocalTime" $ tgroup localTimeFormats prop,-    nameTest "TimeZone" $ tgroup timeZoneFormats prop,-    nameTest "ZonedTime" $ tgroup zonedTimeFormats prop,-    nameTest "ZonedTime" $ tgroup zonedTimeAlmostFormats $ \fmt t -> (todSec $ localTimeOfDay $ zonedTimeToLocalTime t) < 60 ==> prop fmt t,-    nameTest "UTCTime" $ tgroup utcTimeAlmostFormats $ \fmt t -> utctDayTime t < 86400 ==> prop fmt t,-    nameTest "UniversalTime" $ tgroup universalTimeFormats prop-    -- nameTest "CalendarDiffDays" $ tgroup calendarDiffDaysFormats prop,-    -- nameTest "CalenderDiffTime" $ tgroup calendarDiffTimeFormats prop,-    -- nameTest "DiffTime" $ tgroup diffTimeFormats prop,-    -- nameTest "NominalDiffTime" $ tgroup nominalDiffTimeFormats prop+typedTests prop =+    [ nameTest "Day" $ tgroup dayFormats prop+    -- , nameTest "Month" $ tgroup monthFormats prop+    , nameTest "TimeOfDay" $ tgroup timeOfDayFormats prop+    , nameTest "LocalTime" $ tgroup localTimeFormats prop+    , nameTest "TimeZone" $ tgroup timeZoneFormats prop+    , nameTest "ZonedTime" $ tgroup zonedTimeFormats prop+    , nameTest "ZonedTime" $+      tgroup zonedTimeAlmostFormats $ \fmt t -> (todSec $ localTimeOfDay $ zonedTimeToLocalTime t) < 60 ==> prop fmt t+    , nameTest "UTCTime" $ tgroup utcTimeAlmostFormats $ \fmt t -> utctDayTime t < 86400 ==> prop fmt t+    , nameTest "UniversalTime" $ tgroup universalTimeFormats prop+    -- time-compat doesn't have instances+    -- , nameTest "CalendarDiffDays" $ tgroup calendarDiffDaysFormats prop+    -- , nameTest "CalenderDiffTime" $ tgroup calendarDiffTimeFormats prop+    -- , nameTest "DiffTime" $ tgroup diffTimeFormats prop+    -- , nameTest "NominalDiffTime" $ tgroup nominalDiffTimeFormats prop     ] +allTypes ::+       (forall t. (Eq t, Show t, Arbitrary t, FormatTime t, ParseTime t, HasFormatCodes t) => String -> Proxy t -> r)+    -> [r]+allTypes f =+    [ f "Day" (Proxy :: Proxy Day)+    , f "TimeOfDay" (Proxy :: Proxy TimeOfDay)+    , f "LocalTime" (Proxy :: Proxy LocalTime)+    , f "TimeZone" (Proxy :: Proxy TimeZone)+    , f "ZonedTime" (Proxy :: Proxy ZonedTime)+    , f "UTCTime" (Proxy :: Proxy UTCTime)+    , f "UniversalTime" (Proxy :: Proxy UniversalTime)+    ]++allLeapSecondTypes ::+       (forall t. (Eq t, Show t, Arbitrary t, FormatTime t, ParseTime t, HasFormatCodes t) => String -> t -> r)+    -> [r]+allLeapSecondTypes f = let+    day :: Day+    day = fromGregorian 2000 01 01+    lsTimeOfDay :: TimeOfDay+    lsTimeOfDay = TimeOfDay 23 59 60.5+    lsLocalTime :: LocalTime+    lsLocalTime = LocalTime day lsTimeOfDay+    lsZonedTime :: ZonedTime+    lsZonedTime = ZonedTime lsLocalTime utc+    lsUTCTime :: UTCTime+    lsUTCTime = UTCTime day 86400.5+    in+    [ f "TimeOfDay" lsTimeOfDay+    , f "LocalTime" lsLocalTime+    , f "ZonedTime" lsZonedTime+    , f "UTCTime" lsUTCTime+    ]++parseEmptyTest ::+       forall t. ParseTime t+    => Proxy t+    -> Assertion+parseEmptyTest _ =+    case parse False "" "" :: Maybe t of+        Just _ -> return ()+        Nothing -> assertFailure "failed"++parseEmptyTests :: TestTree+parseEmptyTests = nameTest "parse empty" $ allTypes $ \name p -> nameTest name $ parseEmptyTest p+ formatParseFormatTests :: TestTree-formatParseFormatTests = nameTest "format_parse_format" [-    nameTest "Day" $ tgroup partialDayFormats prop_format_parse_format,-    nameTest "TimeOfDay" $ tgroup partialTimeOfDayFormats prop_format_parse_format,-    nameTest "LocalTime" $ tgroup partialLocalTimeFormats prop_format_parse_format,-    nameTest "ZonedTime" $ tgroup partialZonedTimeFormats prop_format_parse_format,-    nameTest "UTCTime" $ tgroup partialUTCTimeFormats prop_format_parse_format,-    nameTest "UniversalTime" $ tgroup partialUniversalTimeFormats prop_format_parse_format+formatParseFormatTests = nameTest "format_parse_format"+    [+        localOption (QuickCheckTests 50000) $+        nameTest "general" $ allTypes $ \name p -> nameTest name $ prop_format_parse_format p,+        nameTest "leapsecond" $ allLeapSecondTypes $ \name t -> nameTest name $ \fc -> prop_format_parse_format Proxy fc t     ]  badInputTests :: TestTree-badInputTests = nameTest "no_crash_bad_input" [-    nameTest "Day" $ tgroup (dayFormats ++ partialDayFormats ++ failingPartialDayFormats) prop_no_crash_bad_input,-    nameTest "TimeOfDay" $ tgroup (timeOfDayFormats ++ partialTimeOfDayFormats) prop_no_crash_bad_input,-    nameTest "LocalTime" $ tgroup (localTimeFormats ++ partialLocalTimeFormats) prop_no_crash_bad_input,-    nameTest "TimeZone" $ tgroup (timeZoneFormats) prop_no_crash_bad_input,-    nameTest "ZonedTime" $ tgroup (zonedTimeFormats ++ zonedTimeAlmostFormats ++ partialZonedTimeFormats) prop_no_crash_bad_input,-    nameTest "UTCTime" $ tgroup (utcTimeAlmostFormats ++ partialUTCTimeFormats) prop_no_crash_bad_input,-    nameTest "UniversalTime" $ tgroup (universalTimeFormats ++ partialUniversalTimeFormats) prop_no_crash_bad_input-    ]+badInputTests =+    nameTest+        "no_crash_bad_input"+        [ nameTest "Day" $ tgroup (dayFormats ++ partialDayFormats ++ failingPartialDayFormats) prop_no_crash_bad_input+        , nameTest "TimeOfDay" $ tgroup (timeOfDayFormats ++ partialTimeOfDayFormats) prop_no_crash_bad_input+        , nameTest "LocalTime" $ tgroup (localTimeFormats ++ partialLocalTimeFormats) prop_no_crash_bad_input+        , nameTest "TimeZone" $ tgroup (timeZoneFormats) prop_no_crash_bad_input+        , nameTest "ZonedTime" $+          tgroup (zonedTimeFormats ++ zonedTimeAlmostFormats ++ partialZonedTimeFormats) prop_no_crash_bad_input+        , nameTest "UTCTime" $ tgroup (utcTimeAlmostFormats ++ partialUTCTimeFormats) prop_no_crash_bad_input+        , nameTest "UniversalTime" $+          tgroup (universalTimeFormats ++ partialUniversalTimeFormats) prop_no_crash_bad_input+        ]  readShowTests :: TestTree-readShowTests = nameTest "read_show" [-    nameTest "Day" (prop_read_show :: Day -> Result),-    nameTest "TimeOfDay" (prop_read_show :: TimeOfDay -> Result),-    nameTest "LocalTime" (prop_read_show :: LocalTime -> Result),-    nameTest "TimeZone" (prop_read_show :: TimeZone -> Result),-    nameTest "ZonedTime" (prop_read_show :: ZonedTime -> Result),-    nameTest "UTCTime" (prop_read_show :: UTCTime -> Result),-    nameTest "UniversalTime" (prop_read_show :: UniversalTime -> Result)+readShowTests =+    nameTest+        "read_show"+        [ nameTest "Day" (prop_read_show :: Day -> Result)+        , nameTest "Month" (prop_read_show :: Month -> Result)+        , nameTest "QuarterOfYear" (prop_read_show :: QuarterOfYear -> Result)+        , nameTest "Quarter" (prop_read_show :: Quarter -> Result)+        , nameTest "TimeOfDay" (prop_read_show :: TimeOfDay -> Result)+        , nameTest "LocalTime" (prop_read_show :: LocalTime -> Result)+        , nameTest "TimeZone" (prop_read_show :: TimeZone -> Result)+        , nameTest "ZonedTime" (prop_read_show :: ZonedTime -> Result)+        , nameTest "UTCTime" (prop_read_show :: UTCTime -> Result)+        , nameTest "UTCTime (zoned)" prop_read_show_ZonedUTC+        , nameTest "UTCTime (local)" prop_read_show_LocalUTC+        , nameTest "UniversalTime" (prop_read_show :: UniversalTime -> Result)+        , nameTest "NominalDiffTime" (prop_read_show :: NominalDiffTime -> Result)+        , nameTest "DiffTime" (prop_read_show :: DiffTime -> Result)     --nameTest "CalendarDiffDays" (prop_read_show :: CalendarDiffDays -> Result),     --nameTest "CalendarDiffTime" (prop_read_show :: CalendarDiffTime -> Result)-    ]+        ]  parseShowTests :: TestTree-parseShowTests = nameTest "parse_show" [-    nameTest "showWeekDate" prop_parse_showWeekDate,-    nameTest "showGregorian" prop_parse_showGregorian,-    nameTest "showOrdinalDate" prop_parse_showOrdinalDate-    ]+parseShowTests =+    nameTest+        "parse_show"+        [ nameTest "showWeekDate" prop_parse_showWeekDate+        , nameTest "showGregorian" prop_parse_showGregorian+        , nameTest "showOrdinalDate" prop_parse_showOrdinalDate+        ]  propertyTests :: TestTree-propertyTests = nameTest "properties" [-    readShowTests,-    parseShowTests,-    nameTest "fromMondayStartWeek" prop_fromMondayStartWeek,-    nameTest "fromSundayStartWeek" prop_fromSundayStartWeek,-    nameTest "parse_format" $ typedTests prop_parse_format,-    nameTest "parse_format_lower" $ typedTests prop_parse_format_lower,-    nameTest "parse_format_upper" $ typedTests prop_parse_format_upper,-    formatParseFormatTests,-    badInputTests-    ]+propertyTests =+    localOption (QuickCheckTests 2000) $+    nameTest+        "properties"+        [ readShowTests+        , parseShowTests+        , nameTest "fromMondayStartWeek" prop_fromMondayStartWeek+        , nameTest "fromSundayStartWeek" prop_fromSundayStartWeek+        , nameTest "parse_format" $ typedTests prop_parse_format+        , nameTest "parse_format_lower" $ typedTests prop_parse_format_lower+        , nameTest "parse_format_upper" $ typedTests prop_parse_format_upper+        , parseEmptyTests+        , formatParseFormatTests+        , badInputTests+        ]  dayFormats :: [FormatString Day]-dayFormats = map FormatString-    [+dayFormats =+    map FormatString      -- numeric year, month, day-     "%Y-%m-%d","%Y%m%d","%C%y%m%d","%Y %m %e","%m/%d/%Y","%d/%m/%Y","%Y/%d/%m","%D %C","%F",+        [ "%Y-%m-%d"+        , "%Y%m%d"+        , "%C%y%m%d"+        , "%Y %m %e"+        , "%m/%d/%Y"+        , "%d/%m/%Y"+        , "%Y/%d/%m"+        , "%D %C"+        , "%F"      -- month names-     "%Y-%B-%d","%Y-%b-%d","%Y-%h-%d",+        , "%Y-%B-%d"+        , "%Y-%b-%d"+        , "%Y-%h-%d"+        , "%C-%y-%B-%d"+        , "%C-%y-%b-%d"+        , "%C-%y-%h-%d"      -- ordinal dates-     "%Y-%j",+        , "%Y-%j"+        , "%C-%y-%j"      -- ISO week dates-     "%G-%V-%u","%G-%V-%a","%G-%V-%A","%G-%V-%w", "%A week %V, %G", "day %V, week %A, %G",-     "%G-W%V-%u",-     "%f%g-%V-%u","%f%g-%V-%a","%f%g-%V-%A","%f%g-%V-%w", "%A week %V, %f%g", "day %V, week %A, %f%g",-     "%f%g-W%V-%u",+        , "%G-%V-%u"+        , "%G-%V-%a"+        , "%G-%V-%A"+        , "%G-%V-%w"+        , "%A week %V, %G"+        , "day %V, week %A, %G"+        , "%G-W%V-%u"+        , "%f%g-%V-%u"+        , "%f%g-%V-%a"+        , "%f%g-%V-%A"+        , "%f%g-%V-%w"+        , "%A week %V, %f%g"+        , "day %V, week %A, %f%g"+        , "%f%g-W%V-%u"      -- monday and sunday week dates-     "%Y-w%U-%A", "%Y-w%W-%A", "%Y-%A-w%U", "%Y-%A-w%W", "%A week %U, %Y", "%A week %W, %Y"-    ]+        , "%Y-w%U-%A"+        , "%Y-w%W-%A"+        , "%Y-%A-w%U"+        , "%Y-%A-w%W"+        , "%A week %U, %Y"+        , "%A week %W, %Y"+        ] +monthFormats :: [FormatString Month]+monthFormats =+    map FormatString+     -- numeric year, month+        [ "%Y-%m"+        , "%Y%m"+        , "%C%y%m"+        , "%Y %m"+        , "%m/%Y"+        , "%m/%Y"+        , "%Y/%m"+        , "%C %y %m"+     -- month names+        , "%Y-%B"+        , "%Y-%b"+        , "%Y-%h"+        , "%C-%y-%B"+        , "%C-%y-%b"+        , "%C-%y-%h"+        ]+ timeOfDayFormats :: [FormatString TimeOfDay]-timeOfDayFormats = map FormatString-    [+timeOfDayFormats =+    map FormatString      -- 24 h formats-     "%H:%M:%S.%q","%k:%M:%S.%q","%H%M%S.%q","%T.%q","%X.%q","%R:%S.%q",-     "%H:%M:%S%Q","%k:%M:%S%Q","%H%M%S%Q","%T%Q","%X%Q","%R:%S%Q",+        [ "%H:%M:%S.%q"+        , "%k:%M:%S.%q"+        , "%H%M%S.%q"+        , "%T.%q"+        , "%X.%q"+        , "%R:%S.%q"+        , "%H:%M:%S%Q"+        , "%k:%M:%S%Q"+        , "%H%M%S%Q"+        , "%T%Q"+        , "%X%Q"+        , "%R:%S%Q"      -- 12 h formats-     "%I:%M:%S.%q %p","%I:%M:%S.%q %P","%l:%M:%S.%q %p","%r %q",-     "%I:%M:%S%Q %p","%I:%M:%S%Q %P","%l:%M:%S%Q %p","%r %Q"-    ]+        , "%I:%M:%S.%q %p"+        , "%I:%M:%S.%q %P"+        , "%l:%M:%S.%q %p"+        , "%r %q"+        , "%I:%M:%S%Q %p"+        , "%I:%M:%S%Q %P"+        , "%l:%M:%S%Q %p"+        , "%r %Q"+        ]  localTimeFormats :: [FormatString LocalTime]-localTimeFormats = map FormatString [{-"%Q","%Q ","%QX"-}]+localTimeFormats = map FormatString [] {-"%Q","%Q ","%QX"-}  timeZoneFormats :: [FormatString TimeZone]-timeZoneFormats = map FormatString ["%z","%z%Z","%Z%z","%Z"]+timeZoneFormats = map FormatString ["%z", "%z%Z", "%Z%z", "%Z", "%Ez", "%EZ"]  zonedTimeFormats :: [FormatString ZonedTime]-zonedTimeFormats = map FormatString-  ["%a, %d %b %Y %H:%M:%S.%q %z", "%a, %d %b %Y %H:%M:%S%Q %z",-   "%a, %d %b %Y %H:%M:%S.%q %Z", "%a, %d %b %Y %H:%M:%S%Q %Z"]+zonedTimeFormats =+    map FormatString+        [ "%a, %d %b %Y %H:%M:%S.%q %z"+        , "%a, %d %b %Y %H:%M:%S%Q %z"+        , "%a, %d %b %Y %H:%M:%S.%q %Z"+        , "%a, %d %b %Y %H:%M:%S%Q %Z"+        ]  zonedTimeAlmostFormats :: [FormatString ZonedTime]-zonedTimeAlmostFormats = map FormatString  ["%s.%q %z", "%s%Q %z", "%s.%q %Z", "%s%Q %Z"]+zonedTimeAlmostFormats = map FormatString ["%s.%q %z", "%s%Q %z", "%s.%q %Z", "%s%Q %Z"]  utcTimeAlmostFormats :: [FormatString UTCTime]-utcTimeAlmostFormats = map FormatString  ["%s.%q","%s%Q"]+utcTimeAlmostFormats = map FormatString ["%s.%q", "%s%Q"]  universalTimeFormats :: [FormatString UniversalTime] universalTimeFormats = map FormatString []  calendarDiffDaysFormats :: [FormatString CalendarDiffDays]-calendarDiffDaysFormats = map FormatString ["%yy%Bm%ww%Dd","%yy%Bm%dd","%bm%ww%Dd","%bm%dd"]+calendarDiffDaysFormats = map FormatString ["%yy%Bm%ww%Dd", "%yy%Bm%dd", "%bm%ww%Dd", "%bm%dd"]  calendarDiffTimeFormats :: [FormatString CalendarDiffTime]-calendarDiffTimeFormats = map FormatString ["%yy%Bm%ww%Dd%Hh%Mm%ESs","%bm%ww%Dd%Hh%Mm%ESs","%bm%dd%Hh%Mm%ESs","%bm%hh%Mm%ESs","%bm%mm%ESs","%bm%mm%0ESs","%bm%Ess","%bm%0Ess"]+calendarDiffTimeFormats =+    map FormatString+        [ "%yy%Bm%ww%Dd%Hh%Mm%ESs"+        , "%bm%ww%Dd%Hh%Mm%ESs"+        , "%bm%dd%Hh%Mm%ESs"+        , "%bm%hh%Mm%ESs"+        , "%bm%mm%ESs"+        , "%bm%mm%0ESs"+        , "%bm%Ess"+        , "%bm%0Ess"+        ]  diffTimeFormats :: [FormatString DiffTime]-diffTimeFormats = map FormatString ["%ww%Dd%Hh%Mm%ESs","%dd%Hh%Mm%ESs","%hh%Mm%ESs","%mm%ESs","%mm%0ESs","%Ess","%0Ess"]+diffTimeFormats =+    map FormatString ["%ww%Dd%Hh%Mm%ESs", "%dd%Hh%Mm%ESs", "%hh%Mm%ESs", "%mm%ESs", "%mm%0ESs", "%Ess", "%0Ess"]  nominalDiffTimeFormats :: [FormatString NominalDiffTime]-nominalDiffTimeFormats = map FormatString ["%ww%Dd%Hh%Mm%ESs","%dd%Hh%Mm%ESs","%hh%Mm%ESs","%mm%ESs","%mm%0ESs","%Ess","%0Ess"]+nominalDiffTimeFormats =+    map FormatString ["%ww%Dd%Hh%Mm%ESs", "%dd%Hh%Mm%ESs", "%hh%Mm%ESs", "%mm%ESs", "%mm%0ESs", "%Ess", "%0Ess"]  -- -- * Formats that do not include all the information --- partialDayFormats :: [FormatString Day]-partialDayFormats = map FormatString-    [ ]+partialDayFormats = map FormatString []  partialTimeOfDayFormats :: [FormatString TimeOfDay]-partialTimeOfDayFormats = map FormatString-    [ ]+partialTimeOfDayFormats = map FormatString ["%H", "%M", "%S", "%H:%M"]  partialLocalTimeFormats :: [FormatString LocalTime]-partialLocalTimeFormats = map FormatString-    [ ]+partialLocalTimeFormats = map FormatString []  partialZonedTimeFormats :: [FormatString ZonedTime]-partialZonedTimeFormats = map FormatString-    [+partialZonedTimeFormats =+    map FormatString      -- %s does not include second decimals-     "%s %z",+        [ "%s %z"      -- %S does not include second decimals-     "%c", "%a, %d %b %Y %H:%M:%S %Z"-    ]+        , "%c"+        , "%a, %d %b %Y %H:%M:%S %Z"+        ]  partialUTCTimeFormats :: [FormatString UTCTime]-partialUTCTimeFormats = map FormatString-    [+partialUTCTimeFormats =+    map FormatString      -- %s does not include second decimals-     "%s",+        [ "%s"      -- %c does not include second decimals-     "%c"-    ]+        , "%c"+        ]  partialUniversalTimeFormats :: [FormatString UniversalTime]-partialUniversalTimeFormats = map FormatString-    [ ]+partialUniversalTimeFormats = map FormatString []  failingPartialDayFormats :: [FormatString Day]-failingPartialDayFormats = map FormatString-    [ -- ISO week dates with two digit year.+failingPartialDayFormats =+    map FormatString+      -- ISO week dates with two digit year.       -- This can fail in the beginning or the end of a year where       -- the ISO week date year does not match the gregorian year.-     "%g-%V-%u","%g-%V-%a","%g-%V-%A","%g-%V-%w", "%A week %V, %g", "day %V, week %A, %g",-     "%g-W%V-%u"-    ]+        ["%g-%V-%u", "%g-%V-%a", "%g-%V-%A", "%g-%V-%w", "%A week %V, %g", "day %V, week %A, %g", "%g-W%V-%u"]