Compatibility tweaks for older GHC versions.

Author: ondrap

src/Data/Thyme/Calendar/WeekDate.hs

@@ -3,7 +3,7 @@
 {-# LANGUAGE ViewPatterns #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 #if __GLASGOW_HASKELL__ == 706
-{-# OPTIONS_GHC -fsimpl-tick-factor=120 #-} -- 7.6.3 only, it seems; fixes #29
+{-# OPTIONS_GHC -fsimpl-tick-factor=180 #-} -- 7.6.3 only, it seems; fixes #29
 #endif
 
 #include "thyme.h"
@@ -120,4 +120,3 @@ fromWeekDate y w d = weekDate # WeekDate y w d
 {-# INLINE fromWeekDateValid #-}
 fromWeekDateValid :: Year -> WeekOfYear -> DayOfWeek -> Maybe Day
 fromWeekDateValid y w d = weekDateValid (WeekDate y w d)
-

src/Data/Thyme/Clock/TAI.hs

@@ -40,7 +40,9 @@ module Data.Thyme.Clock.TAI
 import Prelude
 #if !MIN_VERSION_base(4,8,0)
 import Control.Applicative
+import Data.Monoid (mempty)
 #endif
+
 import Control.DeepSeq
 import Control.Lens
 import Control.Monad
@@ -353,5 +355,4 @@ utcToTAITime m = view (absoluteTime m)
 -- @
 {-# INLINE taiToUTCTime #-}
 taiToUTCTime :: TAIUTCMap -> AbsoluteTime -> UTCTime
-taiToUTCTime m = review (absoluteTime m)
-
+taiToUTCTime m = review (absoluteTime m)

src/Data/Thyme/Format.hs

@@ -34,6 +34,9 @@ import Control.Applicative
 #if SHOW_INTERNAL
 import Control.Arrow
 #endif
+#if !MIN_VERSION_base(4,8,0)
+import Data.Monoid (mempty)
+#endif
 import Control.Lens
 import Control.Monad.Trans
 import Control.Monad.State.Strict
@@ -989,4 +992,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/Aeson.hs

@@ -99,11 +99,14 @@ instance FromJSON ZonedTime where
     parseJSON v = typeMismatch "ZonedTime" v
 
 instance ToJSON UTCTime where
+#if MIN_VERSION_aeson(0,11,2)
     toEncoding t = unsafeToEncoding $ quote (utcTimeBuilder t)
     {-# INLINE toEncoding #-}
+#endif
     toJSON t = String $ decodeUtf8 $ toStrict $ toLazyByteString (utcTimeBuilder t)
     {-# INLINE toJSON #-}
 
+-- For some unexaplainable reason the fast Scanner parser doesn't seem to work on 7.6
 instance FromJSON UTCTime where
     parseJSON = withText "UTCTime" $ parseFastUtc
     {-# INLINE parseJSON #-}

src/Data/Thyme/Format/DateFast.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE NamedFieldPuns    #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_HADDOCK hide #-}
@@ -6,6 +7,9 @@ module Data.Thyme.Format.DateFast (
     parseFastUtc
 ) where
 
+#if !MIN_VERSION_base(4,8,0)
+import           Control.Applicative
+#endif
 import           Control.Lens        (from, view)
 import           Control.Monad       (unless, void)
 import qualified Data.ByteString     as BS
@@ -105,10 +109,10 @@ parserRfc = do
                      - offset * 1000000 :: Int64
         tdiff = view (from microseconds) totalMicro
         tday = fromGregorian year month dayofmonth
-    return $ UTCTime tday tdiff
+    return $ view (from utcTime) (UTCView tday tdiff)
 
 parseFastUtc :: Monad m => T.Text -> m UTCTime
 parseFastUtc t =
   case S.scanOnly parserRfc (encodeUtf8 t) of
-        Right d -> pure d
+        Right d -> return d
         Left err -> fail $ "could not parse ISO-8601 date: " ++ err

tests/sanity.hs

@@ -7,6 +7,9 @@
 
 import Prelude
 
+#if !MIN_VERSION_base(4,8,0)
+import           Control.Applicative
+#endif
 import Control.Arrow
 import Control.Lens
 import qualified Data.Attoparsec.ByteString.Char8 as P
@@ -51,16 +54,24 @@ prop_toOrdinalDate :: Day -> Bool
 prop_toOrdinalDate day =
     fromIntegral `first` toOrdinalDate day == T.toOrdinalDate (thyme # day)
 
-newtype AcUTCTime = AcUTCTime { getAc :: UTCTime } deriving (Show)
+newtype AcUTCTime = AcUTCTime UTCTime deriving (Show)
 instance Arbitrary AcUTCTime where
   arbitrary = AcUTCTime <$> (arbitrary `suchThat` (\d -> d >= year1 && d < yearMax))
     where
-      year1 = UTCTime (fromGregorian 1 1 1) 0
-      yearMax = UTCTime (fromGregorian 10000 1 1) 0
+      year1 = view (from utcTime) $ UTCView (fromGregorian 1 1 1) 0
+      yearMax = view (from utcTime) $ UTCView (fromGregorian 10000 1 1) 0
   shrink (AcUTCTime a) = map AcUTCTime (shrink a)
 
-prop_aeson :: AcUTCTime -> Bool
-prop_aeson a = AE.decode (AE.encode (getAc a)) == Just (getAc a)
+prop_aeson :: AcUTCTime -> Property
+prop_aeson (AcUTCTime t') =
+#if MIN_VERSION_QuickCheck(2,7,0)
+    counterexample desc (t == Just [t'])
+#else
+    printTestCase desc (t == Just [t'])
+#endif
+  where
+    t = AE.decode (AE.encode [t'])
+    desc = "Orig: " ++ show t' ++ ", Aeson: " ++ show (AE.encode t') ++ ", BackOrig: " ++ show t
 
 prop_formatTime :: Spec -> RecentTime -> Property
 prop_formatTime (Spec spec) (RecentTime t@(review thyme -> t'))

thyme.cabal

@@ -91,6 +91,7 @@ library
         aeson >= 0.6,
         base >= 4.5 && < 5,
         bytestring >= 0.9,
+        bytestring-builder,
         containers >= 0.5,
         deepseq >= 1.2,
         hashable >= 1.2,