removed cpp defs because they break ghcjs and are unneccessary

Signed-off-by: buckie <[email protected]>

Author: buckie

include/thyme.h

@@ -206,9 +206,10 @@ data YearMonthDay = YearMonthDay
     , ymdDay :: {-# UNPACK #-}!DayOfMonth
     } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
-LENS(YearMonthDay,ymdYear,Year)
-LENS(YearMonthDay,ymdMonth,Month)
-LENS(YearMonthDay,ymdDay,DayOfMonth)
+makeLensesFor [("ymdYear","_ymdYear"),("ymdMonth","_ymdMonth"),("ymdDay","_ymdDay")] ''YearMonthDay
+{-# INLINE _ymdYear #-}
+{-# INLINE _ymdMonth #-}
+{-# INLINE _ymdDay #-}
 
 instance Hashable YearMonthDay
 instance NFData YearMonthDay
@@ -230,8 +231,9 @@ data OrdinalDate = OrdinalDate
     , odDay :: {-# UNPACK #-}!DayOfYear
     } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
-LENS(OrdinalDate,odYear,Year)
-LENS(OrdinalDate,odDay,DayOfYear)
+makeLensesFor [("odYear","_odYear"),("odDay","_odDay")] ''OrdinalDate
+{-# INLINE _odYear #-}
+{-# INLINE _odDay #-}
 
 instance Hashable OrdinalDate
 instance NFData OrdinalDate
@@ -370,8 +372,9 @@ data MonthDay = MonthDay
     , mdDay :: {-# UNPACK #-}!DayOfMonth
     } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
-LENS(MonthDay,mdMonth,Month)
-LENS(MonthDay,mdDay,DayOfMonth)
+makeLensesFor [("mdMonth","_mdMonth"),("mdDay","_mdDay")] ''MonthDay
+{-# INLINE _mdMonth #-}
+{-# INLINE _mdDay #-}
 
 instance Hashable MonthDay
 instance NFData MonthDay
@@ -514,9 +517,10 @@ data WeekDate = WeekDate
         -- ^ /1 = Monday/ … /7 = Sunday/.
     } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
-LENS(WeekDate,wdYear,Year)
-LENS(WeekDate,wdWeek,WeekOfYear)
-LENS(WeekDate,wdDay,DayOfWeek)
+makeLensesFor [("wdYear","_wdYear"),("wdWeek","_wdWeek"),("wdDay","_wdDay")] ''WeekDate
+{-# INLINE _wdYear #-}
+{-# INLINE _wdWeek #-}
+{-# INLINE _wdDay #-}
 
 instance Hashable WeekDate
 instance NFData WeekDate
@@ -604,9 +608,10 @@ data SundayWeek = SundayWeek
         -- ^ /0 = Sunday/.
     } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
-LENS(SundayWeek,swYear,Year)
-LENS(SundayWeek,swWeek,WeekOfYear)
-LENS(SundayWeek,swDay,DayOfWeek)
+makeLensesFor [("swYear","_swYear"),("swWeek","_swWeek"),("swDay","_swDay")] ''SundayWeek
+{-# INLINE _swYear #-}
+{-# INLINE _swWeek #-}
+{-# INLINE _swDay #-}
 
 instance Hashable SundayWeek
 instance NFData SundayWeek
@@ -670,9 +675,10 @@ data MondayWeek = MondayWeek
         -- ^ /7 = Sunday/.
     } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
-LENS(MondayWeek,mwYear,Year)
-LENS(MondayWeek,mwWeek,WeekOfYear)
-LENS(MondayWeek,mwDay,DayOfWeek)
+makeLensesFor [("mwYear","_mwYear"),("mwWeek","_mwWeek"),("mwDay","_mwDay")] ''MondayWeek
+{-# INLINE _mwYear #-}
+{-# INLINE _mwWeek #-}
+{-# INLINE _mwDay #-}
 
 instance Hashable MondayWeek
 instance NFData MondayWeek
@@ -747,4 +753,3 @@ derivingUnbox "SundayWeek" [t| SundayWeek -> Int |]
 derivingUnbox "MondayWeek" [t| MondayWeek -> Int |]
     [| \ MondayWeek {..} -> shiftL mwYear 9 .|. shiftL mwWeek 3 .|. mwDay |]
     [| \ n -> MondayWeek (shiftR n 9) (shiftR n 3 .&. 0x3f) (n .&. 0x7) |]
-

src/Data/Thyme/Calendar/Internal.hs

@@ -7,7 +7,6 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE ViewPatterns #-}
 
-#include "thyme.h"
 #if HLINT
 #include "cabal_macros.h"
 #endif
@@ -54,10 +53,11 @@ data WeekdayOfMonth = WeekdayOfMonth
         -- ^ Day of week. /1 = Monday, 7 = Sunday/, like ISO 8601 'WeekDate'.
     } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
-LENS(WeekdayOfMonth,womYear,Year)
-LENS(WeekdayOfMonth,womMonth,Month)
-LENS(WeekdayOfMonth,womNth,Int)
-LENS(WeekdayOfMonth,womDayOfWeek,DayOfWeek)
+makeLensesFor [("womYear","_womYear"),("womMonth","_womMonth"),("womNth","_womNth"),("womDayOfWeek","_womDayOfWeek")] ''WeekdayOfMonth
+{-# INLINE _womYear #-}
+{-# INLINE _womMonth #-}
+{-# INLINE _womNth #-}
+{-# INLINE _womDayOfWeek #-}
 
 derivingUnbox "WeekdayOfMonth"
     [t| WeekdayOfMonth -> Int |]
@@ -145,4 +145,3 @@ weekdayOfMonthValid (WeekdayOfMonth y m n wd) = (refDay .+^ s * offset)
     s = signum n
     wo = s * (wd - wd1)
     offset = (abs n - 1) * 7 + if wo < 0 then wo + 7 else wo
-

src/Data/Thyme/Calendar/WeekdayOfMonth.hs

@@ -14,8 +14,6 @@
 {-# LANGUAGE ViewPatterns #-}
 {-# OPTIONS_HADDOCK hide #-}
 
-#include "thyme.h"
-
 module Data.Thyme.Clock.Internal where
 
 import Prelude
@@ -329,10 +327,12 @@ data UTCView = UTCView
     } deriving (Eq, Ord, Data, Typeable, Generic, Show)
 
 -- | 'Lens'' for the calendar 'Day' component of a 'UTCView'.
-LENS(UTCView,utcvDay,Day)
+makeLensesFor [("utcvDay","_utcvDay")] ''UTCView
+{-# INLINE _utcvDay #-}
 
 -- | 'Lens'' for the time-of-day 'DiffTime' component of a 'UTCView'.
-LENS(UTCView,utcvDayTime,DiffTime)
+makeLensesFor [("utcvDayTime","_utcvDayTime")] ''UTCView
+{-# INLINE _utcvDayTime #-}
 
 derivingUnbox "UTCView" [t| UTCView -> (Day, DiffTime) |]
     [| \ UTCView {..} -> (utcvDay, utcvDayTime) |]
@@ -431,4 +431,3 @@ mkUTCTime :: Year -> Month -> DayOfMonth -> Hour -> Minute -> Double -> UTCTime
 mkUTCTime yy mm dd h m s = utcTime # UTCView
     (gregorian # YearMonthDay yy mm dd)
     (fromSeconds (3600 * h + 60 * m) ^+^ fromSeconds s)
-

src/Data/Thyme/Clock/Internal.hs

@@ -4,7 +4,6 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE ViewPatterns #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-#include "thyme.h"
 
 -- | Formatting and parsing for dates and times.
 module Data.Thyme.Format
@@ -486,20 +485,34 @@ data TimeParse = TimeParse
     , tpTimeZone :: !TimeZone
     } deriving (Show)
 
-LENS(TimeParse,tpCentury,Int)
-LENS(TimeParse,tpCenturyYear,Int{-YearOfCentury-})
-LENS(TimeParse,tpMonth,Month)
-LENS(TimeParse,tpWeekOfYear,WeekOfYear)
-LENS(TimeParse,tpDayOfMonth,DayOfMonth)
-LENS(TimeParse,tpDayOfWeek,DayOfWeek)
-LENS(TimeParse,tpDayOfYear,DayOfYear)
-LENS(TimeParse,tpFlags,Int{-BitSet TimeFlag-})
-LENS(TimeParse,tpHour,Hour)
-LENS(TimeParse,tpMinute,Minute)
-LENS(TimeParse,tpSecond,Int)
-LENS(TimeParse,tpSecFrac,DiffTime)
-LENS(TimeParse,tpPOSIXTime,POSIXTime)
-LENS(TimeParse,tpTimeZone,TimeZone)
+makeLensesFor [ ("tpCentury","_tpCentury")
+              , ("tpCenturyYear","_tpCenturyYear")
+              , ("tpMonth","_tpMonth")
+              , ("tpWeekOfYear","_tpWeekOfYear")
+              , ("tpDayOfMonth","_tpDayOfMonth")
+              , ("tpDayOfWeek","_tpDayOfWeek")
+              , ("tpDayOfYear","_tpDayOfYear")
+              , ("tpFlags","_tpFlags")
+              , ("tpHour","_tpHour")
+              , ("tpMinute","_tpMinute")
+              , ("tpSecond","_tpSecond")
+              , ("tpSecFrac","_tpSecFrac")
+              , ("tpPOSIXTime","_tpPOSIXTime")
+              , ("tpTimeZone","_tpTimeZone")] ''TimeParse
+{-# INLINE _tpCentury #-}
+{-# INLINE _tpCenturyYear #-}
+{-# INLINE _tpMonth #-}
+{-# INLINE _tpWeekOfYear #-}
+{-# INLINE _tpDayOfMonth #-}
+{-# INLINE _tpDayOfWeek #-}
+{-# INLINE _tpDayOfYear #-}
+{-# INLINE _tpFlags #-}
+{-# INLINE _tpHour #-}
+{-# INLINE _tpMinute #-}
+{-# INLINE _tpSecond #-}
+{-# INLINE _tpSecFrac #-}
+{-# INLINE _tpPOSIXTime #-}
+{-# INLINE _tpTimeZone #-}
 
 {-# INLINE flag #-}
 flag :: TimeFlag -> Lens' TimeParse Bool
@@ -985,4 +998,3 @@ timeZoneParser = zone "TAI" 0 False <|> zone "UT1" 0 False
     zone name offset dst = TimeZone offset dst name <$ P.string (S.pack name)
     ($+) h m = h * 60 + m
     ($-) h m = negate (h * 60 + m)
-

src/Data/Thyme/Format.hs

@@ -3,7 +3,6 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ViewPatterns #-}
 
-#include "thyme.h"
 #if HLINT
 #include "cabal_macros.h"
 #endif
@@ -36,7 +35,8 @@ data Unit = Unit
     , single :: ShowS
     , plural :: ShowS
     }
-LENS(Unit,plural,ShowS)
+makeLensesFor [("plural","_plural")] ''Unit
+{-# INLINE _plural #-}
 
 -- | Display 'DiffTime' or 'NominalDiffTime' in a human-readable form.
 {-# INLINE humanTimeDiff #-}
@@ -91,4 +91,3 @@ units = scanl (&)
     times :: String -> Rational -> Unit -> Unit
     times ((++) . (:) ' ' -> single) r Unit {unit}
         = Unit {unit = r *^ unit, plural = single . (:) 's', ..}
-

src/Data/Thyme/Format/Human.hs

@@ -10,7 +10,6 @@
 {-# LANGUAGE ViewPatterns #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-#include "thyme.h"
 #if HLINT
 #include "cabal_macros.h"
 #endif
@@ -73,9 +72,10 @@ data TimeZone = TimeZone
     -- ^ The name of the zone, typically a three- or four-letter acronym.
     } deriving (Eq, Ord, Data, Typeable, Generic)
 
-LENS(TimeZone,timeZoneMinutes,Minutes)
-LENS(TimeZone,timeZoneSummerOnly,Bool)
-LENS(TimeZone,timeZoneName,String)
+makeLensesFor [("timeZoneMinutes","_timeZoneMinutes"),("timeZoneSummerOnly","_timeZoneSummerOnly"),("timeZoneName","_timeZoneName")] ''TimeZone
+{-# INLINE _timeZoneMinutes #-}
+{-# INLINE _timeZoneSummerOnly #-}
+{-# INLINE _timeZoneName #-}
 
 instance Hashable TimeZone
 instance NFData TimeZone
@@ -186,9 +186,10 @@ data TimeOfDay = TimeOfDay
     , todSec :: {-# UNPACK #-}!DiffTime -- ^ Second.
     } deriving (Eq, Ord, Data, Typeable, Generic)
 
-LENS(TimeOfDay,todHour,Hour)
-LENS(TimeOfDay,todMin,Minute)
-LENS(TimeOfDay,todSec,DiffTime)
+makeLensesFor [("todHour","_todHour"),("todMin","_todMin"),("todSec","_todSec")] ''TimeOfDay
+{-# INLINE _todHour #-}
+{-# INLINE _todMin #-}
+{-# INLINE _todSec #-}
 
 derivingUnbox "TimeOfDay" [t| TimeOfDay -> Int64 |]
     [| \ TimeOfDay {..} -> fromIntegral (todHour .|. shiftL todMin 8)
@@ -355,8 +356,9 @@ data LocalTime = LocalTime
     -- ^ Local time-of-day.
     } deriving (Eq, Ord, Data, Typeable, Generic)
 
-LENS(LocalTime,localDay,Day)
-LENS(LocalTime,localTimeOfDay,TimeOfDay)
+makeLensesFor [("localDay","_localDay"),("localTimeOfDay","_localTimeOfDay")] ''LocalTime
+{-# INLINE _localDay #-}
+{-# INLINE _localTimeOfDay #-}
 
 derivingUnbox "LocalTime" [t| LocalTime -> (Day, TimeOfDay) |]
     [| \ LocalTime {..} -> (localDay, localTimeOfDay) |]
@@ -463,8 +465,9 @@ data ZonedTime = ZonedTime
     , zonedTimeZone :: !TimeZone
     } deriving (Eq, Ord, Data, Typeable, Generic)
 
-LENS(ZonedTime,zonedTimeToLocalTime,LocalTime)
-LENS(ZonedTime,zonedTimeZone,TimeZone)
+makeLensesFor [("zonedTimeToLocalTime","_zonedTimeToLocalTime"),("zonedTimeZone","_zonedTimeZone")] ''ZonedTime
+{-# INLINE _zonedTimeToLocalTime #-}
+{-# INLINE _zonedTimeZone #-}
 
 instance Hashable ZonedTime
 instance NFData ZonedTime where
@@ -668,4 +671,3 @@ utcToZonedTime z t = view zonedTime (z, t)
 {-# INLINE zonedTimeToUTC #-}
 zonedTimeToUTC :: ZonedTime -> UTCTime
 zonedTimeToUTC = snd . review zonedTime
-

src/Data/Thyme/LocalTime.hs

@@ -17,8 +17,6 @@ category:       Data, System
 build-type:     Simple
 cabal-version:  >= 1.10
 stability:      experimental
-extra-source-files:
-    include/thyme.h
 tested-with:
     GHC == 7.6.3, GHC == 7.8.4,
     GHC == 7.10.2, GHC == 7.10.3,
@@ -55,7 +53,6 @@ flag show-internal
 
 library
     default-language: Haskell2010
-    include-dirs: include
     hs-source-dirs: src
     if !(flag(lens) || flag(docs))
         hs-source-dirs: lens
@@ -195,4 +192,3 @@ benchmark bench
     ghc-options: -Wall
 
 -- vim: et sw=4 ts=4 sts=4:
-