time-compat 1.9.8 → 1.9.9

raw patch · 48 files changed

+5357/−5137 lines, 48 filesdep −taggeddep ~QuickCheckdep ~basedep ~random

Dependencies removed: tagged

Dependency ranges changed: QuickCheck, base, random, tasty, tasty-hunit, time

Files

• CHANGELOG.md +9/−0
• src/Data/Time/Calendar/Compat.hs +5/−97
• src/Data/Time/Calendar/DayPeriod.hs +119/−0
• src/Data/Time/Calendar/Month/Compat.hs +43/−10
• src/Data/Time/Calendar/Quarter/Compat.hs +18/−2
• src/Data/Time/Clock/Compat.hs +45/−1
• src/Data/Time/LocalTime/Compat.hs +2/−0
• src/Data/Time/Orphans.hs +22/−1
• test-instances/Test.hs +6/−0
• test/main/Main.hs +24/−24
• test/main/Test/Arbitrary.hs +117/−95
• test/main/Test/Calendar/AddDays.hs +30/−29
• test/main/Test/Calendar/AddDaysRef.hs +247/−247
• test/main/Test/Calendar/CalendarProps.hs +8/−7
• test/main/Test/Calendar/Calendars.hs +9/−8
• test/main/Test/Calendar/CalendarsRef.hs +6/−6
• test/main/Test/Calendar/ClipDates.hs +16/−17
• test/main/Test/Calendar/ClipDatesRef.hs +567/−567
• test/main/Test/Calendar/ConvertBack.hs +22/−23
• test/main/Test/Calendar/DayPeriod.hs +122/−127
• test/main/Test/Calendar/Duration.hs +60/−63
• test/main/Test/Calendar/Easter.hs +21/−22
• test/main/Test/Calendar/EasterRef.hs +59/−59
• test/main/Test/Calendar/LongWeekYears.hs +18/−17
• test/main/Test/Calendar/LongWeekYearsRef.hs +152/−152
• test/main/Test/Calendar/MonthDay.hs +34/−20
• test/main/Test/Calendar/MonthDayRef.hs +748/−748
• test/main/Test/Calendar/MonthOfYear.hs +16/−15
• test/main/Test/Calendar/Valid.hs +104/−109
• test/main/Test/Calendar/Week.hs +166/−174
• test/main/Test/Calendar/Year.hs +17/−16
• test/main/Test/Clock/Conversion.hs +17/−18
• test/main/Test/Clock/Lift.hs +0/−18
• test/main/Test/Clock/Pattern.hs +31/−0
• test/main/Test/Clock/Resolution.hs +44/−44
• test/main/Test/Clock/TAI.hs +44/−45
• test/main/Test/Format/Compile.hs +7/−16
• test/main/Test/Format/Format.hs +84/−162
• test/main/Test/Format/ISO8601.hs +294/−276
• test/main/Test/Format/ParseTime.hs +959/−881
• test/main/Test/LocalTime/CalendarDiffTime.hs +10/−25
• test/main/Test/LocalTime/Time.hs +62/−67
• test/main/Test/LocalTime/TimeOfDay.hs +15/−18
• test/main/Test/LocalTime/TimeRef.hs +890/−890
• test/main/Test/TestUtil.hs +11/−8
• test/main/Test/Types.hs +1/−1
• test/template/Main.hs +31/−0
• time-compat.cabal +25/−12

@@ -1,3 +1,12 @@+# 1.9.9++- Support `time-1.15`+  - add patterns for DiffTime & NominalDiffTime+  - add more Lift instances+  - fix MonthDay and QuarterDay clipping++# 1.9.8+ # 1.9.7  - Drop support for GHCs prior 8.6.5

@@ -2,7 +2,6 @@ {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE PatternSynonyms    #-} {-# LANGUAGE ViewPatterns       #-}-{-# LANGUAGE TypeSynonymInstances #-} module Data.Time.Calendar.Compat (     -- * Days     Day(..),addDays,diffDays,@@ -72,10 +71,6 @@ import Data.Time.Format import Data.Time.Orphans () -#if !MIN_VERSION_time(1,12,1)-import Data.Time.Calendar.Types-#endif- #if !MIN_VERSION_time(1,9,0) import Data.Time.Calendar.WeekDate.Compat #endif@@ -84,15 +79,15 @@ import Data.Time.Calendar.MonthDay.Compat #endif -#if !MIN_VERSION_time(1,12,0)-import Data.Time.Calendar.Types-#endif- #if !MIN_VERSION_time(1,12,1)+import Data.Time.Calendar.Types import Data.Time.Calendar.Month.Compat import Data.Time.Calendar.Quarter.Compat #endif +import Data.Time.Calendar.Types+import Data.Time.Calendar.DayPeriod+ import Control.DeepSeq (NFData (..)) import Data.Data       (Data, Typeable) import GHC.Generics   (Generic)@@ -100,6 +95,7 @@ import Data.Semigroup  (Semigroup (..)) import qualified Language.Haskell.TH.Syntax as TH + ------------------------------------------------------------------------------- -- CalendarDiffTime -------------------------------------------------------------------------------@@ -288,92 +284,4 @@ -- @since 1.12.2 weekLastDay :: DayOfWeek -> Day -> Day weekLastDay firstDay day = pred $ firstDayOfWeekOnAfter firstDay $ succ day-#endif------------------------------------------------------------------------------------ Days----------------------------------------------------------------------------------#if !MIN_VERSION_time(1,12,1)-class Ord p => DayPeriod p where-    -- | Returns the first 'Day' in a period of days.-    periodFirstDay :: p -> Day--    -- | Returns the last 'Day' in a period of days.-    periodLastDay :: p -> Day--    -- | Get the period this day is in.-    dayPeriod :: Day -> p---- | A list of all the days in this period.------ @since 1.12.1-periodAllDays :: DayPeriod p => p -> [Day]-periodAllDays p = [periodFirstDay p .. periodLastDay p]---- | The number of days in this period.------ @since 1.12.1-periodLength :: DayPeriod p => p -> Int-periodLength p = succ $ fromInteger $ diffDays (periodLastDay p) (periodFirstDay p)---- | Get the period this day is in, with the 1-based day number within the period.------ @periodFromDay (periodFirstDay p) = (p,1)@------ @since 1.12.1-periodFromDay :: DayPeriod p => Day -> (p, Int)-periodFromDay d =-    let-        p = dayPeriod d-        dt = succ $ fromInteger $ diffDays d $ periodFirstDay p-    in-        (p, dt)---- | Inverse of 'periodFromDay'.------ @since 1.12.1-periodToDay :: DayPeriod p => p -> Int -> Day-periodToDay p i = addDays (toInteger $ pred i) $ periodFirstDay p---- | Validating inverse of 'periodFromDay'.------ @since 1.12.1-periodToDayValid :: DayPeriod p => p -> Int -> Maybe Day-periodToDayValid p i =-    let-        d = periodToDay p i-    in-        if fst (periodFromDay d) == p then Just d else Nothing--instance DayPeriod Day where-    periodFirstDay = id-    periodLastDay = id-    dayPeriod = id--instance DayPeriod Year where-    periodFirstDay y = YearMonthDay y January 1-    periodLastDay y = YearMonthDay y December 31-    dayPeriod (YearMonthDay y _ _) = y--instance DayPeriod Month where-    periodFirstDay (YearMonth y m) = YearMonthDay y m 1-    periodLastDay (YearMonth y m) = YearMonthDay y m 31 -- clips to correct day-    dayPeriod (YearMonthDay y my _) = YearMonth y my--instance DayPeriod Quarter where-    periodFirstDay (YearQuarter y q) =-        case q of-            Q1 -> periodFirstDay $ YearMonth y January-            Q2 -> periodFirstDay $ YearMonth y April-            Q3 -> periodFirstDay $ YearMonth y July-            Q4 -> periodFirstDay $ YearMonth y October-    periodLastDay (YearQuarter y q) =-        case q of-            Q1 -> periodLastDay $ YearMonth y March-            Q2 -> periodLastDay $ YearMonth y June-            Q3 -> periodLastDay $ YearMonth y September-            Q4 -> periodLastDay $ YearMonth y December-    dayPeriod (MonthDay m _) = monthQuarter m- #endif

@@ -0,0 +1,119 @@+{-# LANGUAGE CPP #-}+{-# LANGUAGE TypeSynonymInstances #-}+module Data.Time.Calendar.DayPeriod (+    DayPeriod (..),+    periodAllDays,+    periodLength,+    periodFromDay,+    periodToDay,+    periodToDayClip,+    periodToDayValid,+) where++#if MIN_VERSION_time(1,15,0)+import Data.Time.Calendar++#elif MIN_VERSION_time(1,12,1)+import Data.Time.Calendar+import Data.Time.Calendar.Private++periodToDayClip :: DayPeriod p => p -> Int -> Day+periodToDayClip p i = periodToDay p $ clip 1 (periodLength p) i++#else+import Data.Time.Calendar+import Data.Time.Calendar.Private++#if MIN_VERSION_time(1,11,0)+import Data.Time.Calendar.Month+import Data.Time.Calendar.Quarter+#endif++class Ord p => DayPeriod p where+    -- | Returns the first 'Day' in a period of days.+    periodFirstDay :: p -> Day++    -- | Returns the last 'Day' in a period of days.+    periodLastDay :: p -> Day++    -- | Get the period this day is in.+    dayPeriod :: Day -> p++-- | A list of all the days in this period.+--+-- @since 1.12.1+periodAllDays :: DayPeriod p => p -> [Day]+periodAllDays p = [periodFirstDay p .. periodLastDay p]++-- | The number of days in this period.+--+-- @since 1.12.1+periodLength :: DayPeriod p => p -> Int+periodLength p = succ $ fromInteger $ diffDays (periodLastDay p) (periodFirstDay p)++-- | Get the period this day is in, with the 1-based day number within the period.+--+-- @periodFromDay (periodFirstDay p) = (p,1)@+--+-- @since 1.12.1+periodFromDay :: DayPeriod p => Day -> (p, Int)+periodFromDay d =+    let+        p = dayPeriod d+        dt = succ $ fromInteger $ diffDays d $ periodFirstDay p+    in+        (p, dt)++-- | Inverse of 'periodFromDay'.+--+-- @since 1.12.1+periodToDay :: DayPeriod p => p -> Int -> Day+periodToDay p i = addDays (toInteger $ pred i) $ periodFirstDay p++periodToDayClip :: DayPeriod p => p -> Int -> Day+periodToDayClip p i = periodToDay p $ clip 1 (periodLength p) i++-- | Validating inverse of 'periodFromDay'.+--+-- @since 1.12.1+periodToDayValid :: DayPeriod p => p -> Int -> Maybe Day+periodToDayValid p i =+    let+        d = periodToDay p i+    in+        if fst (periodFromDay d) == p then Just d else Nothing++instance DayPeriod Day where+    periodFirstDay = id+    periodLastDay = id+    dayPeriod = id++-- Year instance+instance DayPeriod Integer where+    periodFirstDay y = fromGregorian y 1 1+    periodLastDay y = fromGregorian y 12 31+    dayPeriod (toGregorian -> (y,_,_)) = y++#if MIN_VERSION_time(1,11,0)+instance DayPeriod Month where+    periodFirstDay (YearMonth y m) = YearMonthDay y m 1+    periodLastDay (YearMonth y m) = YearMonthDay y m 31 -- clips to correct day+    dayPeriod (YearMonthDay y my _) = YearMonth y my++instance DayPeriod Quarter where+    periodFirstDay (YearQuarter y q) =+        case q of+            Q1 -> periodFirstDay $ YearMonth y 1+            Q2 -> periodFirstDay $ YearMonth y 4+            Q3 -> periodFirstDay $ YearMonth y 7+            Q4 -> periodFirstDay $ YearMonth y 10+    periodLastDay (YearQuarter y q) =+        case q of+            Q1 -> periodLastDay $ YearMonth y 3+            Q2 -> periodLastDay $ YearMonth y 6+            Q3 -> periodLastDay $ YearMonth y 9+            Q4 -> periodLastDay $ YearMonth y 12+    dayPeriod (MonthDay m _) = monthQuarter m+#endif++#endif

@@ -12,7 +12,8 @@     toMonthDay, ) where -#if MIN_VERSION_time(1,11,0)+#if MIN_VERSION_time(1,15,0)+ import Data.Time.Calendar import Data.Time.Calendar.Month @@ -32,6 +33,36 @@ toMonthDay :: Day -> (Month,DayOfMonth) toMonthDay (MonthDay m d) = (m, d) +#elif MIN_VERSION_time(1,11,0)++import Data.Time.Calendar (Year,MonthOfYear,Day,DayOfMonth)+import Data.Time.Calendar.DayPeriod+import Data.Time.Calendar.Month hiding (MonthDay)++-- | 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+toMonthDay :: Day -> (Month,DayOfMonth)+toMonthDay = periodFromDay++-- | Part of 'MonthDay' pattern+fromMonthDay :: Month -> DayOfMonth -> Day+fromMonthDay = periodToDayClip++-- | 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 = fromMonthDay++{-# COMPLETE MonthDay #-}+ #else  #if MIN_VERSION_time(1,9,0)@@ -43,8 +74,8 @@ 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.Time.Calendar.DayPeriod import Data.Data import Data.Fixed import Text.Read@@ -137,7 +168,7 @@ fromYearMonthValid :: Year -> MonthOfYear -> Maybe Month fromYearMonthValid y my = do     my' <- clipValid 1 12 my-    return $ fromYearMonth y my'+    return $ YearMonth y my'  -- | Part of @YearMonth@ pattern fromYearMonth :: Year -> MonthOfYear -> Month@@ -158,24 +189,26 @@  -- | Part of 'MonthDay' pattern toMonthDay :: Day -> (Month,DayOfMonth)-toMonthDay d = case toGregorian d of-    (y, my, dm) -> (fromYearMonth y my, dm)+toMonthDay = periodFromDay  -- | Part of 'MonthDay' pattern fromMonthDay :: Month -> DayOfMonth -> Day-fromMonthDay m dm = case toYearMonth m of-    (y, my) -> fromGregorian y my dm+fromMonthDay = periodToDayClip  fromMonthDayValid :: Month -> DayOfMonth -> Maybe Day-fromMonthDayValid m dm = case toYearMonth m of-    (y, my) -> fromGregorianValid y my dm+fromMonthDayValid = periodToDayValid  -- | 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+    MonthDay = fromMonthDay  {-# COMPLETE MonthDay #-}++instance DayPeriod Month where+    periodFirstDay (YearMonth y m) = fromGregorian y m 1+    periodLastDay (YearMonth y m) = fromGregorian y m 31 -- clips to correct day+    dayPeriod (toGregorian -> (y, my, _)) = YearMonth y my  #endif

@@ -40,6 +40,7 @@ import Data.Time.Calendar import Data.Time.Calendar.Types import Data.Time.Calendar.Private+import Data.Time.Calendar.DayPeriod import Data.Time.Calendar.Month.Compat  -- | Quarters of each year. Each quarter corresponds to three months.@@ -72,8 +73,8 @@     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, Generic)+-- Number is equal to @(year * 6) + (quarterOfYear - 1)@.+newtype Quarter = MkQuarter Integer deriving (Eq, Ord, Data, Typeable, TH.Lift, Generic)  instance NFData Quarter where     rnf (MkQuarter m) = rnf m@@ -146,5 +147,20 @@ toYearQuarter :: Quarter -> (Year, QuarterOfYear) toYearQuarter (MkQuarter y) = case divMod' y 4 of     (y, qy) -> (y, toEnum (succ (fromInteger qy)))++instance DayPeriod Quarter where+    periodFirstDay (YearQuarter y q) =+        case q of+            Q1 -> periodFirstDay $ YearMonth y 1+            Q2 -> periodFirstDay $ YearMonth y 4+            Q3 -> periodFirstDay $ YearMonth y 7+            Q4 -> periodFirstDay $ YearMonth y 10+    periodLastDay (YearQuarter y q) =+        case q of+            Q1 -> periodLastDay $ YearMonth y 3+            Q2 -> periodLastDay $ YearMonth y 6+            Q3 -> periodLastDay $ YearMonth y 9+            Q4 -> periodLastDay $ YearMonth y 12+    dayPeriod (MonthDay m _) = monthQuarter m  #endif

@@ -7,6 +7,10 @@      -- * Absolute intervals, DiffTime     DiffTime,+    pattern Picoseconds,+    pattern Seconds,+    pattern Minutes,+    pattern Hours,     secondsToDiffTime,     picosecondsToDiffTime,     diffTimeToPicoseconds,@@ -16,6 +20,7 @@      -- * NominalDiffTime     NominalDiffTime,+    pattern Nominal,     secondsToNominalDiffTime,     nominalDiffTimeToSeconds,     nominalDay,@@ -38,8 +43,47 @@ import Data.Time.Calendar.Types  import Data.Time.Clock-import Data.Fixed (Pico)+import Data.Fixed (Pico, Fixed (MkFixed)) import Debug.Trace++#if !MIN_VERSION_time(1,15,0)+pattern Picoseconds :: Integer -> DiffTime+pattern Picoseconds a <- (diffTimeToPicoseconds -> a)+    where+        Picoseconds a = picosecondsToDiffTime a++{-# COMPLETE Picoseconds #-}++pattern Seconds :: Pico -> DiffTime+pattern Seconds a <- (MkFixed . diffTimeToPicoseconds -> a)+  where+        Seconds a = picosecondsToDiffTime (case a of MkFixed a' -> a')++{-# COMPLETE Seconds #-}++pattern Minutes :: Pico -> DiffTime+pattern Minutes a <- Seconds ((/ 60) -> a)+    where+        Minutes a = Seconds $ a * 60++{-# COMPLETE Minutes #-}++pattern Hours :: Pico -> DiffTime+pattern Hours a <- Minutes ((/ 60) -> a)+    where+        Hours a = Minutes $ a * 60++{-# COMPLETE Hours #-}++-- | convert from DiffTime+pattern Nominal :: DiffTime -> NominalDiffTime+pattern Nominal dt <- (Seconds . nominalDiffTimeToSeconds -> dt)+    where+        Nominal dt = secondsToNominalDiffTime (case dt of Seconds dt' -> dt')++{-# COMPLETE Nominal #-}++#endif  #if !MIN_VERSION_time(1,9,1) 

@@ -36,6 +36,7 @@ import Data.Time.Clock.Compat import Data.Time.Calendar.Compat import Data.Time.Format.Compat+import qualified Language.Haskell.TH.Syntax as TH  import Data.Fixed (Pico (..), showFixed, divMod') import Data.Monoid (Monoid (..))@@ -95,6 +96,7 @@     Data     ,Typeable     , Generic+    , TH.Lift     )  -- | Additive

@@ -32,7 +32,7 @@ import Data.Time.Calendar.WeekDate #endif -#if !MIN_VERSION_time(1,14,0)+#if !MIN_VERSION_time(1,15,0) import GHC.Generics (Generic) import qualified Language.Haskell.TH.Syntax as TH import Data.Fixed (Fixed (..), Pico)@@ -132,6 +132,27 @@ ------------------------------------------------------------------------------- -- Lift & Generic -------------------------------------------------------------------------------++#if !MIN_VERSION_time(1,15,0)+deriving instance TH.Lift LocalTime+deriving instance TH.Lift TimeZone+deriving instance TH.Lift ZonedTime++#if MIN_VERSION_time(1,9,2)+deriving instance TH.Lift CalendarDiffTime+#endif++#if MIN_VERSION_time(1,11,0)+deriving instance TH.Lift Quarter+#endif++instance TH.Lift TimeOfDay where+  lift (TimeOfDay h m (MkFixed s)) = [| TimeOfDay h m (MkFixed s) |]++#if MIN_VERSION_template_haskell(2,16,0)+  liftTyped (TimeOfDay h m (MkFixed s)) = [|| TimeOfDay h m (MkFixed s) ||]+#endif+#endif  #if !MIN_VERSION_time(1,14,0) deriving instance TH.Lift Day

@@ -60,6 +60,7 @@     , inst (P @TimeZone) (P @FormatTime)     , inst (P @TimeZone) (P @ISO8601)     , inst (P @TimeZone) (P @ParseTime)+    , inst (P @TimeZone) (P @TH.Lift)      , inst (P @TimeOfDay) (P @Data)     , inst (P @TimeOfDay) (P @Generic)@@ -71,6 +72,7 @@     , inst (P @TimeOfDay) (P @FormatTime)     , inst (P @TimeOfDay) (P @ISO8601)     , inst (P @TimeOfDay) (P @ParseTime)+    , inst (P @TimeOfDay) (P @TH.Lift)      , inst (P @CalendarDiffTime) (P @Data)     , inst (P @CalendarDiffTime) (P @Mon.Monoid)@@ -83,6 +85,7 @@     -- , inst (P @CalendarDiffTime) (P @FormatTime)     , inst (P @CalendarDiffTime) (P @ISO8601)     -- , inst (P @CalendarDiffTime) (P @ParseTime)+    , inst (P @CalendarDiffTime) (P @TH.Lift)      , inst (P @LocalTime) (P @Data)     , inst (P @LocalTime) (P @Generic)@@ -94,6 +97,7 @@     , inst (P @LocalTime) (P @FormatTime)     , inst (P @LocalTime) (P @ISO8601)     , inst (P @LocalTime) (P @ParseTime)+    , inst (P @LocalTime) (P @TH.Lift)      , inst (P @ZonedTime) (P @Data)     , inst (P @ZonedTime) (P @Generic)@@ -103,6 +107,7 @@     , inst (P @ZonedTime) (P @FormatTime)     , inst (P @ZonedTime) (P @ISO8601)     , inst (P @ZonedTime) (P @ParseTime)+    , inst (P @ZonedTime) (P @TH.Lift)      , inst (P @UniversalTime) (P @Data)     , inst (P @UniversalTime) (P @Generic)@@ -201,6 +206,7 @@     , inst (P @Quarter) (P @Eq)     , inst (P @Quarter) (P @Ord)     , inst (P @Quarter) (P @Generic)+    , inst (P @Quarter) (P @TH.Lift)      , inst (P @QuarterOfYear) (P @Data)     , inst (P @QuarterOfYear) (P @Read)

@@ -15,7 +15,7 @@ import Test.Calendar.Week import Test.Calendar.Year import Test.Clock.Conversion-import Test.Clock.Lift (testLift)+import Test.Clock.Pattern import Test.Clock.Resolution import Test.Clock.TAI import Test.Format.Compile ()@@ -30,29 +30,29 @@  tests :: TestTree tests =-    testGroup-        "Time"-        [ testGroup-            "Calendar"-            [ addDaysTest-            , testCalendarProps-            , testCalendars-            , clipDates-            , convertBack-            , longWeekYears-            , testDayPeriod-            , testMonthDay-            , testMonthOfYear-            , testEaster-            , testValid-            , testWeek-            , testYear-            , testDuration-            ]-        , testGroup "Clock" [testClockConversion, testResolutions, testTAI, testLift]-        -- , testGroup "Format" [testFormat, testParseTime, testISO8601]-        , testGroup "LocalTime" [{- testTime, -} testTimeOfDay, testCalendarDiffTime]-        ]+  testGroup+    "Time"+    [ testGroup+        "Calendar"+        [ addDaysTest,+          testCalendarProps,+          testCalendars,+          clipDates,+          convertBack,+          longWeekYears,+          testDayPeriod,+          testMonthDay,+          testMonthOfYear,+          testEaster,+          testValid,+          testWeek,+          testYear,+          testDuration+        ],+      testGroup "Clock" [testClockPatterns, testClockConversion, testResolutions, testTAI],+      -- TODO: testGroup "Format" [testFormat, testParseTime, testISO8601],+      testGroup "LocalTime" [{- TODO: testTime, -} testTimeOfDay, testCalendarDiffTime]+    ]  main :: IO () main = defaultMain tests

@@ -1,36 +1,71 @@ {-# OPTIONS -fno-warn-orphans #-} -module Test.Arbitrary where+module Test.Arbitrary (supportedDayRange) where  import Control.Monad import Data.Fixed import Data.Ratio-import Data.Time.Compat import Data.Time.Calendar.Month.Compat import Data.Time.Calendar.Quarter.Compat import Data.Time.Calendar.WeekDate.Compat import Data.Time.Clock.POSIX.Compat+import Data.Time.Compat import System.Random 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+  arbitrary = do+    b <- arbitrary+    return $ if b then FirstWholeWeek else FirstMostWeek  deriving instance Show FirstWeekType +deriving instance Random Month++supportedMonthRange :: (Month, Month)+supportedMonthRange = (YearMonth (-9899) 1, YearMonth 9999 12)++shrinkYear :: Integer -> [Integer]+shrinkYear y =+  let yearShrink =+        if y > 2000+          then [pred y]+          else+            if y < 2000+              then [succ y]+              else []+      year10Shrink =+        if y > 2010+          then fmap (\i -> y - i) [1 .. 10]+          else+            if y < 1990+              then fmap (\i -> y + i) [1 .. 10]+              else []+      year100Shrink =+        if y > 2100+          then [y - 100]+          else+            if y < 1900+              then [y + 100]+              else []+   in year100Shrink <> year10Shrink <> yearShrink+ instance Arbitrary Month where-    arbitrary = liftM MkMonth $ choose (-30000, 200000)+  arbitrary = choose supportedMonthRange  instance Arbitrary Quarter where-    arbitrary = liftM MkQuarter $ choose (-30000, 200000)+  arbitrary = fmap monthQuarter arbitrary+  shrink (YearQuarter y qoy) =+    fmap (\y' -> YearQuarter y' qoy) (shrinkYear y)+      <> fmap (YearQuarter y) (shrink qoy)  instance Arbitrary QuarterOfYear where-    arbitrary = liftM toEnum $ choose (1, 4)+  arbitrary = liftM toEnum $ choose (1, 4)+  shrink Q1 = []+  shrink _ = [Q1]  deriving instance Random Day @@ -38,131 +73,118 @@ supportedDayRange = (fromGregorian (-9899) 1 1, fromGregorian 9999 12 31)  instance Arbitrary Day where-    arbitrary = choose supportedDayRange-    shrink day =-        let-            (y, m, d) = toGregorian day-            dayShrink =-                if d > 1-                    then [fromGregorian y m (d - 1)]-                    else []-            monthShrink =-                if m > 1-                    then [fromGregorian y (m - 1) d]-                    else []-            yearShrink =-                if y > 2000-                    then [fromGregorian (y - 1) m d]-                    else-                        if y < 2000-                            then [fromGregorian (y + 1) m d]-                            else []-        in-            dayShrink ++ monthShrink ++ yearShrink+  arbitrary = choose supportedDayRange+  shrink day =+    let (y, m, d) = toGregorian day+        dayShrink =+          if d > 1+            then [fromGregorian y m (d - 1)]+            else []+        monthShrink =+          if m > 1+            then [fromGregorian y (m - 1) d]+            else []+     in dayShrink <> monthShrink <> fmap (\y' -> fromGregorian y' m d) (shrinkYear y)  instance CoArbitrary Day where-    coarbitrary (ModifiedJulianDay d) = coarbitrary d+  coarbitrary (ModifiedJulianDay d) = coarbitrary d  instance Arbitrary CalendarDiffDays where-    arbitrary = liftM2 CalendarDiffDays arbitrary arbitrary+  arbitrary = liftM2 CalendarDiffDays arbitrary arbitrary  instance Arbitrary DiffTime where-    arbitrary = oneof [intSecs, fracSecs] -- up to 1 leap second-      where-        intSecs = liftM secondsToDiffTime' $ choose (0, 86400)-        fracSecs = liftM picosecondsToDiffTime' $ choose (0, 86400 * 10 ^ (12 :: Int))-        secondsToDiffTime' :: Integer -> DiffTime-        secondsToDiffTime' = fromInteger-        picosecondsToDiffTime' :: Integer -> DiffTime-        picosecondsToDiffTime' x = fromRational (x % 10 ^ (12 :: Int))+  arbitrary = oneof [intSecs, fracSecs] -- up to 1 leap second+    where+      intSecs = liftM secondsToDiffTime' $ choose (0, 86400)+      fracSecs = liftM picosecondsToDiffTime' $ choose (0, 86400 * 10 ^ (12 :: Int))+      secondsToDiffTime' :: Integer -> DiffTime+      secondsToDiffTime' = fromInteger+      picosecondsToDiffTime' :: Integer -> DiffTime+      picosecondsToDiffTime' x = fromRational (x % 10 ^ (12 :: Int))  instance CoArbitrary DiffTime where-    coarbitrary t = coarbitrary (fromEnum t)+  coarbitrary t = coarbitrary (fromEnum t)  instance Arbitrary NominalDiffTime where-    arbitrary = oneof [intSecs, fracSecs]-      where-        limit = 1000 * 86400-        picofactor = 10 ^ (12 :: Int)-        intSecs = liftM secondsToDiffTime' $ choose (negate limit, limit)-        fracSecs = liftM picosecondsToDiffTime' $ choose (negate limit * picofactor, limit * picofactor)-        secondsToDiffTime' :: Integer -> NominalDiffTime-        secondsToDiffTime' = fromInteger-        picosecondsToDiffTime' :: Integer -> NominalDiffTime-        picosecondsToDiffTime' x = fromRational (x % 10 ^ (12 :: Int))+  arbitrary = oneof [intSecs, fracSecs]+    where+      limit = 1000 * 86400+      picofactor = 10 ^ (12 :: Int)+      intSecs = liftM secondsToDiffTime' $ choose (negate limit, limit)+      fracSecs = liftM picosecondsToDiffTime' $ choose (negate limit * picofactor, limit * picofactor)+      secondsToDiffTime' :: Integer -> NominalDiffTime+      secondsToDiffTime' = fromInteger+      picosecondsToDiffTime' :: Integer -> NominalDiffTime+      picosecondsToDiffTime' x = fromRational (x % 10 ^ (12 :: Int))  instance CoArbitrary NominalDiffTime where-    coarbitrary t = coarbitrary (fromEnum t)+  coarbitrary t = coarbitrary (fromEnum t)  instance Arbitrary CalendarDiffTime where-    arbitrary = liftM2 CalendarDiffTime arbitrary arbitrary+  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+  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]+  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)+  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]+  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)+  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]+  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)+  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]+  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)+  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+  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)+  coarbitrary t = coarbitrary (floor (utcTimeToPOSIXSeconds t) :: Integer)  instance Arbitrary UniversalTime where-    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+  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+  coarbitrary (ModJulianDate d) = coarbitrary d

@@ -1,6 +1,7 @@-module Test.Calendar.AddDays (-    addDaysTest,-) where+module Test.Calendar.AddDays+  ( addDaysTest,+  )+where  import Data.Time.Calendar.Compat import Test.Calendar.AddDaysRef@@ -9,41 +10,41 @@  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]  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-    increment <- increments-    day <- days-    return-        ( (showGregorian day)-            ++ " + "-            ++ (show increment)-            ++ " * "-            ++ aname-            ++ " = "-            ++ showGregorian (adder increment day)-        )+  (aname, adder) <- adders+  increment <- increments+  day <- days+  return+    ( (showGregorian day)+        ++ " + "+        ++ (show increment)+        ++ " * "+        ++ aname+        ++ " = "+        ++ showGregorian (adder increment day)+    )  addDaysTest :: TestTree addDaysTest = testCase "addDays" $ assertEqual "" addDaysRef $ unlines resultDays

@@ -2,250 +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"+    ]

@@ -1,6 +1,7 @@-module Test.Calendar.CalendarProps (-    testCalendarProps,-) where+module Test.Calendar.CalendarProps+  ( testCalendarProps,+  )+where  import Data.Time.Calendar.Month.Compat import Data.Time.Calendar.Quarter.Compat@@ -10,15 +11,15 @@  testYearMonth :: TestTree testYearMonth = nameTest "YearMonth" $ \m -> case m of-    YearMonth y my -> m == YearMonth y my+  YearMonth y my -> m == YearMonth y my  testMonthDay :: TestTree testMonthDay = nameTest "MonthDay" $ \d -> case d of-    MonthDay m dm -> d == MonthDay m dm+  MonthDay m dm -> d == MonthDay m dm  testYearQuarter :: TestTree testYearQuarter = nameTest "YearQuarter" $ \q -> case q of-    YearQuarter y qy -> q == YearQuarter y qy+  YearQuarter y qy -> q == YearQuarter y qy  testCalendarProps :: TestTree-testCalendarProps = nameTest "calender-props" [testYearMonth, testMonthDay, testYearQuarter]+testCalendarProps = nameTest "calendar-props" [testYearMonth, testMonthDay, testYearQuarter]

@@ -1,6 +1,7 @@-module Test.Calendar.Calendars (-    testCalendars,-) where+module Test.Calendar.Calendars+  ( testCalendars,+  )+where  import Data.Time.Calendar.Compat import Data.Time.Calendar.Julian.Compat@@ -11,11 +12,11 @@  showers :: [(String, Day -> String)] showers =-    [ ("MJD", show . toModifiedJulianDay)-    , ("Gregorian", showGregorian)-    , ("Julian", showJulian)-    , ("ISO 8601", showWeekDate)-    ]+  [ ("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]

@@ -2,9 +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,6 +1,7 @@-module Test.Calendar.ClipDates (-    clipDates,-) where+module Test.Calendar.ClipDates+  ( clipDates,+  )+where  import Data.Time.Calendar.Compat import Data.Time.Calendar.OrdinalDate.Compat@@ -24,10 +25,8 @@  tupleUp3 :: [a] -> [b] -> [c] -> [(a, b, c)] tupleUp3 l1 l2 l3 =-    let-        ts = tupleUp2 l2 l3-    in-        concatMap (\e -> map (\(f, g) -> (e, f, g)) ts) l1+  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@@ -35,13 +34,13 @@ -- clipDates :: TestTree 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]-        ]+  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]+    ]

@@ -2,570 +2,570 @@  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"-    ]+  [ "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,6 +1,7 @@-module Test.Calendar.ConvertBack (-    convertBack,-) where+module Test.Calendar.ConvertBack+  ( convertBack,+  )+where  import Data.Time.Calendar.Compat import Data.Time.Calendar.Julian.Compat@@ -9,30 +10,28 @@ import Test.Tasty import Test.Tasty.HUnit -checkDay :: Show t => (Day -> t) -> (t -> Day) -> (t -> Maybe Day) -> Day -> String+checkDay :: (Show t) => (Day -> t) -> (t -> Day) -> (t -> Maybe Day) -> Day -> String checkDay encodeDay decodeDay decodeDayValid day =-    let-        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 ""-    in-        a ++ b+  let 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 ""+   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)-    ]+  [ 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])

@@ -1,6 +1,7 @@-module Test.Calendar.DayPeriod (-    testDayPeriod,-) where+module Test.Calendar.DayPeriod+  ( testDayPeriod,+  )+where  import Data.Time.Calendar.Compat import Data.Time.Calendar.Month.Compat@@ -11,171 +12,165 @@ import Test.Tasty.QuickCheck  newtype WDay = MkWDay Day-    deriving (Eq, Show)+  deriving (Eq, Show)  instance Arbitrary WDay where-    arbitrary = do-        (MkWYear y) <- arbitrary-        (MkWMonthOfYear m) <- arbitrary-        (MkWDayOfMonth d) <- arbitrary-        pure $ MkWDay $ YearMonthDay y m d+  arbitrary = do+    (MkWYear y) <- arbitrary+    (MkWMonthOfYear m) <- arbitrary+    (MkWDayOfMonth d) <- arbitrary+    pure $ MkWDay $ YearMonthDay y m d  newtype WYear = MkWYear Year-    deriving (Eq, Show)+  deriving (Eq, Show)  instance Arbitrary WYear where-    arbitrary = fmap MkWYear $ choose (-1000, 3000)+  arbitrary = fmap MkWYear $ choose (-1000, 3000)  newtype WMonthOfYear = MkWMonthOfYear MonthOfYear-    deriving (Eq, Show)+  deriving (Eq, Show)  instance Arbitrary WMonthOfYear where-    arbitrary = fmap MkWMonthOfYear $ choose (-5, 17)+  arbitrary = fmap MkWMonthOfYear $ choose (-5, 17)  newtype WMonth = MkWMonth Month-    deriving (Eq, Show)+  deriving (Eq, Show)  instance Arbitrary WMonth where-    arbitrary = do-        (MkWYear y) <- arbitrary-        (MkWMonthOfYear m) <- arbitrary-        pure $ MkWMonth $ YearMonth y m+  arbitrary = do+    (MkWYear y) <- arbitrary+    (MkWMonthOfYear m) <- arbitrary+    pure $ MkWMonth $ YearMonth y m  newtype WDayOfMonth = MkWDayOfMonth DayOfMonth-    deriving (Eq, Show)+  deriving (Eq, Show)  instance Arbitrary WDayOfMonth where-    arbitrary = fmap MkWDayOfMonth $ choose (-5, 35)+  arbitrary = fmap MkWDayOfMonth $ choose (-5, 35)  newtype WQuarterOfYear = MkWQuarterOfYear QuarterOfYear-    deriving (Eq, Show)+  deriving (Eq, Show)  instance Arbitrary WQuarterOfYear where-    arbitrary = fmap MkWQuarterOfYear $ elements [Q1 .. Q4]+  arbitrary = fmap MkWQuarterOfYear $ elements [Q1 .. Q4]  newtype WQuarter = MkWQuarter Quarter-    deriving (Eq, Show)+  deriving (Eq, Show)  instance Arbitrary WQuarter where-    arbitrary = do-        (MkWYear y) <- arbitrary-        (MkWQuarterOfYear q) <- arbitrary-        pure $ MkWQuarter $ YearQuarter y q+  arbitrary = do+    (MkWYear y) <- arbitrary+    (MkWQuarterOfYear q) <- arbitrary+    pure $ MkWQuarter $ YearQuarter y q  testDayPeriod :: TestTree testDayPeriod =-    testGroup-        "DayPeriod"-        [ testGroup "Day" testDay-        , testGroup "Month" testMonth-        , testGroup "Quarter" testQuarter-        , testGroup "Year" testYear-        , testGroup "Week" testWeek-        ]+  testGroup+    "DayPeriod"+    [ testGroup "Day" testDay,+      testGroup "Month" testMonth,+      testGroup "Quarter" testQuarter,+      testGroup "Year" testYear,+      testGroup "Week" testWeek+    ]  testDay :: [TestTree] testDay =-    [ testProperty "periodFirstDay" $ \(MkWDay d) ->-        periodFirstDay d == d-    , testProperty "periodLastDay" $ \(MkWDay d) ->-        periodLastDay d == d-    , testProperty "dayPeriod" $ \(MkWDay d) ->-        dayPeriod d == d-    , testProperty "periodAllDays" $ \(MkWDay d) ->-        periodAllDays d == [d]-    , testProperty "periodLength" $ \(MkWDay d) ->-        periodLength d == 1-    ]+  [ testProperty "periodFirstDay" $ \(MkWDay d) ->+      periodFirstDay d == d,+    testProperty "periodLastDay" $ \(MkWDay d) ->+      periodLastDay d == d,+    testProperty "dayPeriod" $ \(MkWDay d) ->+      dayPeriod d == d,+    testProperty "periodAllDays" $ \(MkWDay d) ->+      periodAllDays d == [d],+    testProperty "periodLength" $ \(MkWDay d) ->+      periodLength d == 1+  ]  testMonth :: [TestTree] testMonth =-    [ testProperty "periodFirstDay" $ \(MkWMonth my@(YearMonth y m)) ->-        periodFirstDay my == YearMonthDay y m 1-    , testGroup-        "periodLastDay"-        [ testCase "leap year" $-            periodLastDay (YearMonth 2024 February) @?= YearMonthDay 2024 February 29-        , testCase "regular year" $-            periodLastDay (YearMonth 2023 February) @?= YearMonthDay 2023 February 28-        ]-    , testProperty "dayPeriod" $ \(MkWMonth my@(YearMonth y m), MkWDayOfMonth d) ->-        dayPeriod (YearMonthDay y m d) == my-    , testProperty "periodAllDays" $ \(MkWMonth my@(YearMonth y1 m1)) ->-        all (== (y1, m1)) $ map (\(YearMonthDay y2 m2 _) -> (y2, m2)) $ periodAllDays my-    , testGroup-        "periodLength"-        [ testProperty "property tests" $ \(MkWMonth my) ->-            periodLength my >= 28-        , testCase "leap year" $-            periodLength (YearMonth 2024 February) @?= 29-        , testCase "regular year" $-            periodLength (YearMonth 2023 February) @?= 28-        ]-    ]+  [ testProperty "periodFirstDay" $ \(MkWMonth my@(YearMonth y m)) ->+      periodFirstDay my == YearMonthDay y m 1,+    testGroup+      "periodLastDay"+      [ testCase "leap year" $+          periodLastDay (YearMonth 2024 February) @?= YearMonthDay 2024 February 29,+        testCase "regular year" $+          periodLastDay (YearMonth 2023 February) @?= YearMonthDay 2023 February 28+      ],+    testProperty "dayPeriod" $ \(MkWMonth my@(YearMonth y m), MkWDayOfMonth d) ->+      dayPeriod (YearMonthDay y m d) == my,+    testProperty "periodAllDays" $ \(MkWMonth my@(YearMonth y1 m1)) ->+      all (== (y1, m1)) $ map (\(YearMonthDay y2 m2 _) -> (y2, m2)) $ periodAllDays my,+    testGroup+      "periodLength"+      [ testProperty "property tests" $ \(MkWMonth my) ->+          periodLength my >= 28,+        testCase "leap year" $+          periodLength (YearMonth 2024 February) @?= 29,+        testCase "regular year" $+          periodLength (YearMonth 2023 February) @?= 28+      ]+  ]  testQuarter :: [TestTree] testQuarter =-    [ testGroup-        "periodFirstDay"-        [ testProperty "Q1" $ \(MkWYear y) ->-            periodFirstDay (YearQuarter y Q1) == YearMonthDay y January 1-        , testProperty "Q2" $ \(MkWYear y) ->-            periodFirstDay (YearQuarter y Q2) == YearMonthDay y April 1-        , testProperty "Q3" $ \(MkWYear y) ->-            periodFirstDay (YearQuarter y Q3) == YearMonthDay y July 1-        , testProperty "Q4" $ \(MkWYear y) ->-            periodFirstDay (YearQuarter y Q4) == YearMonthDay y October 1-        ]-    , testGroup-        "periodLastDay"-        [ testProperty "Q1" $ \(MkWYear y) ->-            periodLastDay (YearQuarter y Q1) == YearMonthDay y March 31-        , testProperty "Q2" $ \(MkWYear y) ->-            periodLastDay (YearQuarter y Q2) == YearMonthDay y June 30-        , testProperty "Q3" $ \(MkWYear y) ->-            periodLastDay (YearQuarter y Q3) == YearMonthDay y September 30-        , testProperty "Q4" $ \(MkWYear y) ->-            periodLastDay (YearQuarter y Q4) == YearMonthDay y December 31-        ]-    , testProperty "dayPeriod" $ \(MkWMonth my@(YearMonth y m), MkWDayOfMonth d) ->-        dayPeriod (YearMonthDay y m d) == monthQuarter my-    , testProperty "periodAllDays" $ \(MkWQuarter q) ->-        all (== q) $ map dayQuarter $ periodAllDays q-    , testProperty "periodLength" $ \(MkWQuarter q) ->-        periodLength q >= 90-    ]+  [ testGroup+      "periodFirstDay"+      [ testProperty "Q1" $ \(MkWYear y) ->+          periodFirstDay (YearQuarter y Q1) == YearMonthDay y January 1,+        testProperty "Q2" $ \(MkWYear y) ->+          periodFirstDay (YearQuarter y Q2) == YearMonthDay y April 1,+        testProperty "Q3" $ \(MkWYear y) ->+          periodFirstDay (YearQuarter y Q3) == YearMonthDay y July 1,+        testProperty "Q4" $ \(MkWYear y) ->+          periodFirstDay (YearQuarter y Q4) == YearMonthDay y October 1+      ],+    testGroup+      "periodLastDay"+      [ testProperty "Q1" $ \(MkWYear y) ->+          periodLastDay (YearQuarter y Q1) == YearMonthDay y March 31,+        testProperty "Q2" $ \(MkWYear y) ->+          periodLastDay (YearQuarter y Q2) == YearMonthDay y June 30,+        testProperty "Q3" $ \(MkWYear y) ->+          periodLastDay (YearQuarter y Q3) == YearMonthDay y September 30,+        testProperty "Q4" $ \(MkWYear y) ->+          periodLastDay (YearQuarter y Q4) == YearMonthDay y December 31+      ],+    testProperty "dayPeriod" $ \(MkWMonth my@(YearMonth y m), MkWDayOfMonth d) ->+      dayPeriod (YearMonthDay y m d) == monthQuarter my,+    testProperty "periodAllDays" $ \(MkWQuarter q) ->+      all (== q) $ map dayQuarter $ periodAllDays q,+    testProperty "periodLength" $ \(MkWQuarter q) ->+      periodLength q >= 90+  ]  testYear :: [TestTree] testYear =-    [ testProperty "periodFirstDay" $ \(MkWYear y) ->-        periodFirstDay y == YearMonthDay y January 1-    , testProperty "periodLastDay" $ \(MkWYear y) ->-        periodLastDay y == YearMonthDay y December 31-    , testProperty "dayPeriod" $ \(MkWYear y, MkWMonthOfYear m, MkWDayOfMonth d) ->-        dayPeriod (YearMonthDay y m d) == y-    , testProperty "periodAllDays" $ \(MkWYear y1) ->-        all (== y1) $ map (\(YearMonthDay y2 _ _) -> y2) $ periodAllDays y1-    , testProperty "periodLength" $ \(MkWYear y) ->-        periodLength y >= 365-    ]+  [ testProperty "periodFirstDay" $ \(MkWYear y) ->+      periodFirstDay y == YearMonthDay y January 1,+    testProperty "periodLastDay" $ \(MkWYear y) ->+      periodLastDay y == YearMonthDay y December 31,+    testProperty "dayPeriod" $ \(MkWYear y, MkWMonthOfYear m, MkWDayOfMonth d) ->+      dayPeriod (YearMonthDay y m d) == y,+    testProperty "periodAllDays" $ \(MkWYear y1) ->+      all (== y1) $ map (\(YearMonthDay y2 _ _) -> y2) $ periodAllDays y1,+    testProperty "periodLength" $ \(MkWYear y) ->+      periodLength y >= 365+  ]  testWeek :: [TestTree] testWeek =-    [ testProperty "weekFirstDay/weekLastDay range" $ \dw (MkWDay d) ->-        let-            f = weekFirstDay dw d-            l = weekLastDay dw d-        in-            f <= d && d <= l-    , testProperty "weekFirstDay/weekLastDay range" $ \dw (MkWDay d) ->-        let-            f = weekFirstDay dw d-            l = weekLastDay dw d-        in-            addDays 6 f == l-    , testProperty "weekFirstDay dayOfWeek" $ \dw (MkWDay d) ->-        let-            f = weekFirstDay dw d-        in-            dayOfWeek f == dw-    ]+  [ testProperty "weekFirstDay/weekLastDay range" $ \dw (MkWDay d) ->+      let f = weekFirstDay dw d+          l = weekLastDay dw d+       in f <= d && d <= l,+    testProperty "weekFirstDay/weekLastDay range" $ \dw (MkWDay d) ->+      let f = weekFirstDay dw d+          l = weekLastDay dw d+       in addDays 6 f == l,+    testProperty "weekFirstDay dayOfWeek" $ \dw (MkWDay d) ->+      let f = weekFirstDay dw d+       in dayOfWeek f == dw+  ]

@@ -1,6 +1,7 @@-module Test.Calendar.Duration (-    testDuration,-) where+module Test.Calendar.Duration+  ( testDuration,+  )+where  import Data.Time.Calendar.Compat import Data.Time.Calendar.Julian.Compat@@ -10,11 +11,11 @@ import Test.Tasty.QuickCheck hiding (reason)  data AddDiff = MkAddDiff-    { adName :: String-    , adAdd :: CalendarDiffDays -> Day -> Day-    , adDifference :: Day -> Day -> CalendarDiffDays-    , adFromYMD :: Integer -> Int -> Int -> Day-    }+  { adName :: String,+    adAdd :: CalendarDiffDays -> Day -> Day,+    adDifference :: Day -> Day -> CalendarDiffDays,+    adFromYMD :: Integer -> Int -> Int -> Day+  }  gregorianClip :: AddDiff gregorianClip = MkAddDiff "gregorianClip" addGregorianDurationClip diffGregorianDurationClip fromGregorian@@ -30,85 +31,81 @@  addDiffs :: [AddDiff] addDiffs =-    [ gregorianClip-    , gregorianRollOver-    , julianClip-    , julianRollOver-    ]+  [ gregorianClip,+    gregorianRollOver,+    julianClip,+    julianRollOver+  ]  testAddDiff :: AddDiff -> TestTree-testAddDiff MkAddDiff{..} = testProperty adName $ \day1 day2 ->-    adAdd (adDifference day2 day1) day1 == day2+testAddDiff MkAddDiff {..} = testProperty adName $ \day1 day2 ->+  adAdd (adDifference day2 day1) day1 == day2  testAddDiffs :: TestTree testAddDiffs =-    testGroup-        "add-diff"-        $ fmap testAddDiff addDiffs+  testGroup+    "add-diff"+    $ fmap testAddDiff addDiffs  newtype Smallish = MkSmallish Integer deriving (Eq, Ord)  deriving newtype instance Show Smallish  instance Arbitrary Smallish where-    arbitrary = do-        b <- arbitrary-        n <- if b then choose (0, 60) else return 30-        return $ MkSmallish n+  arbitrary = do+    b <- arbitrary+    n <- if b then choose (0, 60) else return 30+    return $ MkSmallish n  testPositiveDiff :: AddDiff -> TestTree-testPositiveDiff MkAddDiff{..} = testProperty adName $ \day1 (MkSmallish i) ->-    let-        day2 = addDays i day1-        r = adDifference day2 day1-    in-        property $ cdMonths r >= 0 && cdDays r >= 0+testPositiveDiff MkAddDiff {..} = testProperty adName $ \day1 (MkSmallish i) ->+  let day2 = addDays i day1+      r = adDifference day2 day1+   in property $ cdMonths r >= 0 && cdDays r >= 0  testPositiveDiffs :: TestTree testPositiveDiffs =-    testGroup-        "positive-diff"-        $ fmap testPositiveDiff addDiffs+  testGroup+    "positive-diff"+    $ fmap testPositiveDiff addDiffs  testSpecific :: AddDiff -> (Integer, Int, Int) -> (Integer, Int, Int) -> (Integer, Integer) -> TestTree-testSpecific MkAddDiff{..} (y2, m2, d2) (y1, m1, d1) (em, ed) =-    let-        day1 = adFromYMD y1 m1 d1-        day2 = adFromYMD y2 m2 d2-        expected = CalendarDiffDays em ed-        found = adDifference day2 day1-    in-        testCase (adName ++ ": " ++ show day2 ++ " - " ++ show day1) $ do-            assertEqual "add" day2 $ adAdd found day1-            assertEqual "diff" expected found+testSpecific MkAddDiff {..} (y2, m2, d2) (y1, m1, d1) (em, ed) =+  let day1 = adFromYMD y1 m1 d1+      day2 = adFromYMD y2 m2 d2+      expected = CalendarDiffDays em ed+      found = adDifference day2 day1+   in testCase (adName ++ ": " ++ show day2 ++ " - " ++ show day1) $ do+        assertEqual "add" day2 $ adAdd found day1+        assertEqual "diff" expected found  testSpecificPair :: (Integer, Int, Int) -> (Integer, Int, Int) -> (Integer, Integer) -> (Integer, Integer) -> TestTree testSpecificPair day2 day1 clipD rollD =-    testGroup-        (show day2 ++ " - " ++ show day1)-        [ testSpecific gregorianClip day2 day1 clipD-        , testSpecific gregorianRollOver day2 day1 rollD-        , testSpecific julianClip day2 day1 clipD-        , testSpecific julianRollOver day2 day1 rollD-        ]+  testGroup+    (show day2 ++ " - " ++ show day1)+    [ testSpecific gregorianClip day2 day1 clipD,+      testSpecific gregorianRollOver day2 day1 rollD,+      testSpecific julianClip day2 day1 clipD,+      testSpecific julianRollOver day2 day1 rollD+    ]  testSpecifics :: TestTree testSpecifics =-    testGroup-        "specific"-        [ testSpecificPair (2017, 04, 07) (2017, 04, 07) (0, 0) (0, 0)-        , testSpecific gregorianClip (2017, 04, 07) (2017, 04, 01) (0, 6)-        , testSpecific gregorianClip (2017, 04, 01) (2017, 04, 07) (0, -6)-        , testSpecific gregorianClip (2017, 04, 07) (2017, 02, 01) (2, 6)-        , testSpecific gregorianClip (2017, 02, 01) (2017, 04, 07) (-2, -6)-        , testSpecificPair (2000, 03, 01) (2000, 01, 30) (1, 1) (1, 0)-        , testSpecificPair (2001, 03, 01) (2001, 01, 30) (1, 1) (0, 30)-        , testSpecificPair (2001, 03, 01) (2000, 01, 30) (13, 1) (12, 30)-        , testSpecificPair (2000, 03, 01) (2000, 01, 31) (1, 1) (0, 30)-        , testSpecificPair (2001, 03, 01) (2001, 01, 31) (1, 1) (0, 29)-        , testSpecificPair (2001, 03, 01) (2000, 01, 31) (13, 1) (12, 29)-        , testSpecificPair (2001, 10, 01) (2001, 08, 31) (1, 1) (1, 0)-        ]+  testGroup+    "specific"+    [ testSpecificPair (2017, 04, 07) (2017, 04, 07) (0, 0) (0, 0),+      testSpecific gregorianClip (2017, 04, 07) (2017, 04, 01) (0, 6),+      testSpecific gregorianClip (2017, 04, 01) (2017, 04, 07) (0, -6),+      testSpecific gregorianClip (2017, 04, 07) (2017, 02, 01) (2, 6),+      testSpecific gregorianClip (2017, 02, 01) (2017, 04, 07) (-2, -6),+      testSpecificPair (2000, 03, 01) (2000, 01, 30) (1, 1) (1, 0),+      testSpecificPair (2001, 03, 01) (2001, 01, 30) (1, 1) (0, 30),+      testSpecificPair (2001, 03, 01) (2000, 01, 30) (13, 1) (12, 30),+      testSpecificPair (2000, 03, 01) (2000, 01, 31) (1, 1) (0, 30),+      testSpecificPair (2001, 03, 01) (2001, 01, 31) (1, 1) (0, 29),+      testSpecificPair (2001, 03, 01) (2000, 01, 31) (13, 1) (12, 29),+      testSpecificPair (2001, 10, 01) (2001, 08, 31) (1, 1) (1, 0)+    ]  testDuration :: TestTree testDuration = testGroup "CalendarDiffDays" [testAddDiffs, testPositiveDiffs, testSpecifics]

@@ -1,6 +1,7 @@-module Test.Calendar.Easter (-    testEaster,-) where+module Test.Calendar.Easter+  ( testEaster,+  )+where  import Data.Time.Calendar.Compat import Data.Time.Calendar.Easter.Compat@@ -18,22 +19,20 @@  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]+  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,62 +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,6 +1,7 @@-module Test.Calendar.LongWeekYears (-    longWeekYears,-) where+module Test.Calendar.LongWeekYears+  ( longWeekYears,+  )+where  import Data.Time.Calendar.Compat import Data.Time.Calendar.WeekDate.Compat@@ -10,23 +11,23 @@  longYear :: Integer -> Bool longYear year =-    case toWeekDate (fromGregorian year 12 31) of-        (_, 53, _) -> True-        _ -> False+  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 " "-               )-        ]+  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]

@@ -2,155 +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,7 +1,10 @@-module Test.Calendar.MonthDay (-    testMonthDay,-) where+module Test.Calendar.MonthDay+  ( testMonthDay,+  )+where +import Data.Time.Calendar.Compat+import Data.Time.Calendar.Month.Compat import Data.Time.Calendar.MonthDay.Compat import Test.Calendar.MonthDayRef import Test.Tasty@@ -9,28 +12,39 @@  showCompare :: (Eq a, Show a) => a -> String -> a -> String showCompare a1 b a2-    | a1 == a2 = (show a1) ++ " == " ++ b+  | a1 == a2 = (show a1) ++ " == " ++ b showCompare a1 b a2 = "DIFF: " ++ (show a1) ++ " -> " ++ b ++ " -> " ++ (show a2)  testMonthDay :: TestTree testMonthDay =-    testCase "testMonthDay" $+  testGroup+    "MonthDay"+    [ testCase "good" $         assertEqual "" testMonthDayRef $-            concat $-                map (\isL -> unlines (leap isL : yearDays isL)) [False, True]+          concat $+            map (\isL -> unlines (leap isL : yearDays isL)) [False, True],+      testGroup+        "clip"+        [ testCase "12" $ assertEqual "" (YearMonthDay 2005 05 12) (MonthDay (MkMonth 24064) 12),+          testCase "1" $ assertEqual "" (YearMonthDay 2005 05 1) (MonthDay (MkMonth 24064) 1),+          testCase "0" $ assertEqual "" (YearMonthDay 2005 05 1) (MonthDay (MkMonth 24064) 0),+          testCase "-1" $ assertEqual "" (YearMonthDay 2005 05 1) (MonthDay (MkMonth 24064) (-1)),+          testCase "31" $ assertEqual "" (YearMonthDay 2005 05 31) (MonthDay (MkMonth 24064) 31),+          testCase "32" $ assertEqual "" (YearMonthDay 2005 05 31) (MonthDay (MkMonth 24064) 32),+          testCase "33" $ assertEqual "" (YearMonthDay 2005 05 31) (MonthDay (MkMonth 24064) 33)+        ]+    ]   where     leap isLeap =-        if isLeap-            then "Leap:"-            else "Regular:"+      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]+      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,751 +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,6 +1,7 @@-module Test.Calendar.MonthOfYear (-    testMonthOfYear,-) where+module Test.Calendar.MonthOfYear+  ( testMonthOfYear,+  )+where  import Data.Foldable import Data.Time.Calendar.Compat@@ -9,18 +10,18 @@  matchMonthOfYear :: MonthOfYear -> Int matchMonthOfYear m = case m of-    January -> 1-    February -> 2-    March -> 3-    April -> 4-    May -> 5-    June -> 6-    July -> 7-    August -> 8-    September -> 9-    October -> 10-    November -> 11-    December -> 12+  January -> 1+  February -> 2+  March -> 3+  April -> 4+  May -> 5+  June -> 6+  July -> 7+  August -> 8+  September -> 9+  October -> 10+  November -> 11+  December -> 12  testMonthOfYear :: TestTree testMonthOfYear = testCase "MonthOfYear" $ for_ [1 .. 12] $ \m -> assertEqual (show m) m $ matchMonthOfYear m

@@ -1,121 +1,116 @@-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.Compat import Test.QuickCheck.Property import Test.Tasty import Test.Tasty.QuickCheck hiding (reason)  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+  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  validTest ::-    (Arbitrary s, Show s, Eq c, Show c, Eq t, Show t) =>-    String ->-    (s -> c) ->-    (t -> c) ->-    (c -> t) ->-    (c -> Maybe t) ->-    TestTree+  (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-        ]+  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 =-    let-        (y, _) = toOrdinalDate day-        (w, d) = sundayStartWeek day-    in-        (y, w, d)+  let (y, _) = toOrdinalDate day+      (w, d) = sundayStartWeek day+   in (y, w, d)  toMondayStartWeek :: Day -> (Integer, Int, Int) toMondayStartWeek day =-    let-        (y, _) = toOrdinalDate day-        (w, d) = mondayStartWeek day-    in-        (y, w, d)+  let (y, _) = toOrdinalDate day+      (w, d) = mondayStartWeek day+   in (y, w, d)  newtype WYear-    = MkWYear Year-    deriving (Eq, Show)+  = MkWYear Year+  deriving (Eq, Show)  instance Arbitrary WYear where-    arbitrary = fmap MkWYear $ choose (-1000, 3000)+  arbitrary = fmap MkWYear $ choose (-1000, 3000)  newtype WMonthOfYear-    = MkWMonthOfYear MonthOfYear-    deriving (Eq, Show)+  = MkWMonthOfYear MonthOfYear+  deriving (Eq, Show)  instance Arbitrary WMonthOfYear where-    arbitrary = fmap MkWMonthOfYear $ choose (-5, 17)+  arbitrary = fmap MkWMonthOfYear $ choose (-5, 17)  newtype WDayOfMonth-    = MkWDayOfMonth DayOfMonth-    deriving (Eq, Show)+  = MkWDayOfMonth DayOfMonth+  deriving (Eq, Show)  instance Arbitrary WDayOfMonth where-    arbitrary = fmap MkWDayOfMonth $ choose (-5, 35)+  arbitrary = fmap MkWDayOfMonth $ choose (-5, 35)  newtype WDayOfYear-    = MkWDayOfYear DayOfYear-    deriving (Eq, Show)+  = MkWDayOfYear DayOfYear+  deriving (Eq, Show)  instance Arbitrary WDayOfYear where-    arbitrary = fmap MkWDayOfYear $ choose (-20, 400)+  arbitrary = fmap MkWDayOfYear $ choose (-20, 400)  newtype WWeekOfYear-    = MkWWeekOfYear WeekOfYear-    deriving (Eq, Show)+  = MkWWeekOfYear WeekOfYear+  deriving (Eq, Show)  instance Arbitrary WWeekOfYear where-    arbitrary = fmap MkWWeekOfYear $ choose (-5, 60)+  arbitrary = fmap MkWWeekOfYear $ choose (-5, 60)  newtype WDayOfWeek-    = MkWDayOfWeek Int-    deriving (Eq, Show)+  = MkWDayOfWeek Int+  deriving (Eq, Show)  instance Arbitrary WDayOfWeek where-    arbitrary = fmap MkWDayOfWeek $ choose (-5, 15)+  arbitrary = fmap MkWDayOfWeek $ choose (-5, 15)  fromYMD :: (WYear, WMonthOfYear, WDayOfMonth) -> (Year, MonthOfYear, DayOfMonth) fromYMD (MkWYear y, MkWMonthOfYear ym, MkWDayOfMonth md) = (y, ym, md)@@ -128,37 +123,37 @@  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)-        ]+  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)+    ]

@@ -1,6 +1,7 @@-module Test.Calendar.Week (-    testWeek,-) where+module Test.Calendar.Week+  ( testWeek,+  )+where  import Data.Time.Calendar.Compat import Data.Time.Calendar.OrdinalDate.Compat@@ -12,12 +13,11 @@  testDay :: TestTree testDay =-    nameTest "day" $ do-        let-            day = fromGregorian 2018 1 9-        assertEqual "" (ModifiedJulianDay 58127) day-        assertEqual "" (2018, 2, 2) $ toWeekDate day-        assertEqual "" Tuesday $ dayOfWeek day+  nameTest "day" $ do+    let day = fromGregorian 2018 1 9+    assertEqual "" (ModifiedJulianDay 58127) day+    assertEqual "" (2018, 2, 2) $ toWeekDate day+    assertEqual "" Tuesday $ dayOfWeek day  allDaysOfWeek :: [DayOfWeek] allDaysOfWeek = [Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday]@@ -33,62 +33,62 @@  testSequences :: TestTree testSequences =-    nameTest-        "sequence"-        [ 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]-        , nameTest "[Thursday .. Wednesday]" $-            assertEqual "" [Thursday, Friday, Saturday, Sunday, Monday, Tuesday, Wednesday] [Thursday .. Wednesday]-        , nameTest "[Tuesday ..]"-            $ assertEqual-                ""-                [ Tuesday-                , Wednesday-                , Thursday-                , Friday-                , Saturday-                , Sunday-                , Monday-                , Tuesday-                , Wednesday-                , Thursday-                , Friday-                , Saturday-                , Sunday-                , Monday-                , Tuesday-                ]-            $ take 15 [Tuesday ..]-        , nameTest "[Wednesday, Tuesday ..]"-            $ assertEqual-                ""-                [ Wednesday-                , Tuesday-                , Monday-                , Sunday-                , Saturday-                , Friday-                , Thursday-                , Wednesday-                , Tuesday-                , Monday-                , Sunday-                , Saturday-                , Friday-                , Thursday-                , Wednesday-                ]-            $ take 15 [Wednesday, Tuesday ..]-        , nameTest "[Sunday, Friday ..]" $-            assertEqual "" [Sunday, Friday, Wednesday, Monday, Saturday, Thursday, Tuesday, Sunday] $-                take 8 [Sunday, Friday ..]-        , nameTest "[Monday,Sunday .. Tuesday]" $-            assertEqual "" [Monday, Sunday, Saturday, Friday, Thursday, Wednesday, Tuesday] [Monday, Sunday .. Tuesday]-        , nameTest "[Thursday, Saturday .. Tuesday]" $-            assertEqual "" [Thursday, Saturday, Monday, Wednesday, Friday, Sunday, Tuesday] [Thursday, Saturday .. Tuesday]-        ]+  nameTest+    "sequence"+    [ 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],+      nameTest "[Thursday .. Wednesday]" $+        assertEqual "" [Thursday, Friday, Saturday, Sunday, Monday, Tuesday, Wednesday] [Thursday .. Wednesday],+      nameTest "[Tuesday ..]"+        $ assertEqual+          ""+          [ Tuesday,+            Wednesday,+            Thursday,+            Friday,+            Saturday,+            Sunday,+            Monday,+            Tuesday,+            Wednesday,+            Thursday,+            Friday,+            Saturday,+            Sunday,+            Monday,+            Tuesday+          ]+        $ take 15 [Tuesday ..],+      nameTest "[Wednesday, Tuesday ..]"+        $ assertEqual+          ""+          [ Wednesday,+            Tuesday,+            Monday,+            Sunday,+            Saturday,+            Friday,+            Thursday,+            Wednesday,+            Tuesday,+            Monday,+            Sunday,+            Saturday,+            Friday,+            Thursday,+            Wednesday+          ]+        $ take 15 [Wednesday, Tuesday ..],+      nameTest "[Sunday, Friday ..]" $+        assertEqual "" [Sunday, Friday, Wednesday, Monday, Saturday, Thursday, Tuesday, Sunday] $+          take 8 [Sunday, Friday ..],+      nameTest "[Monday,Sunday .. Tuesday]" $+        assertEqual "" [Monday, Sunday, Saturday, Friday, Thursday, Wednesday, Tuesday] [Monday, Sunday .. 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@@ -101,84 +101,76 @@  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+  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+  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+  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+  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-        ]+  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+    ]  testWeekDays :: TestTree testWeekDays =-    nameTest-        "Week Days"-        [ testGroup "weekAllDays" weekAllDaysTests-        , testGroup "weekFirstDay" weekFirstDayTests-        , testGroup "weekLastDay" weekLastDayTests-        ]+  nameTest+    "Week Days"+    [ testGroup "weekAllDays" weekAllDaysTests,+      testGroup "weekFirstDay" weekFirstDayTests,+      testGroup "weekLastDay" weekLastDayTests+    ]  weekAllDaysTests :: [TestTree] weekAllDaysTests =-    [ testGroup-        "Property Tests"-        [ nameTest "Week have 7 days" weekHaveSevenDays-        , nameTest "Day is part of the week" dayIsPartOfWeek-        ]-    , testGroup-        "Unit Tests"-        [ nameTest "FirstDay is less than Day-DayOfWeek" $-            assertEqual-                ""-                [YearMonthDay 2023 12 31 .. YearMonthDay 2024 1 6]-                (weekAllDays Sunday (YearMonthDay 2024 1 1))-        , nameTest "FirstDay is equal to Day-DayOfWeek" $-            assertEqual-                ""-                [YearMonthDay 2024 2 26 .. YearMonthDay 2024 3 3]-                (weekAllDays Monday (YearMonthDay 2024 2 26))-        , nameTest "FirstDay is greater than Day-DayOfWeek" $-            assertEqual-                ""-                [YearMonthDay 2022 2 15 .. YearMonthDay 2022 2 21]-                (weekAllDays Tuesday (YearMonthDay 2022 2 21))-        ]-    ]+  [ testGroup+      "Property Tests"+      [ nameTest "Week have 7 days" weekHaveSevenDays,+        nameTest "Day is part of the week" dayIsPartOfWeek+      ],+    testGroup+      "Unit Tests"+      [ nameTest "FirstDay is less than Day-DayOfWeek" $+          assertEqual+            ""+            [YearMonthDay 2023 12 31 .. YearMonthDay 2024 1 6]+            (weekAllDays Sunday (YearMonthDay 2024 1 1)),+        nameTest "FirstDay is equal to Day-DayOfWeek" $+          assertEqual+            ""+            [YearMonthDay 2024 2 26 .. YearMonthDay 2024 3 3]+            (weekAllDays Monday (YearMonthDay 2024 2 26)),+        nameTest "FirstDay is greater than Day-DayOfWeek" $+          assertEqual+            ""+            [YearMonthDay 2022 2 15 .. YearMonthDay 2022 2 21]+            (weekAllDays Tuesday (YearMonthDay 2022 2 21))+      ]+  ]   where     weekHaveSevenDays :: DayOfWeek -> Day -> Bool     weekHaveSevenDays fd d = length (weekAllDays fd d) == 7@@ -188,61 +180,61 @@  weekFirstDayTests :: [TestTree] weekFirstDayTests =-    [ testGroup-        "Property Tests"-        [ nameTest "FirsyDay matches the Day-DayOfWeek" firstDayMatchesDay-        ]-    , testGroup-        "Unit Tests"-        [ nameTest "FirstDay is less than Day-DayOfWeek" $-            assertEqual-                ""-                (YearMonthDay 2022 2 20)-                (weekFirstDay Sunday (YearMonthDay 2022 2 21))-        , nameTest "FirstDay is equal to Day-DayOfWeek" $-            assertEqual-                ""-                (YearMonthDay 2022 2 21)-                (weekFirstDay Monday (YearMonthDay 2022 2 21))-        , nameTest "FirstDay is greater than Day-DayOfWeek" $-            assertEqual-                ""-                (YearMonthDay 2022 2 15)-                (weekFirstDay Tuesday (YearMonthDay 2022 2 21))-        ]-    ]+  [ testGroup+      "Property Tests"+      [ nameTest "FirsyDay matches the Day-DayOfWeek" firstDayMatchesDay+      ],+    testGroup+      "Unit Tests"+      [ nameTest "FirstDay is less than Day-DayOfWeek" $+          assertEqual+            ""+            (YearMonthDay 2022 2 20)+            (weekFirstDay Sunday (YearMonthDay 2022 2 21)),+        nameTest "FirstDay is equal to Day-DayOfWeek" $+          assertEqual+            ""+            (YearMonthDay 2022 2 21)+            (weekFirstDay Monday (YearMonthDay 2022 2 21)),+        nameTest "FirstDay is greater than Day-DayOfWeek" $+          assertEqual+            ""+            (YearMonthDay 2022 2 15)+            (weekFirstDay Tuesday (YearMonthDay 2022 2 21))+      ]+  ]   where     firstDayMatchesDay :: DayOfWeek -> Day -> Bool     firstDayMatchesDay fd d = dayOfWeek (weekFirstDay fd d) == fd  weekLastDayTests :: [TestTree] weekLastDayTests =-    [ nameTest "FirstDay is less than Day-DayOfWeek" $-        assertEqual-            ""-            (YearMonthDay 2022 2 26)-            (weekLastDay Sunday (YearMonthDay 2022 2 21))-    , nameTest "FirstDay is equal to Day-DayOfWeek" $-        assertEqual-            ""-            (YearMonthDay 2022 2 27)-            (weekLastDay Monday (YearMonthDay 2022 2 21))-    , nameTest "FirstDay is greater than Day-DayOfWeek" $-        assertEqual-            ""-            (YearMonthDay 2022 2 21)-            (weekLastDay Tuesday (YearMonthDay 2022 2 21))-    ]+  [ nameTest "FirstDay is less than Day-DayOfWeek" $+      assertEqual+        ""+        (YearMonthDay 2022 2 26)+        (weekLastDay Sunday (YearMonthDay 2022 2 21)),+    nameTest "FirstDay is equal to Day-DayOfWeek" $+      assertEqual+        ""+        (YearMonthDay 2022 2 27)+        (weekLastDay Monday (YearMonthDay 2022 2 21)),+    nameTest "FirstDay is greater than Day-DayOfWeek" $+      assertEqual+        ""+        (YearMonthDay 2022 2 21)+        (weekLastDay Tuesday (YearMonthDay 2022 2 21))+  ]  testWeek :: TestTree testWeek =-    nameTest-        "Week"-        [ testDay-        , testSucc-        , testPred-        , testSequences-        , testReadShow-        , testDiff-        , testWeekDays-        ]+  nameTest+    "Week"+    [ testDay,+      testSucc,+      testPred,+      testSequences,+      testReadShow,+      testDiff,+      testWeekDays+    ]

@@ -1,6 +1,7 @@-module Test.Calendar.Year (-    testYear,-) where+module Test.Calendar.Year+  ( testYear,+  )+where  import Data.Time.Calendar.Compat import Data.Time.Calendar.OrdinalDate.Compat@@ -11,19 +12,19 @@  cbRoundTrip :: TestTree cbRoundTrip = nameTest "CE-BCE" $ \(YearDay y _) -> case y of-    CommonEra n -> case id y of-        BeforeCommonEra _ -> False-        _ -> n >= 1 && y == CommonEra n-    _ -> case id y of-        BeforeCommonEra n -> n >= 1 && y == BeforeCommonEra n-        _ -> False+  CommonEra n -> case id y of+    BeforeCommonEra _ -> False+    _ -> n >= 1 && y == CommonEra n+  _ -> case id y of+    BeforeCommonEra n -> n >= 1 && y == BeforeCommonEra n+    _ -> False  testYear :: TestTree testYear =-    nameTest-        "Year"-        [ cbRoundTrip-        , nameTest "succ 1" $ assertEqual "" (BeforeCommonEra 1) $ succ $ BeforeCommonEra 2-        , nameTest "succ 2" $ assertEqual "" (CommonEra 1) $ succ $ BeforeCommonEra 1-        , nameTest "succ 3" $ assertEqual "" (CommonEra 2) $ succ $ CommonEra 1-        ]+  nameTest+    "Year"+    [ cbRoundTrip,+      nameTest "succ 1" $ assertEqual "" (BeforeCommonEra 1) $ succ $ BeforeCommonEra 2,+      nameTest "succ 2" $ assertEqual "" (CommonEra 1) $ succ $ BeforeCommonEra 1,+      nameTest "succ 3" $ assertEqual "" (CommonEra 2) $ succ $ CommonEra 1+    ]

@@ -1,6 +1,7 @@-module Test.Clock.Conversion (-    testClockConversion,-) where+module Test.Clock.Conversion+  ( testClockConversion,+  )+where  import Data.Time.Clock.Compat import Data.Time.Clock.System.Compat@@ -9,19 +10,17 @@  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)+  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,18 +0,0 @@-{-# LANGUAGE TemplateHaskell #-}--module Test.Clock.Lift (-    testLift,-) where--import Data.Time.Clock.Compat-import qualified Language.Haskell.TH.Syntax as TH-import Test.Tasty-import Test.Tasty.HUnit--testLift :: TestTree-testLift =-    testGroup-        "Lift instances"-        [ testCase "DiffTime" $ $(TH.lift (secondsToDiffTime 100)) @?= secondsToDiffTime 100-        , testCase "NominalDiffTime" $ $(TH.lift (secondsToNominalDiffTime 100)) @?= secondsToNominalDiffTime 100-        ]

@@ -0,0 +1,31 @@+module Test.Clock.Pattern+  ( testClockPatterns,+  )+where++import Data.Time.Clock.Compat+import Test.Tasty+import Test.Tasty.HUnit++testClockPatterns :: TestTree+testClockPatterns =+  let testSame :: forall a. (Eq a, Show a) => TestName -> a -> a -> TestTree+      testSame name expected found = testCase name $ assertEqual "" expected found+   in testGroup "pattern" $+        [ testGroup+            "construct"+            [ testSame "Seconds" 52.4 (Seconds 52.4),+              testSame "Seconds-Picoseconds" (Picoseconds 7_276_000_000_000) (Seconds 7.276),+              testSame "Minutes-Seconds" (Seconds 210) (Minutes 3.5),+              testSame "Hours-Minutes" (Minutes 120) (Hours 2),+              testSame "Nominal" 37.4 (Nominal 37.4)+            ],+          testGroup+            "deconstruct"+            [ testSame "Seconds" 52.4 ((\(Seconds x) -> x) 52.4),+              testSame "Seconds-Picoseconds" 7.276 ((\(Seconds x) -> x) $ Picoseconds 7_276_000_000_000),+              testSame "Minutes-Seconds" 3.5 ((\(Minutes x) -> x) $ Seconds 210),+              testSame "Hours-Minutes" 2 ((\(Hours x) -> x) $ Minutes 120),+              testSame "Nominal" 37.4 ((\(Nominal x) -> x) 37.4)+            ]+        ]

@@ -1,6 +1,7 @@-module Test.Clock.Resolution (-    testResolutions,-) where+module Test.Clock.Resolution+  ( testResolutions,+  )+where  import Control.Concurrent import Data.Fixed@@ -9,57 +10,56 @@ import Test.Tasty import Test.Tasty.HUnit -repeatN :: Monad m => Int -> m a -> m [a]+repeatN :: (Monad m) => Int -> m a -> m [a] repeatN 0 _ = return [] repeatN n ma = do-    a <- ma-    aa <- repeatN (n - 1) ma-    return $ a : aa+  a <- ma+  aa <- repeatN (n - 1) ma+  return $ a : aa -gcd' :: Real a => a -> a -> a+gcd' :: (Real a) => a -> a -> a gcd' a 0 = a gcd' a b = gcd' b (mod' a b) -gcdAll :: Real a => [a] -> a+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 (reportedRes, 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-            foundGrid = gcdAll times-        assertBool ("reported resolution: " <> show reportedRes <> ", found: " <> show foundGrid) $ foundGrid <= reportedRes+  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+        foundGrid = gcdAll times+    assertBool ("reported resolution: " <> show reportedRes <> ", found: " <> show foundGrid) $ foundGrid <= reportedRes  testResolutions :: TestTree testResolutions =-    testGroup "resolution" $-        [testResolution "getCurrentTime" diffUTCTime (realToFrac getTime_resolution, getCurrentTime)]-            ++ case taiClock of-                Just clock -> [testResolution "taiClock" diffAbsoluteTime clock]-                Nothing -> []+  testGroup "resolution" $+    [testResolution "getCurrentTime" diffUTCTime (realToFrac getTime_resolution, getCurrentTime)]+      ++ case taiClock of+        Just clock -> [testResolution "taiClock" diffAbsoluteTime clock]+        Nothing -> []

@@ -1,60 +1,59 @@-module Test.Clock.TAI (-    testTAI,-) where+module Test.Clock.TAI+  ( testTAI,+  )+where -import Data.Time.Compat import Data.Time.Clock.TAI.Compat+import Data.Time.Compat import Test.Tasty import Test.Tasty.HUnit import Test.TestUtil  sampleLeapSecondMap :: LeapSecondMap sampleLeapSecondMap d-    | d < fromGregorian 1972 1 1 = Nothing+  | d < fromGregorian 1972 1 1 = Nothing sampleLeapSecondMap d-    | d < fromGregorian 1972 7 1 = Just 10+  | d < fromGregorian 1972 7 1 = Just 10 sampleLeapSecondMap d-    | d < fromGregorian 1975 1 1 = Just 11+  | 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-                ]+  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             ]+        ]

@@ -1,18 +1,9 @@ -- Tests succeed if module compiles-{-# LANGUAGE GeneralizedNewtypeDeriving #-}--module Test.Format.Compile (--) where--{--import Data.Time.Compat--newtype WrappedUTCTime-    = MkWrappedUTCTime UTCTime-    deriving (FormatTime, ParseTime)+module Test.Format.Compile+  (+  )+where -newtype Wrapped t-    = MkWrapped t-    deriving (FormatTime, ParseTime)--}+-- broken on older GHCs or time+--    • Couldn't match representation of type: proxy t+--                               with that of: proxy (Wrapped t)

@@ -1,6 +1,7 @@-module Test.Format.Format (-    testFormat,-) where+module Test.Format.Format+  ( testFormat,+  )+where  import Data.Proxy import Data.Time.Compat@@ -9,12 +10,12 @@ import Test.TestUtil  -- as found in http://www.opengroup.org/onlinepubs/007908799/xsh/strftime.html--- plus FgGklz+-- plus FgGklvz -- f not supported -- P not always supported -- s time-zone dependent chars :: [Char]-chars = "aAbBcCdDeFgGhHIjklmMnprRStTuUVwWxXyYzZ%"+chars = "aAbBcCdDeFgGhHIjklmMnprRStTuUvVwWxXyYzZ%"  -- as found in "man strftime" on a glibc system. '#' is different, though modifiers :: [Char]@@ -25,33 +26,32 @@  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-           )+  ["%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"]  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 _ = parseTimeM False defaultTimeLocale fmt str-        assertEqual "" Nothing $ found proxy+  testCase testname $ do+    let 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)-    ]+  [ 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 testCheckParse = testGroup "checkParse" $ tgroup formats $ \fmt -> tgroup somestrings $ \str -> checkParse fmt str@@ -61,164 +61,86 @@  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+  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 ""+  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]+  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)-        ]+  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 :: (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)-        , 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)-        ]--}+  testGroup+    "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)-        , 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)-        ]--}+  testGroup+    "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)-        ]--}+testCalendarDiffDays :: TestTree+testCalendarDiffDays =+  testGroup+    "CalendarDiffDays"+    [] -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-        ]--}+testCalendarDiffTime :: TestTree+testCalendarDiffTime =+  testGroup+    "CalendarDiffTime"+    []  testFormat :: TestTree testFormat =-    testGroup "testFormat" $-        [ testCheckParse-        , testDayOfWeek-        , testTimeZone-        , testNominalDiffTime-        , testDiffTime-        , testCalenderDiffDays-        , testCalenderDiffTime-        ]+  testGroup "testFormat" $+    [ testCheckParse,+      testDayOfWeek,+      testTimeZone,+      testNominalDiffTime,+      testDiffTime,+      testCalendarDiffDays,+      testCalendarDiffTime+    ]

@@ -1,14 +1,14 @@ {-# OPTIONS -fno-warn-orphans #-} -module Test.Format.ISO8601 (-    testISO8601,-) where+module Test.Format.ISO8601+  ( testISO8601,+  )+where  import Data.Coerce import Data.Ratio import Data.Time.Compat import Data.Time.Format.ISO8601.Compat--- import Data.Time.Format.Internal.Compat import Test.Arbitrary () import Test.QuickCheck.Property import Test.Tasty@@ -21,314 +21,332 @@ readShowProperty :: (Eq a, Show a) => (a -> Bool) -> Format a -> a -> Property readShowProperty skip _ val | skip val = property Discard 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)}+  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)}  class SpecialTestValues a where-    -- | values that should always be tested-    specialTestValues :: [a]+  testGen :: Gen a+  default testGen :: (Arbitrary a) => Gen a+  testGen = arbitrary -instance {-# OVERLAPPABLE #-} SpecialTestValues a where-    specialTestValues = []+  -- | values that should always be tested+  specialTestValues :: [a]+  specialTestValues = [] +instance {-# OVERLAPPABLE #-} (Arbitrary a) => SpecialTestValues a+ instance SpecialTestValues TimeOfDay where-    specialTestValues = [TimeOfDay 0 0 0, TimeOfDay 0 0 60, TimeOfDay 1 0 60, TimeOfDay 24 0 0]+  specialTestValues = [TimeOfDay 0 0 0, TimeOfDay 0 0 60, TimeOfDay 1 0 60, TimeOfDay 24 0 0] -readShowTestCheck :: (Eq a, Show a, Arbitrary a, SpecialTestValues a) => (a -> Bool) -> Format a -> [TestTree]-readShowTestCheck skip fmt = [nameTest "random" $ readShowProperty skip fmt, nameTest "special" $ fmap (\a -> nameTest (show a) $ readShowProperty skip fmt a) $ filter (not . skip) specialTestValues]+instance SpecialTestValues (Integer, Int) where+  testGen = do+    Small y <- arbitrary+    woy <- choose (-10, 120)+    pure (y, woy) -readShowTest :: (Eq a, Show a, Arbitrary a, SpecialTestValues a) => Format a -> [TestTree]+readShowTestCheck :: (Eq a, Show a, SpecialTestValues a) => (a -> Bool) -> Format a -> [TestTree]+readShowTestCheck skip fmt =+  [ nameTest "random" $ fmap (readShowProperty skip fmt) testGen,+    nameTest "special" $ fmap (\a -> nameTest (show a) $ readShowProperty skip fmt a) $ filter (not . skip) specialTestValues+  ]++readShowTest :: (Eq a, Show a, SpecialTestValues a) => Format a -> [TestTree] readShowTest = readShowTestCheck $ \_ -> False -readBoth :: NameTest t => (FormatExtension -> t) -> [TestTree]+readBoth :: (NameTest t) => (FormatExtension -> t) -> [TestTree] readBoth fmts = [nameTest "extended" $ fmts ExtendedFormat, nameTest "basic" $ fmts BasicFormat] -readShowTestsCheck :: (Eq a, Show a, Arbitrary a, SpecialTestValues a) => (a -> Bool) -> (FormatExtension -> Format a) -> [TestTree]+readShowTestsCheck :: (Eq a, Show a, SpecialTestValues a) => (a -> Bool) -> (FormatExtension -> Format a) -> [TestTree] readShowTestsCheck skip fmts = readBoth $ \fe -> readShowTestCheck skip $ fmts fe -readShowTests :: (Eq a, Show a, Arbitrary a, SpecialTestValues a) => (FormatExtension -> Format a) -> [TestTree]+readShowTests :: (Eq a, Show a, SpecialTestValues a) => (FormatExtension -> Format a) -> [TestTree] readShowTests = readShowTestsCheck $ \_ -> False -newtype Durational t = MkDurational {unDurational :: t}-    deriving (Eq)+newtype Durational t = MkDurational t+  deriving (Eq) -instance Show t => Show (Durational t) where-    show (MkDurational t) = show 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)-        return $ MkDurational $ CalendarDiffDays mm dd+  arbitrary = do+    mm <- choose (-10000, 10000)+    dd <- choose (-40, 40)+    return $ MkDurational $ CalendarDiffDays mm dd  instance Arbitrary (Durational CalendarDiffTime) where-    arbitrary =-        let-            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+  arbitrary =+    let 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  durationalFormat :: Format a -> Format (Durational a) durationalFormat = coerce  testReadShowFormat :: TestTree testReadShowFormat =-    testGroup "read-show format" []-{-+  localOption (QuickCheckTests 1000) $     nameTest-        "read-show format"-        []-        [ nameTest "calendarFormat" $ readShowTests $ calendarFormat-        , nameTest "yearMonthFormat" $ readShowTest $ yearMonthFormat-        , nameTest "yearFormat" $ readShowTest $ yearFormat-        , nameTest "centuryFormat" $ readShowTest $ centuryFormat-        , nameTest "expandedCalendarFormat" $ readShowTests $ expandedCalendarFormat 6-        , nameTest "expandedYearMonthFormat" $ readShowTest $ expandedYearMonthFormat 6-        , nameTest "expandedYearFormat" $ readShowTest $ expandedYearFormat 6-        , nameTest "expandedCenturyFormat" $ readShowTest $ expandedCenturyFormat 4-        , nameTest "ordinalDateFormat" $ readShowTests $ ordinalDateFormat-        , nameTest "expandedOrdinalDateFormat" $ readShowTests $ expandedOrdinalDateFormat 6-        , nameTest "weekDateFormat" $ readShowTests $ weekDateFormat-        , nameTest "yearWeekFormat" $ readShowTests $ yearWeekFormat-        , nameTest "expandedWeekDateFormat" $ readShowTests $ expandedWeekDateFormat 6-        , nameTest "expandedYearWeekFormat" $ readShowTests $ expandedYearWeekFormat 6-        , nameTest "timeOfDayFormat" $ readShowTests $ timeOfDayFormat-        , nameTest "hourMinuteFormat" $ readShowTestsCheck (\(TimeOfDay _ _ s) -> s >= 60) $ hourMinuteFormat-        , nameTest "hourFormat" $ readShowTestCheck (\(TimeOfDay _ _ s) -> s >= 60) $ hourFormat-        , nameTest "withTimeDesignator" $ readShowTests $ \fe -> withTimeDesignator $ timeOfDayFormat fe-        , nameTest "withUTCDesignator" $ readShowTests $ \fe -> withUTCDesignator $ timeOfDayFormat fe-        , nameTest "timeOffsetFormat" $ readShowTests $ timeOffsetFormat-        , nameTest "timeOfDayAndOffsetFormat" $ readShowTests $ timeOfDayAndOffsetFormat-        , nameTest "localTimeFormat" $-            readShowTests $-                \fe -> localTimeFormat (calendarFormat fe) (timeOfDayFormat fe)-        , nameTest "zonedTimeFormat" $-            readShowTests $-                \fe -> zonedTimeFormat (calendarFormat fe) (timeOfDayFormat fe) fe-        , nameTest "utcTimeFormat" $ readShowTests $ \fe -> utcTimeFormat (calendarFormat fe) (timeOfDayFormat fe)-        , nameTest "dayAndTimeFormat" $-            readShowTests $-                \fe -> dayAndTimeFormat (calendarFormat fe) (timeOfDayFormat fe)-        , nameTest "timeAndOffsetFormat" $ readShowTests $ \fe -> timeAndOffsetFormat (timeOfDayFormat fe) fe-        , nameTest "durationDaysFormat" $ readShowTest $ durationDaysFormat-        , nameTest "durationTimeFormat" $ readShowTest $ durationTimeFormat-        , nameTest "alternativeDurationDaysFormat" $-            readBoth $-                \fe -> readShowTest (durationalFormat $ alternativeDurationDaysFormat fe)-        , nameTest "alternativeDurationTimeFormat" $-            readBoth $-                \fe -> readShowTest (durationalFormat $ alternativeDurationTimeFormat fe)-        , nameTest "intervalFormat" $-            readShowTests $ \fe ->-                intervalFormat (localTimeFormat (calendarFormat fe) (timeOfDayFormat fe)) durationTimeFormat-        , nameTest "recurringIntervalFormat" $-            readShowTests $ \fe ->-                recurringIntervalFormat (localTimeFormat (calendarFormat fe) (timeOfDayFormat fe)) durationTimeFormat-        ]--}+      "read-show format"+      [ nameTest "calendarFormat" $ readShowTests $ calendarFormat,+        nameTest "yearMonthFormat" $ readShowTest $ yearMonthFormat,+        nameTest "yearFormat" $ readShowTest $ yearFormat,+        nameTest "centuryFormat" $ readShowTest $ centuryFormat,+        nameTest "expandedCalendarFormat" $ readShowTests $ expandedCalendarFormat 6,+        nameTest "expandedYearMonthFormat" $ readShowTest $ expandedYearMonthFormat 6,+        nameTest "expandedYearFormat" $ readShowTest $ expandedYearFormat 6,+        nameTest "expandedCenturyFormat" $ readShowTest $ expandedCenturyFormat 4,+        nameTest "ordinalDateFormat" $ readShowTests $ ordinalDateFormat,+        nameTest "expandedOrdinalDateFormat" $ readShowTests $ expandedOrdinalDateFormat 6,+        nameTest "weekDateFormat" $ readShowTests $ weekDateFormat,+        nameTest "yearWeekFormat" $ readShowTests $ yearWeekFormat,+        nameTest "expandedWeekDateFormat" $ readShowTests $ expandedWeekDateFormat 6,+        nameTest "expandedYearWeekFormat" $ readShowTests $ expandedYearWeekFormat 6,+        nameTest "timeOfDayFormat" $ readShowTests $ timeOfDayFormat,+        nameTest "hourMinuteFormat" $ readShowTestsCheck (\(TimeOfDay _ _ s) -> s >= 60) $ hourMinuteFormat,+        nameTest "hourFormat" $ readShowTestCheck (\(TimeOfDay _ _ s) -> s >= 60) $ hourFormat,+        nameTest "withTimeDesignator" $ readShowTests $ \fe -> withTimeDesignator $ timeOfDayFormat fe,+        nameTest "withUTCDesignator" $ readShowTests $ \fe -> withUTCDesignator $ timeOfDayFormat fe,+        nameTest "timeOffsetFormat" $ readShowTests $ timeOffsetFormat,+        nameTest "timeOfDayAndOffsetFormat" $ readShowTests $ timeOfDayAndOffsetFormat,+        nameTest "localTimeFormat" $+          readShowTests $+            \fe -> localTimeFormat (calendarFormat fe) (timeOfDayFormat fe),+        nameTest "zonedTimeFormat" $+          readShowTests $+            \fe -> zonedTimeFormat (calendarFormat fe) (timeOfDayFormat fe) fe,+        nameTest "utcTimeFormat" $ readShowTests $ \fe -> utcTimeFormat (calendarFormat fe) (timeOfDayFormat fe),+        nameTest "dayAndTimeFormat" $+          readShowTests $+            \fe -> dayAndTimeFormat (calendarFormat fe) (timeOfDayFormat fe),+        nameTest "timeAndOffsetFormat" $ readShowTests $ \fe -> timeAndOffsetFormat (timeOfDayFormat fe) fe,+        nameTest "durationDaysFormat" $ readShowTest $ durationDaysFormat,+        nameTest "durationTimeFormat" $ readShowTest $ durationTimeFormat,+        nameTest "alternativeDurationDaysFormat" $+          readBoth $+            \fe -> readShowTest (durationalFormat $ alternativeDurationDaysFormat fe),+        nameTest "alternativeDurationTimeFormat" $+          readBoth $+            \fe -> readShowTest (durationalFormat $ alternativeDurationTimeFormat fe),+        nameTest "intervalFormat" $+          readShowTests $ \fe ->+            intervalFormat (localTimeFormat (calendarFormat fe) (timeOfDayFormat fe)) durationTimeFormat,+        nameTest "recurringIntervalFormat" $+          readShowTests $ \fe ->+            recurringIntervalFormat (localTimeFormat (calendarFormat fe) (timeOfDayFormat fe)) durationTimeFormat+      ]  testShowReadFormat :: (Show t, Eq t) => String -> Format t -> String -> t -> TestTree testShowReadFormat name fmt str val =-    nameTest-        (name ++ ": " ++ str)-        [ nameTest "show" $ assertEqual "" (Just str) $ formatShowM fmt val-        , nameTest "read" $ assertEqual "" (Just val) $ formatParseM fmt str-        ]+  nameTest+    (name ++ ": " ++ str)+    [ nameTest "show" $ assertEqual "" (Just str) $ formatShowM fmt val,+      nameTest "read" $ assertEqual "" (Just val) $ formatParseM fmt str+    ]  testReadFormat :: (Show t, Eq t) => String -> Format t -> String -> t -> TestTree testReadFormat name fmt str val = nameTest (name ++ ": " ++ str) $ assertEqual "" (Just val) $ formatParseM fmt str  testShowFormats :: TestTree testShowFormats =-    testGroup "show format" []-{--    nameTest-        "show format"-        [ testShowReadFormat "durationDaysFormat" durationDaysFormat "P0D" $ CalendarDiffDays 0 0-        , testShowReadFormat "durationDaysFormat" durationDaysFormat "P4Y" $ CalendarDiffDays 48 0-        , testShowReadFormat "durationDaysFormat" durationDaysFormat "P7M" $ CalendarDiffDays 7 0-        , testShowReadFormat "durationDaysFormat" durationDaysFormat "P5D" $ CalendarDiffDays 0 5-        , testShowReadFormat "durationDaysFormat" durationDaysFormat "P2Y3M81D" $ CalendarDiffDays 27 81-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "P0D" $ CalendarDiffTime 0 0-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "P4Y" $ CalendarDiffTime 48 0-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "P7M" $ CalendarDiffTime 7 0-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "P5D" $ CalendarDiffTime 0 $ 5 * nominalDay-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "P2Y3M81D" $ CalendarDiffTime 27 $ 81 * nominalDay-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "PT2H" $ CalendarDiffTime 0 $ 7200-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "PT3M" $ CalendarDiffTime 0 $ 180-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "PT12S" $ CalendarDiffTime 0 $ 12-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "PT1M18.77634S" $ CalendarDiffTime 0 $ 78.77634-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "PT2H1M18.77634S" $ CalendarDiffTime 0 $ 7278.77634-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "P5DT2H1M18.77634S" $-            CalendarDiffTime 0 $-                5 * nominalDay + 7278.77634-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "P7Y10M5DT2H1M18.77634S" $-            CalendarDiffTime 94 $-                5 * nominalDay + 7278.77634-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "P7Y10MT2H1M18.77634S" $-            CalendarDiffTime 94 $-                7278.77634-        , testShowReadFormat "durationTimeFormat" durationTimeFormat "P8YT2H1M18.77634S" $ CalendarDiffTime 96 $ 7278.77634-        , testShowReadFormat "alternativeDurationDaysFormat" (alternativeDurationDaysFormat ExtendedFormat) "P0001-00-00" $-            CalendarDiffDays 12 0-        , testShowReadFormat "alternativeDurationDaysFormat" (alternativeDurationDaysFormat ExtendedFormat) "P0002-03-29" $-            CalendarDiffDays 27 29-        , testShowReadFormat "alternativeDurationDaysFormat" (alternativeDurationDaysFormat ExtendedFormat) "P0561-08-29" $-            CalendarDiffDays (561 * 12 + 8) 29-        , testShowReadFormat-            "alternativeDurationTimeFormat"-            (alternativeDurationTimeFormat ExtendedFormat)-            "P0000-00-01T00:00:00"-            $ CalendarDiffTime 0 86400-        , testShowReadFormat-            "alternativeDurationTimeFormat"-            (alternativeDurationTimeFormat ExtendedFormat)-            "P0007-10-05T02:01:18.77634"-            $ CalendarDiffTime 94-            $ 5 * nominalDay + 7278.77634-        , testShowReadFormat-            "alternativeDurationTimeFormat"-            (alternativeDurationTimeFormat ExtendedFormat)-            "P4271-10-05T02:01:18.77634"-            $ CalendarDiffTime (12 * 4271 + 10)-            $ 5 * nominalDay + 7278.77634-        , testShowReadFormat "centuryFormat" centuryFormat "02" 2-        , testShowReadFormat "centuryFormat" centuryFormat "21" 21-        , testShowReadFormat-            "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-            )-        , testShowReadFormat-            "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-            )-        , testShowReadFormat-            "recurringIntervalFormat etc."-            (recurringIntervalFormat (calendarFormat ExtendedFormat) durationDaysFormat)-            "R74/2015-06-13/P1Y2M7D"-            (74, fromGregorian 2015 6 13, CalendarDiffDays 14 7)-        , testShowReadFormat "timeOffsetFormat" iso8601Format "-06:30" (minutesToTimeZone (-390))-        , testShowReadFormat "timeOffsetFormat" iso8601Format "-06:00" (minutesToTimeZone (-360))-        , testReadFormat "timeOffsetFormat" iso8601Format "-06" (minutesToTimeZone (-360))-        , testShowReadFormat "timeOffsetFormat" iso8601Format "+11:00" (minutesToTimeZone 660)-        , testReadFormat "timeOffsetFormat" iso8601Format "+11" (minutesToTimeZone 660)-        , testShowReadFormat "timeOffsetFormat" iso8601Format "+00:00" (minutesToTimeZone 0)-        , testReadFormat "timeOffsetFormat" iso8601Format "+00" (minutesToTimeZone 0)-        , testReadFormat "timeOffsetFormat" iso8601Format "-00:00" (minutesToTimeZone 0)-        , testReadFormat "timeOffsetFormat" iso8601Format "-00" (minutesToTimeZone 0)-        , testShowReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "+0000" (minutesToTimeZone 0)-        , testReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "+00" (minutesToTimeZone 0)-        , testReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "-0000" (minutesToTimeZone 0)-        , testReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "-00" (minutesToTimeZone 0)-        , testShowReadFormat "timeOffsetFormat" iso8601Format "+00:10" (minutesToTimeZone 10)-        , testShowReadFormat "timeOffsetFormat" iso8601Format "-00:10" (minutesToTimeZone (-10))-        , testShowReadFormat "timeOffsetFormat" iso8601Format "+01:35" (minutesToTimeZone 95)-        , testShowReadFormat "timeOffsetFormat" iso8601Format "-01:35" (minutesToTimeZone (-95))-        , testShowReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "+0135" (minutesToTimeZone 95)-        , testShowReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "-0135" (minutesToTimeZone (-95))-        , testShowReadFormat-            "timeOffsetFormat"-            (timeOffsetFormat BasicFormat)-            "-1100"-            (minutesToTimeZone $ negate $ 11 * 60)-        , testShowReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "+1015" (minutesToTimeZone $ 615)-        , testShowReadFormat-            "zonedTimeFormat"-            iso8601Format-            "2024-07-06T08:45:56.553-06:30"-            (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone (-390)))-        , testShowReadFormat-            "zonedTimeFormat"-            iso8601Format-            "2024-07-06T08:45:56.553-06:00"-            (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone (-360)))-        , testReadFormat-            "zonedTimeFormat"-            iso8601Format-            "2024-07-06T08:45:56.553-06"-            (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone (-360)))-        , testShowReadFormat-            "zonedTimeFormat"-            iso8601Format-            "2024-07-06T08:45:56.553+06:30"-            (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone 390))-        , testShowReadFormat-            "zonedTimeFormat"-            iso8601Format-            "2024-07-06T08:45:56.553+06:00"-            (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone 360))-        , testReadFormat-            "zonedTimeFormat"-            iso8601Format-            "2024-07-06T08:45:56.553+06"-            (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone 360))-        , testShowReadFormat-            "utcTimeFormat"-            iso8601Format-            "2024-07-06T08:45:56.553Z"-            (UTCTime (fromGregorian 2024 07 06) (timeOfDayToTime $ TimeOfDay 8 45 56.553))-        , testShowReadFormat-            "utcTimeFormat"-            iso8601Format-            "2028-12-31T23:59:60.9Z"-            (UTCTime (fromGregorian 2028 12 31) (timeOfDayToTime $ TimeOfDay 23 59 60.9))-        , testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1994-W52-7" (fromGregorian 1995 1 1)-        , testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1995-W01-1" (fromGregorian 1995 1 2)-        , testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1996-W52-7" (fromGregorian 1996 12 29)-        , testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1997-W01-2" (fromGregorian 1996 12 31)-        , testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1997-W01-3" (fromGregorian 1997 1 1)-        , testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1974-W32-6" (fromGregorian 1974 8 10)-        , testShowReadFormat "weekDateFormat" (weekDateFormat BasicFormat) "1974W326" (fromGregorian 1974 8 10)-        , testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1995-W05-6" (fromGregorian 1995 2 4)-        , testShowReadFormat "weekDateFormat" (weekDateFormat BasicFormat) "1995W056" (fromGregorian 1995 2 4)-        , testShowReadFormat-            "weekDateFormat"-            (expandedWeekDateFormat 6 ExtendedFormat)-            "+001995-W05-6"-            (fromGregorian 1995 2 4)-        , testShowReadFormat "weekDateFormat" (expandedWeekDateFormat 6 BasicFormat) "+001995W056" (fromGregorian 1995 2 4)-        , testShowReadFormat "ordinalDateFormat" (ordinalDateFormat ExtendedFormat) "1846-235" (fromGregorian 1846 8 23)-        , testShowReadFormat "ordinalDateFormat" (ordinalDateFormat BasicFormat) "1844236" (fromGregorian 1844 8 23)-        , testShowReadFormat-            "ordinalDateFormat"-            (expandedOrdinalDateFormat 5 ExtendedFormat)-            "+01846-235"-            (fromGregorian 1846 8 23)-        , testShowReadFormat "hourMinuteFormat" (hourMinuteFormat ExtendedFormat) "13:17.25" (TimeOfDay 13 17 15)-        , testShowReadFormat "hourMinuteFormat" (hourMinuteFormat ExtendedFormat) "01:12.4" (TimeOfDay 1 12 24)-        , testShowReadFormat "hourMinuteFormat" (hourMinuteFormat BasicFormat) "1317.25" (TimeOfDay 13 17 15)-        , testShowReadFormat "hourMinuteFormat" (hourMinuteFormat BasicFormat) "0112.4" (TimeOfDay 1 12 24)-        , testShowReadFormat "hourFormat" hourFormat "22" (TimeOfDay 22 0 0)-        , testShowReadFormat "hourFormat" hourFormat "06" (TimeOfDay 6 0 0)-        , testShowReadFormat "hourFormat" hourFormat "18.9475" (TimeOfDay 18 56 51)-        ]--}+  nameTest+    "show format"+    [ testShowReadFormat "durationDaysFormat" durationDaysFormat "P0D" $ CalendarDiffDays 0 0,+      testShowReadFormat "durationDaysFormat" durationDaysFormat "P4Y" $ CalendarDiffDays 48 0,+      testShowReadFormat "durationDaysFormat" durationDaysFormat "P7M" $ CalendarDiffDays 7 0,+      testShowReadFormat "durationDaysFormat" durationDaysFormat "P5D" $ CalendarDiffDays 0 5,+      testShowReadFormat "durationDaysFormat" durationDaysFormat "P2Y3M81D" $ CalendarDiffDays 27 81,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "P0D" $ CalendarDiffTime 0 0,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "P4Y" $ CalendarDiffTime 48 0,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "P7M" $ CalendarDiffTime 7 0,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "P5D" $ CalendarDiffTime 0 $ 5 * nominalDay,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "P2Y3M81D" $ CalendarDiffTime 27 $ 81 * nominalDay,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "PT2H" $ CalendarDiffTime 0 $ 7200,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "PT3M" $ CalendarDiffTime 0 $ 180,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "PT12S" $ CalendarDiffTime 0 $ 12,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "PT1M18.77634S" $ CalendarDiffTime 0 $ 78.77634,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "PT2H1M18.77634S" $ CalendarDiffTime 0 $ 7278.77634,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "P5DT2H1M18.77634S" $+        CalendarDiffTime 0 $+          5 * nominalDay + 7278.77634,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "P7Y10M5DT2H1M18.77634S" $+        CalendarDiffTime 94 $+          5 * nominalDay + 7278.77634,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "P7Y10MT2H1M18.77634S" $+        CalendarDiffTime 94 $+          7278.77634,+      testShowReadFormat "durationTimeFormat" durationTimeFormat "P8YT2H1M18.77634S" $ CalendarDiffTime 96 $ 7278.77634,+      testShowReadFormat "alternativeDurationDaysFormat" (alternativeDurationDaysFormat ExtendedFormat) "P0001-00-00" $+        CalendarDiffDays 12 0,+      testShowReadFormat "alternativeDurationDaysFormat" (alternativeDurationDaysFormat ExtendedFormat) "P0002-03-29" $+        CalendarDiffDays 27 29,+      testShowReadFormat "alternativeDurationDaysFormat" (alternativeDurationDaysFormat ExtendedFormat) "P0561-08-29" $+        CalendarDiffDays (561 * 12 + 8) 29,+      testShowReadFormat+        "alternativeDurationTimeFormat"+        (alternativeDurationTimeFormat ExtendedFormat)+        "P0000-00-01T00:00:00"+        $ CalendarDiffTime 0 86400,+      testShowReadFormat+        "alternativeDurationTimeFormat"+        (alternativeDurationTimeFormat ExtendedFormat)+        "P0007-10-05T02:01:18.77634"+        $ CalendarDiffTime 94+        $ 5 * nominalDay + 7278.77634,+      testShowReadFormat+        "alternativeDurationTimeFormat"+        (alternativeDurationTimeFormat ExtendedFormat)+        "P4271-10-05T02:01:18.77634"+        $ CalendarDiffTime (12 * 4271 + 10)+        $ 5 * nominalDay + 7278.77634,+      testShowReadFormat "centuryFormat" centuryFormat "02" 2,+      testShowReadFormat "centuryFormat" centuryFormat "21" 21,+      testShowReadFormat+        "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+        ),+      testShowReadFormat+        "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+        ),+      testShowReadFormat+        "recurringIntervalFormat etc."+        (recurringIntervalFormat (calendarFormat ExtendedFormat) durationDaysFormat)+        "R74/2015-06-13/P1Y2M7D"+        (74, fromGregorian 2015 6 13, CalendarDiffDays 14 7),+      testShowReadFormat "timeOffsetFormat" iso8601Format "-06:30" (minutesToTimeZone (-390)),+      testShowReadFormat "timeOffsetFormat" iso8601Format "-06:00" (minutesToTimeZone (-360)),+      testReadFormat "timeOffsetFormat" iso8601Format "-06" (minutesToTimeZone (-360)),+      testShowReadFormat "timeOffsetFormat" iso8601Format "+11:00" (minutesToTimeZone 660),+      testReadFormat "timeOffsetFormat" iso8601Format "+11" (minutesToTimeZone 660),+      testShowReadFormat "timeOffsetFormat" iso8601Format "+00:00" (minutesToTimeZone 0),+      testReadFormat "timeOffsetFormat" iso8601Format "+00" (minutesToTimeZone 0),+      testReadFormat "timeOffsetFormat" iso8601Format "-00:00" (minutesToTimeZone 0),+      testReadFormat "timeOffsetFormat" iso8601Format "-00" (minutesToTimeZone 0),+      testShowReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "+0000" (minutesToTimeZone 0),+      testReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "+00" (minutesToTimeZone 0),+      testReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "-0000" (minutesToTimeZone 0),+      testReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "-00" (minutesToTimeZone 0),+      testShowReadFormat "timeOffsetFormat" iso8601Format "+00:10" (minutesToTimeZone 10),+      testShowReadFormat "timeOffsetFormat" iso8601Format "-00:10" (minutesToTimeZone (-10)),+      testShowReadFormat "timeOffsetFormat" iso8601Format "+01:35" (minutesToTimeZone 95),+      testShowReadFormat "timeOffsetFormat" iso8601Format "-01:35" (minutesToTimeZone (-95)),+      testShowReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "+0135" (minutesToTimeZone 95),+      testShowReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "-0135" (minutesToTimeZone (-95)),+      testShowReadFormat+        "timeOffsetFormat"+        (timeOffsetFormat BasicFormat)+        "-1100"+        (minutesToTimeZone $ negate $ 11 * 60),+      testShowReadFormat "timeOffsetFormat" (timeOffsetFormat BasicFormat) "+1015" (minutesToTimeZone $ 615),+      testShowReadFormat+        "zonedTimeFormat"+        iso8601Format+        "2024-07-06T08:45:56.553-06:30"+        (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone (-390))),+      testShowReadFormat+        "zonedTimeFormat"+        iso8601Format+        "2024-07-06T08:45:56.553-06:00"+        (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone (-360))),+      testReadFormat+        "zonedTimeFormat"+        iso8601Format+        "2024-07-06T08:45:56.553-06"+        (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone (-360))),+      testShowReadFormat+        "zonedTimeFormat"+        iso8601Format+        "2024-07-06T08:45:56.553+06:30"+        (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone 390)),+      testShowReadFormat+        "zonedTimeFormat"+        iso8601Format+        "2024-07-06T08:45:56.553+06:00"+        (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone 360)),+      testReadFormat+        "zonedTimeFormat"+        iso8601Format+        "2024-07-06T08:45:56.553+06"+        (ZonedTime (LocalTime (fromGregorian 2024 07 06) (TimeOfDay 8 45 56.553)) (minutesToTimeZone 360)),+      testReadFormat+        "zonedTimeFormat"+        iso8601Format+        "2024-05-30T16:15:18Z"+        (ZonedTime (LocalTime (fromGregorian 2024 05 30) (TimeOfDay 16 15 18)) utc),+      testReadFormat+        "zonedTimeFormat"+        iso8601Format+        "2024-05-30T16:15:18"+        (ZonedTime (LocalTime (fromGregorian 2024 05 30) (TimeOfDay 16 15 18)) utc),+      testShowReadFormat+        "utcTimeFormat"+        iso8601Format+        "2024-07-06T08:45:56.553Z"+        (UTCTime (fromGregorian 2024 07 06) (timeOfDayToTime $ TimeOfDay 8 45 56.553)),+      testShowReadFormat+        "utcTimeFormat"+        iso8601Format+        "2028-12-31T23:59:60.9Z"+        (UTCTime (fromGregorian 2028 12 31) (timeOfDayToTime $ TimeOfDay 23 59 60.9)),+      testReadFormat+        "utcTimeFormat"+        iso8601Format+        "2028-12-31T23:59:60.9"+        (UTCTime (fromGregorian 2028 12 31) (timeOfDayToTime $ TimeOfDay 23 59 60.9)),+      testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1994-W52-7" (fromGregorian 1995 1 1),+      testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1995-W01-1" (fromGregorian 1995 1 2),+      testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1996-W52-7" (fromGregorian 1996 12 29),+      testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1997-W01-2" (fromGregorian 1996 12 31),+      testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1997-W01-3" (fromGregorian 1997 1 1),+      testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1974-W32-6" (fromGregorian 1974 8 10),+      testShowReadFormat "weekDateFormat" (weekDateFormat BasicFormat) "1974W326" (fromGregorian 1974 8 10),+      testShowReadFormat "weekDateFormat" (weekDateFormat ExtendedFormat) "1995-W05-6" (fromGregorian 1995 2 4),+      testShowReadFormat "weekDateFormat" (weekDateFormat BasicFormat) "1995W056" (fromGregorian 1995 2 4),+      testShowReadFormat+        "weekDateFormat"+        (expandedWeekDateFormat 6 ExtendedFormat)+        "+001995-W05-6"+        (fromGregorian 1995 2 4),+      testShowReadFormat "weekDateFormat" (expandedWeekDateFormat 6 BasicFormat) "+001995W056" (fromGregorian 1995 2 4),+      testShowReadFormat "ordinalDateFormat" (ordinalDateFormat ExtendedFormat) "1846-235" (fromGregorian 1846 8 23),+      testShowReadFormat "ordinalDateFormat" (ordinalDateFormat BasicFormat) "1844236" (fromGregorian 1844 8 23),+      testShowReadFormat+        "ordinalDateFormat"+        (expandedOrdinalDateFormat 5 ExtendedFormat)+        "+01846-235"+        (fromGregorian 1846 8 23),+      testShowReadFormat "hourMinuteFormat" (hourMinuteFormat ExtendedFormat) "13:17.25" (TimeOfDay 13 17 15),+      testShowReadFormat "hourMinuteFormat" (hourMinuteFormat ExtendedFormat) "01:12.4" (TimeOfDay 1 12 24),+      testShowReadFormat "hourMinuteFormat" (hourMinuteFormat BasicFormat) "1317.25" (TimeOfDay 13 17 15),+      testShowReadFormat "hourMinuteFormat" (hourMinuteFormat BasicFormat) "0112.4" (TimeOfDay 1 12 24),+      testShowReadFormat "hourFormat" hourFormat "22" (TimeOfDay 22 0 0),+      testShowReadFormat "hourFormat" hourFormat "06" (TimeOfDay 6 0 0),+      testShowReadFormat "hourFormat" hourFormat "18.9475" (TimeOfDay 18 56 51)+    ]  testISO8601 :: TestTree testISO8601 = nameTest "ISO8601" [testShowFormats, testReadShowFormat]

@@ -1,883 +1,961 @@ {-# OPTIONS -fno-warn-orphans #-} -module Test.Format.ParseTime (-    testParseTime,-    test_parse_format,-) where--import Control.Monad-import Data.Char-import Data.Maybe-import Data.Proxy-import Data.Time.Compat-import Data.Time.Calendar.Month.Compat-import Data.Time.Calendar.OrdinalDate.Compat-import Data.Time.Calendar.Quarter.Compat-import Data.Time.Calendar.WeekDate.Compat-import Test.Arbitrary (supportedDayRange)-import Test.QuickCheck.Property-import Test.Tasty-import Test.Tasty.HUnit-import Test.Tasty.QuickCheck hiding (reason)-import Test.TestUtil--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"-        []-{--        [ readsTests-        , simpleFormatTests-        , extests-        , spacingTests-        , particularParseTests-        , badParseTests-        , defaultTimeZoneTests-        , militaryTimeZoneTests-        , propertyTests-        ]--}--yearDays :: Integer -> [Day]-yearDays y = [(fromGregorian y 1 1) .. (fromGregorian y 12 31)]--makeExhaustiveTest :: String -> [t] -> (t -> TestTree) -> TestTree-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 -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)]-               )-        )--testReads :: (Eq a, Show a, Read a) => [(a, String)] -> String -> TestTree-testReads expected target =-    let-        found = reads target-        result = assertEqual "" expected found-        name = show target-    in-        Test.Tasty.HUnit.testCase name result--readsTestsParensSpaces ::-    forall a.-    (Eq a, Show a, Read a) =>-    a ->-    String ->-    TestTree-readsTestsParensSpaces expected target =-    testGroup-        target-        [ testReads [(expected, "")] $ target-        , testReads [(expected, "")] $ "(" ++ target ++ ")"-        , testReads [(expected, "")] $ " (" ++ target ++ ")"-        , testReads [(expected, " ")] $ " ( " ++ target ++ " ) "-        , testReads [(expected, " ")] $ " (( " ++ target ++ " )) "-        , testReads ([] :: [(a, String)]) $ "(" ++ target-        , testReads [(expected, ")")] $ "" ++ target ++ ")"-        , testReads [(expected, "")] $ "((" ++ target ++ "))"-        , testReads [(expected, " ")] $ "  (   (     " ++ target ++ "   )  ) "-        ]--readsTests :: TestTree-readsTests =-    testGroup-        "reads"-        [ readsTestsParensSpaces (3 :: Integer) "3"-        , readsTestsParensSpaces "a" "\"a\""-        , readsTestsParensSpaces testDay "1912-07-08"-        , -- , readsTestsParensSpaces testDay "1912-7-8"-          readsTestsParensSpaces testTimeOfDay "08:04:02"-          -- , readsTestsParensSpaces testTimeOfDay "8:4:2"-        ]-  where-    testDay = fromGregorian 1912 7 8-    testTimeOfDay = TimeOfDay 8 4 2--epoch :: LocalTime-epoch = LocalTime (fromGregorian 1970 0 0) midnight--testReadSTime :: (Show a, Eq a, ParseTime a) => [(a, String)] -> String -> String -> TestTree-testReadSTime expected formatStr target =-    let-        found = readSTime False defaultTimeLocale formatStr target-        result = assertEqual "" expected found-        name = (show formatStr) ++ " of " ++ (show target)-    in-        Test.Tasty.HUnit.testCase name result--simpleFormatTests :: TestTree-simpleFormatTests =-    testGroup-        "simple"-        [ testReadSTime [(epoch, "")] "" ""-        , testReadSTime [(epoch, " ")] "" " "-        , testReadSTime [(epoch, "")] " " " "-        , testReadSTime [(epoch, "")] " " "  "-        , testReadSTime [(epoch, "")] "%k" "0"-        , testReadSTime [(epoch, "")] "%k" " 0"-        , testReadSTime [(epoch, "")] "%m" "01"-        , testReadSTime [(epoch, " ")] "%m" "01 "-        , testReadSTime [(epoch, " ")] " %m" " 01 "-        , testReadSTime [(epoch, "")] " %m" " 01"-        , -- https://ghc.haskell.org/trac/ghc/ticket/9150-          testReadSTime [(epoch, "")] " %M" " 00"-        , testReadSTime [(epoch, "")] "%M " "00 "-        , testReadSTime [(epoch, "")] "%Q" ""-        , testReadSTime [(epoch, " ")] "%Q" " "-        , testReadSTime [(epoch, "X")] "%Q" "X"-        , testReadSTime [(epoch, " X")] "%Q" " X"-        , testReadSTime [(epoch, "")] "%Q " " "-        , testReadSTime [(epoch, "")] "%Q X" " X"-        , testReadSTime [(epoch, "")] "%QX" "X"-        ]--spacingForFormatTests :: (Show t, Eq t, ParseTime t) => t -> String -> String -> TestTree-spacingForFormatTests expected formatStr target =-    testGroup-        formatStr-        [ 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 :: TestTree-spacingTests =-    testGroup-        "spacing"-        [ spacingForFormatTests epoch "%Q" ""-        , spacingForFormatTests epoch "%Q" ".0"-        , spacingForFormatTests epoch "%k" " 0"-        , spacingForFormatTests epoch "%M" "00"-        , spacingForFormatTests epoch "%m" "01"-        , spacingForFormatTests (TimeZone 120 False "") "%z" "+0200"-        , spacingForFormatTests (TimeZone 120 False "") "%Z" "+0200"-        , spacingForFormatTests (TimeZone (-480) False "PST") "%Z" "PST"-        ]--particularParseTests :: TestTree-particularParseTests =-    testGroup-        "particular"-        [ parseTest @Day True Nothing "%-d%-m%0Y" "2122012" -- ISSUE #232-        , parseTest @Day True Nothing "%-d%-m%0Y" "2132012" -- ISSUE #232-        ]--badParseTests :: TestTree-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))--}--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))--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))---- | 1969 - 2068-expectedYear :: Integer -> Integer-expectedYear i | i >= 69 = 1900 + i-expectedYear i = 2000 + i--show2 :: (Show n, Integral n) => n -> String-show2 i = (show (div i 10)) ++ (show (mod i 10))--parseYY :: Integer -> TestTree-parseYY i = parseTest False (Just (fromGregorian (expectedYear i) 1 1)) "%y" (show2 i)--parseCYY :: Integer -> Integer -> TestTree-parseCYY c i = parseTest False (Just (fromGregorian ((c * 100) + i) 1 1)) "%-C %y" ((show c) ++ " " ++ (show2 i))--parseCYY2 :: Integer -> Integer -> TestTree-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")--parseTest :: forall t. (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 ""-                   )-    in-        Test.Tasty.HUnit.testCase name result--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 = enumAdd (h - 10) 'K'--getMilZone :: Int -> TimeZone-getMilZone hour = TimeZone (hour * 60) False [getMilZoneLetter hour]--testParseTimeZone :: TimeZone -> TestTree-testParseTimeZone tz = parseTest False (Just tz) "%Z" (timeZoneName tz)--defaultTimeZoneTests :: TestTree-defaultTimeZoneTests = testGroup "default time zones" (fmap testParseTimeZone (knownTimeZones defaultTimeLocale))--militaryTimeZoneTests :: TestTree-militaryTimeZoneTests = testGroup "military time zones" (fmap (testParseTimeZone . getMilZone) [-12 .. 12])---- 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' 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 = compareResult' ""--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)-------- * show and read-----reads_expect :: a -> [(a, String)]-reads_expect t = [(t, "")]--prop_read_show :: (Read a, Show a, Eq a) => a -> Result-prop_read_show t = compareResult (reads_expect t) (reads (show t))--prop_read_show_ZonedUTC :: ZonedTime -> Result-prop_read_show_ZonedUTC t = compareResult (reads_expect $ zonedTimeToUTC t) (reads (show t))--prop_read_show_LocalUTC :: LocalTime -> Result-prop_read_show_LocalUTC t = compareResult (reads_expect $ localTimeToUTC utc t) (reads (show t))--prop_read_show_UTC_no_TZ :: UTCTime -> Result-prop_read_show_UTC_no_TZ t = compareResult (reads_expect t) $ reads $ show $ utcToLocalTime utc t-------- * special show functions-----prop_parse_showWeekDate :: Day -> Result-prop_parse_showWeekDate d = compareParse d "%G-W%V-%u" (showWeekDate d)--prop_parse_showGregorian :: Day -> Result-prop_parse_showGregorian d = compareParse d "%Y-%m-%d" (showGregorian d)--prop_parse_showOrdinalDate :: Day -> Result-prop_parse_showOrdinalDate d = compareParse d "%Y-%j" (showOrdinalDate d)-------- * 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_fromSundayStartWeek :: Day -> Result-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)---- 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)---- 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)---- 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--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)--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 $-        case parse False f s of-            Nothing -> True-            Just t -> t == t `asTypeOf` formatType fs-----------newtype FormatString a-    = FormatString String--formatType :: FormatString t -> t-formatType _ = undefined--instance Show (FormatString a) where-    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 "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-    -- , 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"-        [ localOption (QuickCheckTests 50000) $-            nameTest "general" $-                allTypes $-                    \name p -> nameTest name $ prop_format_parse_format p-        , nameTest "#177" $-            [ nameTest "start" $ \fc -> prop_format_parse_format Proxy fc (fst supportedDayRange)-            , nameTest "end" $ \fc -> prop_format_parse_format Proxy fc (snd supportedDayRange)-            ]-        , 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-        ]--readShowTests :: TestTree-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 "UTCTime (no TZ)" prop_read_show_UTC_no_TZ-        , 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-        ]--propertyTests :: TestTree-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-        -- 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"-        , -- month names-          "%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"-        , "%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"-        , -- 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"-        ]--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-        -- 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"-        , -- 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"-        ]--localTimeFormats :: [FormatString LocalTime]-localTimeFormats = map FormatString [] {-"%Q","%Q ","%QX"-}--timeZoneFormats :: [FormatString TimeZone]-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"-        ]--zonedTimeAlmostFormats :: [FormatString ZonedTime]-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"]--universalTimeFormats :: [FormatString UniversalTime]-universalTimeFormats = map FormatString []--calendarDiffDaysFormats :: [FormatString CalendarDiffDays]-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"-        ]--diffTimeFormats :: [FormatString DiffTime]-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"]-------- * Formats that do not include all the information-----partialDayFormats :: [FormatString Day]-partialDayFormats = map FormatString []--partialTimeOfDayFormats :: [FormatString TimeOfDay]-partialTimeOfDayFormats = map FormatString ["%H", "%M", "%S", "%H:%M"]--partialLocalTimeFormats :: [FormatString LocalTime]-partialLocalTimeFormats = map FormatString []--partialZonedTimeFormats :: [FormatString ZonedTime]-partialZonedTimeFormats =-    map-        FormatString-        -- %s does not include second decimals-        [ "%s %z"-        , -- %S does not include second decimals-          "%c"-        , "%a, %d %b %Y %H:%M:%S %Z"-        ]--partialUTCTimeFormats :: [FormatString UTCTime]-partialUTCTimeFormats =-    map-        FormatString-        -- %s does not include second decimals-        [ "%s"-        , -- %c does not include second decimals-          "%c"-        ]--partialUniversalTimeFormats :: [FormatString UniversalTime]-partialUniversalTimeFormats = map FormatString []--failingPartialDayFormats :: [FormatString Day]-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"]+module Test.Format.ParseTime+  ( testParseTime,+    test_parse_format,+  )+where++import Control.Monad+import Data.Char+import Data.Maybe+import Data.Proxy+import Data.Time.Calendar.Month.Compat+import Data.Time.Calendar.OrdinalDate.Compat+import Data.Time.Calendar.Quarter.Compat+import Data.Time.Calendar.WeekDate.Compat+import Data.Time.Compat+import Test.Arbitrary (supportedDayRange)+import Test.QuickCheck.Property+import Test.Tasty+import Test.Tasty.HUnit+import Test.Tasty.QuickCheck hiding (reason)+import Test.TestUtil++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" []++yearDays :: Integer -> [Day]+yearDays y = [(fromGregorian y 1 1) .. (fromGregorian y 12 31)]++makeExhaustiveTest :: String -> [t] -> (t -> TestTree) -> TestTree+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 -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)]+           )+    )++testReads :: (Eq a, Show a, Read a) => [(a, String)] -> String -> TestTree+testReads expected target =+  let found = reads target+      result = assertEqual "" expected found+      name = show target+   in Test.Tasty.HUnit.testCase name result++readsTestsParensSpaces ::+  forall a.+  (Eq a, Show a, Read a) =>+  a ->+  String ->+  TestTree+readsTestsParensSpaces expected target =+  testGroup+    target+    [ testReads [(expected, "")] $ target,+      testReads [(expected, "")] $ "(" ++ target ++ ")",+      testReads [(expected, "")] $ " (" ++ target ++ ")",+      testReads [(expected, " ")] $ " ( " ++ target ++ " ) ",+      testReads [(expected, " ")] $ " (( " ++ target ++ " )) ",+      testReads ([] :: [(a, String)]) $ "(" ++ target,+      testReads [(expected, ")")] $ "" ++ target ++ ")",+      testReads [(expected, "")] $ "((" ++ target ++ "))",+      testReads [(expected, " ")] $ "  (   (     " ++ target ++ "   )  ) "+    ]++readsTests :: TestTree+readsTests =+  testGroup+    "reads"+    [ readsTestsParensSpaces (3 :: Integer) "3",+      readsTestsParensSpaces "a" "\"a\"",+      readsTestsParensSpaces testDay "1912-07-08",+      -- , readsTestsParensSpaces testDay "1912-7-8"+      readsTestsParensSpaces testTimeOfDay "08:04:02"+      -- , readsTestsParensSpaces testTimeOfDay "8:4:2"+    ]+  where+    testDay = fromGregorian 1912 7 8+    testTimeOfDay = TimeOfDay 8 4 2++epoch :: LocalTime+epoch = LocalTime (fromGregorian 1970 0 0) midnight++testReadSTime :: (Show a, Eq a, ParseTime a) => [(a, String)] -> String -> String -> TestTree+testReadSTime expected formatStr target =+  let found = readSTime False defaultTimeLocale formatStr target+      result = assertEqual "" expected found+      name = (show formatStr) ++ " of " ++ (show target)+   in Test.Tasty.HUnit.testCase name result++simpleFormatTests :: TestTree+simpleFormatTests =+  testGroup+    "simple"+    [ testReadSTime [(epoch, "")] "" "",+      testReadSTime [(epoch, " ")] "" " ",+      testReadSTime [(epoch, "")] " " " ",+      testReadSTime [(epoch, "")] " " "  ",+      testReadSTime [(epoch, "")] "%k" "0",+      testReadSTime [(epoch, "")] "%k" " 0",+      testReadSTime [(epoch, "")] "%m" "01",+      testReadSTime [(epoch, " ")] "%m" "01 ",+      testReadSTime [(epoch, " ")] " %m" " 01 ",+      testReadSTime [(epoch, "")] " %m" " 01",+      -- https://ghc.haskell.org/trac/ghc/ticket/9150+      testReadSTime [(epoch, "")] " %M" " 00",+      testReadSTime [(epoch, "")] "%M " "00 ",+      testReadSTime [(epoch, "")] "%Q" "",+      testReadSTime [(epoch, " ")] "%Q" " ",+      testReadSTime [(epoch, "X")] "%Q" "X",+      testReadSTime [(epoch, " X")] "%Q" " X",+      testReadSTime [(epoch, "")] "%Q " " ",+      testReadSTime [(epoch, "")] "%Q X" " X",+      testReadSTime [(epoch, "")] "%QX" "X"+    ]++spacingForFormatTests :: (Show t, Eq t, ParseTime t) => t -> String -> String -> TestTree+spacingForFormatTests expected formatStr target =+  testGroup+    formatStr+    [ 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 :: TestTree+spacingTests =+  testGroup+    "spacing"+    [ spacingForFormatTests epoch "%Q" "",+      spacingForFormatTests epoch "%Q" ".0",+      spacingForFormatTests epoch "%k" " 0",+      spacingForFormatTests epoch "%M" "00",+      spacingForFormatTests epoch "%m" "01",+      spacingForFormatTests (TimeZone 120 False "") "%z" "+0200",+      spacingForFormatTests (TimeZone 120 False "") "%Z" "+0200",+      spacingForFormatTests (TimeZone (-480) False "PST") "%Z" "PST"+    ]++particularParseTests :: TestTree+particularParseTests =+  testGroup+    "particular"+    [ parseTest @Day True Nothing "%-d%-m%0Y" "2122012", -- ISSUE #232+      parseTest @Day True Nothing "%-d%-m%0Y" "2132012" -- ISSUE #232+    ]++badParseTests :: TestTree+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))+-}++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))++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))++-- | 1969 - 2068+expectedYear :: Integer -> Integer+expectedYear i | i >= 69 = 1900 + i+expectedYear i = 2000 + i++show2 :: (Show n, Integral n) => n -> String+show2 i = (show (div i 10)) ++ (show (mod i 10))++parseYY :: Integer -> TestTree+parseYY i = parseTest False (Just (fromGregorian (expectedYear i) 1 1)) "%y" (show2 i)++parseCYY :: Integer -> Integer -> TestTree+parseCYY c i = parseTest False (Just (fromGregorian ((c * 100) + i) 1 1)) "%-C %y" ((show c) ++ " " ++ (show2 i))++parseCYY2 :: Integer -> Integer -> TestTree+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")++parseTest :: forall t. (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 ""+             )+   in Test.Tasty.HUnit.testCase name result++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 = enumAdd (h - 10) 'K'++getMilZone :: Int -> TimeZone+getMilZone hour = TimeZone (hour * 60) False [getMilZoneLetter hour]++testParseTimeZone :: TimeZone -> TestTree+testParseTimeZone tz = parseTest False (Just tz) "%Z" (timeZoneName tz)++defaultTimeZoneTests :: TestTree+defaultTimeZoneTests = testGroup "default time zones" (fmap testParseTimeZone (knownTimeZones defaultTimeLocale))++militaryTimeZoneTests :: TestTree+militaryTimeZoneTests = testGroup "military time zones" (fmap (testParseTimeZone . getMilZone) [-12 .. 12])++-- 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' 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 = compareResult' ""++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)++--++-- * show and read++--+reads_expect :: a -> [(a, String)]+reads_expect t = [(t, "")]++prop_read_show :: (Read a, Show a, Eq a) => a -> Result+prop_read_show t = compareResult (reads_expect t) (reads (show t))++prop_read_show_ZonedUTC :: ZonedTime -> Result+prop_read_show_ZonedUTC t = compareResult (reads_expect $ zonedTimeToUTC t) (reads (show t))++prop_read_show_LocalUTC :: LocalTime -> Result+prop_read_show_LocalUTC t = compareResult (reads_expect $ localTimeToUTC utc t) (reads (show t))++prop_read_show_UTC_no_TZ :: UTCTime -> Result+prop_read_show_UTC_no_TZ t = compareResult (reads_expect t) $ reads $ show $ utcToLocalTime utc t++--++-- * special show functions++--+prop_parse_showWeekDate :: Day -> Result+prop_parse_showWeekDate d = compareParse d "%G-W%V-%u" (showWeekDate d)++prop_parse_showGregorian :: Day -> Result+prop_parse_showGregorian d = compareParse d "%Y-%m-%d" (showGregorian d)++prop_parse_showOrdinalDate :: Day -> Result+prop_parse_showOrdinalDate d = compareParse d "%Y-%j" (showOrdinalDate d)++--++-- * 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_fromSundayStartWeek :: Day -> Result+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)++-- 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)++-- 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)++-- 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 DayOfWeek where+  allFormatCodes _ = [(False, s) | s <- "uwaA"]++instance HasFormatCodes Month where+  allFormatCodes _ = [(False, s) | s <- "YyCBbhm"]++instance HasFormatCodes QuarterOfYear where+  allFormatCodes _ = [(False, s) | s <- "v"]++instance HasFormatCodes Quarter where+  allFormatCodes _ = allFormatCodes (Proxy :: Proxy QuarterOfYear) ++ [(False, s) | s <- "YyC"]++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++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)++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 $+    case parse False f s of+      Nothing -> True+      Just t -> t == t `asTypeOf` formatType fs++--+--+--+newtype FormatString a+  = FormatString String++formatType :: FormatString t -> t+formatType _ = undefined++instance Show (FormatString a) where+  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,+    -- TODO: nameTest "Month" $ tgroup monthFormats prop,+    -- TODO: nameTest "Quarter" $ tgroup quarterFormats 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+    -- TODO: nameTest "CalendarDiffDays" $ tgroup calendarDiffDaysFormats prop,+    -- TODO: nameTest "CalendarDiffTime" $ tgroup calendarDiffTimeFormats prop,+    -- TODO: nameTest "DiffTime" $ tgroup diffTimeFormats prop,+    -- TODO: 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),+    -- TODO: f "DayOfWeek" (Proxy :: Proxy DayOfWeek),+    -- TODO: f "Month" (Proxy :: Proxy Month),+    -- TODO: f "QuarterOfYear" (Proxy :: Proxy QuarterOfYear),+    -- TODO: f "Quarter" (Proxy :: Proxy Quarter),+    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++class (Eq a, Show a, ParseTime a) => TestParse a where+  nonPosixValue :: a -> Bool+  nonPosixValue _ = False++instance TestParse UTCTime where+  nonPosixValue (UTCTime _ dt) = dt >= 86400 || dt < 0++instance TestParse ZonedTime where+  nonPosixValue (ZonedTime t _) = nonPosixValue t++instance TestParse TimeZone++instance TestParse LocalTime where+  nonPosixValue (LocalTime _ t) = nonPosixValue t++instance TestParse Day++-- TODO: instance TestParse Month++-- TODO: instance TestParse DayOfWeek++instance TestParse TimeOfDay where+  nonPosixValue (TimeOfDay _ _ s) = s >= 60 || s < 0++prop_parse_s :: forall a. (TestParse a) => (UTCTime -> a) -> UTCTime -> Result+prop_parse_s f t =+  if nonPosixValue t+    then succeeded+    else+      let str = format "%s%Q" t+          found = parse False "%s%Q" str+          expected = f t+       in compareResult (Just expected) found++prop_parse_sz :: forall a. (TestParse a) => (ZonedTime -> a) -> ZonedTime -> Result+prop_parse_sz f t =+  if nonPosixValue t+    then succeeded+    else+      let str = format "%s%Q %z" t+          found = parse False "%s%Q %z" str+          expected = f t+       in compareResult (Just expected) found++zeroTimeZone :: TimeZone+zeroTimeZone = TimeZone 0 False ""++parse_s_tests :: TestTree+parse_s_tests =+  nameTest+    "parse_s"+    [ nameTest "UTCTime" $ prop_parse_s @UTCTime id,+      nameTest "ZonedTime" $ prop_parse_s @ZonedTime $ utcToZonedTime zeroTimeZone,+      nameTest "TimeZone" $ prop_parse_s @TimeZone $ \_ -> zeroTimeZone,+      nameTest "LocalTime" $ prop_parse_s @LocalTime $ utcToLocalTime zeroTimeZone,+      nameTest "Day" $ prop_parse_s @Day utctDay,+      -- TODO: nameTest "Month" $ prop_parse_s @Month $ (\(MonthDay m _) -> m) . utctDay,+      -- TODO: nameTest "DayOfWeek" $ prop_parse_s @DayOfWeek $ dayOfWeek . utctDay,+      nameTest "TimeOfDay" $ prop_parse_s @TimeOfDay $ localTimeOfDay . utcToLocalTime zeroTimeZone+    ]++parse_sz_tests :: TestTree+parse_sz_tests =+  nameTest+    "parse_sz"+    [ nameTest "UTCTime" $ prop_parse_sz @UTCTime zonedTimeToUTC,+      nameTest "ZonedTime" $ prop_parse_sz @ZonedTime id,+      nameTest "TimeZone" $ prop_parse_sz @TimeZone zonedTimeZone,+      nameTest "LocalTime" $ prop_parse_sz @LocalTime zonedTimeToLocalTime,+      nameTest "Day" $ prop_parse_sz @Day $ localDay . zonedTimeToLocalTime,+      -- TODO: nameTest "Month" $ prop_parse_sz @Month $ (\(MonthDay m _) -> m) . localDay . zonedTimeToLocalTime,+      -- TODO: nameTest "DayOfWeek" $ prop_parse_sz @DayOfWeek $ dayOfWeek . localDay . zonedTimeToLocalTime,+      nameTest "TimeOfDay" $ prop_parse_sz @TimeOfDay $ localTimeOfDay . zonedTimeToLocalTime+    ]++formatParseFormatTests :: TestTree+formatParseFormatTests =+  nameTest+    "format_parse_format"+    [ localOption (QuickCheckTests 50000) $+        nameTest "general" $+          allTypes $+            \name p -> nameTest name $ prop_format_parse_format p,+      nameTest "#177" $+        [ nameTest "start" $ \fc -> prop_format_parse_format Proxy fc (fst supportedDayRange),+          nameTest "end" $ \fc -> prop_format_parse_format Proxy fc (snd supportedDayRange)+        ],+      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+    ]++readShowTests :: TestTree+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 "UTCTime (no TZ)" prop_read_show_UTC_no_TZ,+      nameTest "UniversalTime" (prop_read_show :: UniversalTime -> Result),+      nameTest "NominalDiffTime" (prop_read_show :: NominalDiffTime -> Result),+      nameTest "DiffTime" (prop_read_show :: DiffTime -> Result)+      -- TODO: nameTest "CalendarDiffDays" (prop_read_show :: CalendarDiffDays -> Result),+      -- TODO: 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+    ]++propertyTests :: TestTree+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,+        parse_s_tests,+        parse_sz_tests,+        formatParseFormatTests,+        badInputTests+      ]++dayFormats :: [FormatString Day]+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",+      -- month names+      "%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",+      "%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",+      -- 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"+    ]++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"+    ]++quarterFormats :: [FormatString Quarter]+quarterFormats =+  map+    FormatString+    -- numeric year, quarter+    [ "%Y-%v",+      "%Y-Q%v",+      "%YQ%v",+      "%C%y%v",+      "%Y %v",+      "%v/%Y",+      "%v/%Y",+      "%Y/%vm",+      "%C %y %v"+    ]++timeOfDayFormats :: [FormatString TimeOfDay]+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",+      -- 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"+    ]++localTimeFormats :: [FormatString LocalTime]+localTimeFormats = map FormatString [] {-"%Q","%Q ","%QX"-}++timeZoneFormats :: [FormatString TimeZone]+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"+    ]++zonedTimeAlmostFormats :: [FormatString ZonedTime]+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"]++universalTimeFormats :: [FormatString UniversalTime]+universalTimeFormats = map FormatString []++calendarDiffDaysFormats :: [FormatString CalendarDiffDays]+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"+    ]++diffTimeFormats :: [FormatString DiffTime]+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"]++--++-- * Formats that do not include all the information++--+partialDayFormats :: [FormatString Day]+partialDayFormats = map FormatString []++partialTimeOfDayFormats :: [FormatString TimeOfDay]+partialTimeOfDayFormats = map FormatString ["%H", "%M", "%S", "%H:%M"]++partialLocalTimeFormats :: [FormatString LocalTime]+partialLocalTimeFormats = map FormatString []++partialZonedTimeFormats :: [FormatString ZonedTime]+partialZonedTimeFormats =+  map+    FormatString+    -- %s does not include second decimals+    [ "%s %z",+      -- %S does not include second decimals+      "%c",+      "%a, %d %b %Y %H:%M:%S %Z"+    ]++partialUTCTimeFormats :: [FormatString UTCTime]+partialUTCTimeFormats =+  map+    FormatString+    -- %s does not include second decimals+    [ "%s",+      -- %c does not include second decimals+      "%c"+    ]++partialUniversalTimeFormats :: [FormatString UniversalTime]+partialUniversalTimeFormats = map FormatString []++failingPartialDayFormats :: [FormatString Day]+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"]