change internal members of ParseTime to allow newtype-deriving (#119)

changelog.md

@@ -5,6 +5,7 @@
 - deprecate iso8601DateFormat
 - parsing: fix %_Q %-Q %_q %-q
 - formatting: fix %3ES %3Es
+- change internal members of ParseTime to allow newtype-deriving
 
 ## [1.9.3]
 - documentation fixes

lib/Data/Time/Format/Parse.hs

@@ -110,7 +110,7 @@ readPTime ::
 readPTime False l f = readPOnlyTime l f
 readPTime True l f = (skipSpaces >> readPOnlyTime l f) <++ readPOnlyTime l f
 
-readPOnlyTime' :: ParseTime t => proxy t -> TimeLocale -> String -> ReadP t
+readPOnlyTime' :: ParseTime t => Proxy t -> TimeLocale -> String -> ReadP t
 readPOnlyTime' pt l f = do
     pairs <- parseSpecifiers pt l f
     case buildTime l pairs of

lib/Data/Time/Format/Parse/Class.hs

@@ -11,6 +11,7 @@ module Data.Time.Format.Parse.Class
 
 import Data.Char
 import Data.Maybe
+import Data.Proxy
 import Data.Time.Format.Locale
 import Text.ParserCombinators.ReadP
 
@@ -23,12 +24,12 @@ data ParseNumericPadding
 -- string.
 class ParseTime t where
     -- | @since 1.9.1
-    substituteTimeSpecifier :: proxy t -> TimeLocale -> Char -> Maybe String
+    substituteTimeSpecifier :: Proxy t -> TimeLocale -> Char -> Maybe String
     substituteTimeSpecifier _ _ _ = Nothing
     -- | Get the string corresponding to the given format specifier.
     --
     -- @since 1.9.1
-    parseTimeSpecifier :: proxy t -> TimeLocale -> Maybe ParseNumericPadding -> Char -> ReadP String
+    parseTimeSpecifier :: Proxy t -> TimeLocale -> Maybe ParseNumericPadding -> Char -> ReadP String
     -- | Builds a time value from a parsed input string.
     -- If the input does not include all the information needed to
     -- construct a complete value, any missing parts should be taken
@@ -59,7 +60,7 @@ stringCI this = do
     s <- look
     scan this s
 
-parseSpecifiers :: ParseTime t => proxy t -> TimeLocale -> String -> ReadP [(Char, String)]
+parseSpecifiers :: ParseTime t => Proxy t -> TimeLocale -> String -> ReadP [(Char, String)]
 parseSpecifiers pt locale = let
     parse :: String -> ReadP [(Char, String)]
     parse [] = return []

test/main/Main.hs

@@ -13,6 +13,7 @@ import Test.Calendar.Week
 import Test.Clock.Conversion
 import Test.Clock.Resolution
 import Test.Clock.TAI
+import Test.Format.Compile ()
 import Test.Format.Format
 import Test.Format.ISO8601
 import Test.Format.ParseTime

test/main/Test/Format/Compile.hs

+-- Tests succeed if module compiles
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+module Test.Format.Compile
+    (
+    ) where
+
+import Data.Time
+
+newtype WrappedUTCTime =
+    MkWrappedUTCTime UTCTime
+    deriving (FormatTime, ParseTime)
+
+newtype Wrapped t =
+    MkWrapped t
+    deriving (FormatTime, ParseTime)

test/main/Test/Format/Format.hs

@@ -35,11 +35,11 @@ formats =
 somestrings :: [String]
 somestrings = ["", " ", "-", "\n"]
 
-compareExpected :: (Eq t, Show t, ParseTime t) => String -> String -> String -> proxy t -> TestTree
+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 :: ParseTime t => Proxy t -> Maybe t
             found _ = parseTimeM False defaultTimeLocale fmt str
         assertEqual "" Nothing $ found proxy
 

time.cabal

@@ -160,6 +160,7 @@ test-suite test-main
         Test.Clock.Conversion
         Test.Clock.Resolution
         Test.Clock.TAI
+        Test.Format.Compile
         Test.Format.Format
         Test.Format.ParseTime
         Test.Format.ISO8601