ghcjs buildable version

.gitignore

@@ -1 +1,3 @@
 /dist/
+dump/
+.stack-work/

src/Data/Thyme/Calendar.hs

@@ -3,7 +3,7 @@
 {-# LANGUAGE ViewPatterns #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-#include "thyme.h"
+
 #if HLINT
 #include "cabal_macros.h"
 #endif

src/Data/Thyme/Calendar/Internal.hs

@@ -13,7 +13,6 @@
 {-# LANGUAGE ViewPatterns #-}
 {-# OPTIONS_HADDOCK hide #-}
 
-#include "thyme.h"
 #if HLINT
 #include "cabal_macros.h"
 #endif
@@ -59,7 +58,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 +83,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 +109,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,18 +203,14 @@ data YearMonthDay = YearMonthDay
     { ymdYear :: {-# UNPACK #-}!Year
     , ymdMonth :: {-# UNPACK #-}!Month
     , ymdDay :: {-# UNPACK #-}!DayOfMonth
-    } deriving (INSTANCES_USUAL, Show)
-
-LENS(YearMonthDay,ymdYear,Year)
-LENS(YearMonthDay,ymdMonth,Month)
-LENS(YearMonthDay,ymdDay,DayOfMonth)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 instance Hashable YearMonthDay
 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,10 +223,7 @@ type DayOfYear = Int
 data OrdinalDate = OrdinalDate
     { odYear :: {-# UNPACK #-}!Year
     , odDay :: {-# UNPACK #-}!DayOfYear
-    } deriving (INSTANCES_USUAL, Show)
-
-LENS(OrdinalDate,odYear,Year)
-LENS(OrdinalDate,odDay,DayOfYear)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 instance Hashable OrdinalDate
 instance NFData OrdinalDate
@@ -368,10 +360,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)
-
-LENS(MonthDay,mdMonth,Month)
-LENS(MonthDay,mdDay,DayOfMonth)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 instance Hashable MonthDay
 instance NFData MonthDay
@@ -512,11 +501,7 @@ data WeekDate = WeekDate
         -- belong to the previous year.
     , wdDay :: {-# UNPACK #-}!DayOfWeek
         -- ^ /1 = Monday/ … /7 = Sunday/.
-    } deriving (INSTANCES_USUAL, Show)
-
-LENS(WeekDate,wdYear,Year)
-LENS(WeekDate,wdWeek,WeekOfYear)
-LENS(WeekDate,wdDay,DayOfWeek)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 instance Hashable WeekDate
 instance NFData WeekDate
@@ -602,11 +587,7 @@ data SundayWeek = SundayWeek
         -- /Sunday/ of the year as the first day of week /01/.
     , swDay :: {-# UNPACK #-}!DayOfWeek
         -- ^ /0 = Sunday/.
-    } deriving (INSTANCES_USUAL, Show)
-
-LENS(SundayWeek,swYear,Year)
-LENS(SundayWeek,swWeek,WeekOfYear)
-LENS(SundayWeek,swDay,DayOfWeek)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 instance Hashable SundayWeek
 instance NFData SundayWeek
@@ -668,11 +649,7 @@ data MondayWeek = MondayWeek
         -- /Monday/ of the year as the first day of week /01/.
     , mwDay :: {-# UNPACK #-}!DayOfWeek
         -- ^ /7 = Sunday/.
-    } deriving (INSTANCES_USUAL, Show)
-
-LENS(MondayWeek,mwYear,Year)
-LENS(MondayWeek,mwWeek,WeekOfYear)
-LENS(MondayWeek,mwDay,DayOfWeek)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 instance Hashable MondayWeek
 instance NFData MondayWeek
@@ -748,3 +725,14 @@ derivingUnbox "MondayWeek" [t| MondayWeek -> Int |]
     [| \ MondayWeek {..} -> shiftL mwYear 9 .|. shiftL mwWeek 3 .|. mwDay |]
     [| \ n -> MondayWeek (shiftR n 9) (shiftR n 3 .&. 0x3f) (n .&. 0x7) |]
 
+makeLensesFor [("ymdYear","_ymdYear"),("ymdMonth","_ymdMonth"),("ymdDay","_ymdDay")] ''YearMonthDay
+
+makeLensesFor [("odYear","_odYear"),("odDay","_odDay")] ''OrdinalDate
+
+makeLensesFor [("mdMonth","_mdMonth"),("mdDay","_mdDay")] ''MonthDay
+
+makeLensesFor [("wdYear","_wdYear"),("wdWeek","_wdWeek"),("wdDay","_wdDay")] ''WeekDate
+
+makeLensesFor [("swYear","_swYear"),("swWeek","_swWeek"),("swDay","_swDay")] ''SundayWeek
+
+makeLensesFor [("mwYear","_mwYear"),("mwWeek","_mwWeek"),("mwDay","_mwDay")] ''MondayWeek

src/Data/Thyme/Calendar/MonthDay.hs

@@ -2,7 +2,7 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ViewPatterns #-}
 
-#include "thyme.h"
+
 
 -- | Calendar months and day-of-months.
 module Data.Thyme.Calendar.MonthDay

src/Data/Thyme/Calendar/OrdinalDate.hs

@@ -3,7 +3,7 @@
 {-# LANGUAGE ViewPatterns #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-#include "thyme.h"
+
 #if HLINT
 #include "cabal_macros.h"
 #endif

src/Data/Thyme/Calendar/WeekDate.hs

@@ -6,7 +6,7 @@
 {-# OPTIONS_GHC -fsimpl-tick-factor=120 #-} -- 7.6.3 only, it seems; fixes #29
 #endif
 
-#include "thyme.h"
+
 #if HLINT
 #include "cabal_macros.h"
 #endif

src/Data/Thyme/Calendar/WeekdayOfMonth.hs

@@ -7,7 +7,6 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE ViewPatterns #-}
 
-#include "thyme.h"
 #if HLINT
 #include "cabal_macros.h"
 #endif
@@ -52,12 +51,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)
-
-LENS(WeekdayOfMonth,womYear,Year)
-LENS(WeekdayOfMonth,womMonth,Month)
-LENS(WeekdayOfMonth,womNth,Int)
-LENS(WeekdayOfMonth,womDayOfWeek,DayOfWeek)
+    } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 derivingUnbox "WeekdayOfMonth"
     [t| WeekdayOfMonth -> Int |]
@@ -146,3 +140,4 @@ weekdayOfMonthValid (WeekdayOfMonth y m n wd) = (refDay .+^ s * offset)
     wo = s * (wd - wd1)
     offset = (abs n - 1) * 7 + if wo < 0 then wo + 7 else wo
 
+makeLensesFor [("womYear","_womYear"),("womMonth","_womMonth"),("womNth","_womNth"),("womDayOfWeek","_womDayOfWeek")] ''WeekdayOfMonth