cleaning up cpp needs

Signed-off-by: buckie <wjmartino@gmail.com>

Author: buckie

include/thyme.h

@@ -1,7 +1 @@
-#define INSTANCES_USUAL     Eq, Ord, Data, Typeable, Generic
-#define INSTANCES_NEWTYPE   INSTANCES_USUAL, Enum, Ix, Hashable, NFData
-#define INSTANCES_MICRO     INSTANCES_NEWTYPE, Bounded, Random, Arbitrary, CoArbitrary
-#define LensP Lens'
-#define LENS(S,F,A) {-# INLINE _/**/F #-}; _/**/F :: LensP S A; _/**/F = lens F $ \ S {..} F/**/_ -> S {F = F/**/_, ..}
-
-#define W_GREGORIAN <https://en.wikipedia.org/wiki/Gregorian_calendar Gregorian>
+#define LENS(S,F,A) {-# INLINE _/**/F #-}; _/**/F :: Lens' S A; _/**/F = lens F $ \ S {..} F/**/_ -> S {F = F/**/_, ..}

src/Data/Thyme/Calendar/Internal.hs

@@ -59,7 +59,7 @@ type Days = Int
 -- <https://en.wikipedia.org/wiki/Julian_day#Variants Modified Julian Day>
 -- (MJD) epoch.
 --
--- To convert a 'Day' to the corresponding 'YearMonthDay' in the W_GREGORIAN
+-- To convert a 'Day' to the corresponding 'YearMonthDay' in the <https://en.wikipedia.org/wiki/Gregorian_calendar Gregorian>
 -- calendar, see 'gregorian'.
 --
 -- @
@@ -84,7 +84,7 @@ type Days = Int
 -- Other ways of viewing a 'Day' include 'ordinalDate', and 'weekDate'.
 newtype Day = ModifiedJulianDay
     { toModifiedJulianDay :: Int
-    } deriving (INSTANCES_NEWTYPE, CoArbitrary)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Enum, Ix, Hashable, NFData, CoArbitrary)
 
 instance AffineSpace Day where
     type Diff Day = Days
@@ -110,7 +110,7 @@ instance AffineSpace Day where
 modifiedJulianDay :: Iso' Day Int
 modifiedJulianDay = iso toModifiedJulianDay ModifiedJulianDay
 
--- | Conversion between a W_GREGORIAN 'OrdinalDate' and the corresponding
+-- | Conversion between a <https://en.wikipedia.org/wiki/Gregorian_calendar Gregorian> 'OrdinalDate' and the corresponding
 -- 'YearMonthDay'.
 --
 -- @
@@ -204,7 +204,7 @@ data YearMonthDay = YearMonthDay
     { ymdYear :: {-# UNPACK #-}!Year
     , ymdMonth :: {-# UNPACK #-}!Month
     , ymdDay :: {-# UNPACK #-}!DayOfMonth
-    } deriving (INSTANCES_USUAL, Show)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 LENS(YearMonthDay,ymdYear,Year)
 LENS(YearMonthDay,ymdMonth,Month)
@@ -215,7 +215,7 @@ instance NFData YearMonthDay
 
 ------------------------------------------------------------------------
 
--- | Is it a leap year according to the W_GREGORIAN calendar?
+-- | Is it a leap year according to the <https://en.wikipedia.org/wiki/Gregorian_calendar Gregorian> calendar?
 isLeapYear :: Year -> Bool
 isLeapYear y = y .&. 3 == 0 && (r100 /= 0 || q100 .&. 3 == 0) where
     (q100, r100) = y `quotRem` 100
@@ -228,7 +228,7 @@ type DayOfYear = Int
 data OrdinalDate = OrdinalDate
     { odYear :: {-# UNPACK #-}!Year
     , odDay :: {-# UNPACK #-}!DayOfYear
-    } deriving (INSTANCES_USUAL, Show)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 LENS(OrdinalDate,odYear,Year)
 LENS(OrdinalDate,odDay,DayOfYear)
@@ -368,7 +368,7 @@ randomIsoR l (x, y) = first (^. l) . randomR (l # x, l # y)
 data MonthDay = MonthDay
     { mdMonth :: {-# UNPACK #-}!Month
     , mdDay :: {-# UNPACK #-}!DayOfMonth
-    } deriving (INSTANCES_USUAL, Show)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 LENS(MonthDay,mdMonth,Month)
 LENS(MonthDay,mdDay,DayOfMonth)
@@ -512,7 +512,7 @@ data WeekDate = WeekDate
         -- belong to the previous year.
     , wdDay :: {-# UNPACK #-}!DayOfWeek
         -- ^ /1 = Monday/ … /7 = Sunday/.
-    } deriving (INSTANCES_USUAL, Show)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 LENS(WeekDate,wdYear,Year)
 LENS(WeekDate,wdWeek,WeekOfYear)
@@ -602,7 +602,7 @@ data SundayWeek = SundayWeek
         -- /Sunday/ of the year as the first day of week /01/.
     , swDay :: {-# UNPACK #-}!DayOfWeek
         -- ^ /0 = Sunday/.
-    } deriving (INSTANCES_USUAL, Show)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 LENS(SundayWeek,swYear,Year)
 LENS(SundayWeek,swWeek,WeekOfYear)
@@ -668,7 +668,7 @@ data MondayWeek = MondayWeek
         -- /Monday/ of the year as the first day of week /01/.
     , mwDay :: {-# UNPACK #-}!DayOfWeek
         -- ^ /7 = Sunday/.
-    } deriving (INSTANCES_USUAL, Show)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 LENS(MondayWeek,mwYear,Year)
 LENS(MondayWeek,mwWeek,WeekOfYear)

src/Data/Thyme/Calendar/WeekdayOfMonth.hs

@@ -52,7 +52,7 @@ data WeekdayOfMonth = WeekdayOfMonth
         -- last 'DayOfWeek' of the month.
     , womDayOfWeek :: {-# UNPACK #-}!DayOfWeek
         -- ^ Day of week. /1 = Monday, 7 = Sunday/, like ISO 8601 'WeekDate'.
-    } deriving (INSTANCES_USUAL, Show)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 LENS(WeekdayOfMonth,womYear,Year)
 LENS(WeekdayOfMonth,womMonth,Month)

src/Data/Thyme/Clock/Internal.hs

@@ -130,7 +130,7 @@ fromSecondsIntegral _ = review microseconds . (*) 1000000 . fromIntegral
 -- > 'fromSeconds'' 100 '^-^' 'fromSeconds'' 100 '^/' 4
 -- 75s
 -- @
-newtype DiffTime = DiffTime Micro deriving (INSTANCES_MICRO, AdditiveGroup)
+newtype DiffTime = DiffTime Micro deriving (Eq, Ord, Data, Typeable, Generic, Enum, Ix, Hashable, NFData, Bounded, Random, Arbitrary, CoArbitrary, AdditiveGroup)
 
 derivingUnbox "DiffTime" [t| DiffTime -> Micro |]
     [| \ (DiffTime a) -> a |] [| DiffTime |]
@@ -188,7 +188,7 @@ instance TimeDiff DiffTime where
 -- @
 --
 -- See also: 'UTCTime'.
-newtype NominalDiffTime = NominalDiffTime Micro deriving (INSTANCES_MICRO, AdditiveGroup)
+newtype NominalDiffTime = NominalDiffTime Micro deriving (Eq, Ord, Data, Typeable, Generic, Enum, Ix, Hashable, NFData, Bounded, Random, Arbitrary, CoArbitrary, AdditiveGroup)
 
 derivingUnbox "NominalDiffTime" [t| NominalDiffTime -> Micro |]
     [| \ (NominalDiffTime a) -> a |] [| NominalDiffTime |]
@@ -239,7 +239,7 @@ posixDayLength = microseconds # 86400000000
 --
 -- The difference between UT1 and UTC is
 -- <http://en.wikipedia.org/wiki/DUT1 DUT1>.
-newtype UniversalTime = UniversalRep NominalDiffTime deriving (INSTANCES_MICRO)
+newtype UniversalTime = UniversalRep NominalDiffTime deriving (Eq, Ord, Data, Typeable, Generic, Enum, Ix, Hashable, NFData, Bounded, Random, Arbitrary, CoArbitrary)
 
 derivingUnbox "UniversalTime" [t| UniversalTime -> NominalDiffTime |]
     [| \ (UniversalRep a) -> a |] [| UniversalRep |]
@@ -313,7 +313,7 @@ pattern UniversalTime mjd <- (view modJulianDate -> mjd)
 -- If leap seconds matter, use 'Data.Thyme.Clock.TAI.AbsoluteTime' from
 -- "Data.Thyme.Clock.TAI" instead, along with
 -- 'Data.Thyme.Clock.TAI.absoluteTime'' and 'UTCView' for presentation.
-newtype UTCTime = UTCRep NominalDiffTime deriving (INSTANCES_MICRO)
+newtype UTCTime = UTCRep NominalDiffTime deriving (Eq, Ord, Data, Typeable, Generic, Enum, Ix, Hashable, NFData, Bounded, Random, Arbitrary, CoArbitrary)
 
 derivingUnbox "UTCTime" [t| UTCTime -> NominalDiffTime |]
     [| \ (UTCRep a) -> a |] [| UTCRep |]
@@ -326,7 +326,7 @@ data UTCView = UTCView
     -- ^ Calendar date.
     , utcvDayTime :: {-# UNPACK #-}!DiffTime
     -- ^ Time elapsed since midnight; /0/ ≤ 'utcvDayTime' < /86401s/.
-    } deriving (INSTANCES_USUAL, Show)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 -- | 'Lens'' for the calendar 'Day' component of a 'UTCView'.
 LENS(UTCView,utcvDay,Day)

src/Data/Thyme/Clock/TAI.hs

@@ -74,7 +74,7 @@ import Test.QuickCheck
 --
 -- Internally this is the number of seconds since 'taiEpoch'. TAI days are
 -- exactly 86400 SI seconds long.
-newtype AbsoluteTime = AbsoluteTime DiffTime deriving (INSTANCES_MICRO)
+newtype AbsoluteTime = AbsoluteTime DiffTime deriving (Eq, Ord, Data, Typeable, Generic, Enum, Ix, Hashable, NFData, Bounded, Random, Arbitrary, CoArbitrary)
 
 derivingUnbox "AbsoluteTime" [t| AbsoluteTime -> DiffTime |]
     [| \ (AbsoluteTime a) -> a |] [| AbsoluteTime |]
@@ -107,7 +107,7 @@ instance AffineSpace AbsoluteTime where
 -- program shipped with such a table could become out-of-date in as little
 -- as 6 months. See 'parseTAIUTCDAT' for details.
 data TAIUTCMap = TAIUTCMap (Map UTCTime TAIUTCRow) (Map AbsoluteTime TAIUTCRow)
-    deriving (INSTANCES_USUAL, Show)
+    deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 -- | Each line of TAIUTCDAT (see 'parseTAIUTCDAT') specifies the difference
 -- between TAI and UTC for a particular period. For example:
@@ -161,7 +161,7 @@ data TAIUTCMap = TAIUTCMap (Map UTCTime TAIUTCRow) (Map AbsoluteTime TAIUTCRow)
 data TAIUTCRow = TAIUTCRow !DiffTime !UTCTime !Rational
     -- ^ Each row comprises of an /additive/ component, the /base/ of the
     -- scaled component, and the /coefficient/ of the scaled component.
-    deriving (INSTANCES_USUAL, Show)
+    deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 {-# INLINE lookupLE #-}
 lookupLE :: (Ord k) => k -> Map k TAIUTCRow -> TAIUTCRow

src/Data/Thyme/Internal/Micro.hs

@@ -41,7 +41,7 @@ import Text.ParserCombinators.ReadP
 import Text.Read
 #endif
 
-newtype Micro = Micro Int64 deriving (INSTANCES_MICRO)
+newtype Micro = Micro Int64 deriving (Eq, Ord, Data, Typeable, Generic, Enum, Ix, Hashable, NFData, Bounded, Random, Arbitrary, CoArbitrary)
 
 derivingUnbox "Micro" [t| Micro -> Int64 |]
     [| \ (Micro a) -> a |] [| Micro |]

src/Data/Thyme/LocalTime.hs

@@ -71,7 +71,7 @@ data TimeZone = TimeZone
     -- ^ Is this a summer-only (i.e. daylight savings) time zone?
     , timeZoneName :: String
     -- ^ The name of the zone, typically a three- or four-letter acronym.
-    } deriving (INSTANCES_USUAL)
+    } deriving (Eq, Ord, Data, Typeable, Generic)
 
 LENS(TimeZone,timeZoneMinutes,Minutes)
 LENS(TimeZone,timeZoneSummerOnly,Bool)
@@ -184,7 +184,7 @@ data TimeOfDay = TimeOfDay
     { todHour :: {-# UNPACK #-}!Hour
     , todMin :: {-# UNPACK #-}!Minute
     , todSec :: {-# UNPACK #-}!DiffTime -- ^ Second.
-    } deriving (INSTANCES_USUAL)
+    } deriving (Eq, Ord, Data, Typeable, Generic)
 
 LENS(TimeOfDay,todHour,Hour)
 LENS(TimeOfDay,todMin,Minute)
@@ -353,7 +353,7 @@ data LocalTime = LocalTime
     -- ^ Local calendar date.
     , localTimeOfDay :: {-only 3 words…-} {-# UNPACK #-}!TimeOfDay
     -- ^ Local time-of-day.
-    } deriving (INSTANCES_USUAL)
+    } deriving (Eq, Ord, Data, Typeable, Generic)
 
 LENS(LocalTime,localDay,Day)
 LENS(LocalTime,localTimeOfDay,TimeOfDay)
@@ -461,7 +461,7 @@ ut1LocalTime long = iso localise globalise where
 data ZonedTime = ZonedTime
     { zonedTimeToLocalTime :: {-only 4 words…-} {-# UNPACK #-}!LocalTime
     , zonedTimeZone :: !TimeZone
-    } deriving (INSTANCES_USUAL)
+    } deriving (Eq, Ord, Data, Typeable, Generic)
 
 LENS(ZonedTime,zonedTimeToLocalTime,LocalTime)
 LENS(ZonedTime,zonedTimeZone,TimeZone)