File tree Expand file tree Collapse file tree 6 files changed +38
-25
lines changed Expand file tree Collapse file tree 6 files changed +38
-25
lines changed Original file line number Diff line number Diff line change @@ -84,21 +84,28 @@ instance RealFrac DiffTime where
84
84
85
85
pattern Picoseconds :: Integer -> DiffTime
86
86
pattern Picoseconds a <- (diffTimeToPicoseconds -> a)
87
- where Picoseconds a = picosecondsToDiffTime a
87
+ where
88
+ Picoseconds a = picosecondsToDiffTime a
89
+
88
90
{-# COMPLETE Picoseconds #-}
89
91
90
92
pattern Seconds :: Pico -> DiffTime
91
93
pattern Seconds a = MkDiffTime a
94
+
92
95
{-# COMPLETE Seconds #-}
93
96
94
97
pattern Minutes :: Pico -> DiffTime
95
98
pattern Minutes a <- Seconds ((/ 60 ) -> a)
96
- where Minutes a = Seconds $ a * 60
99
+ where
100
+ Minutes a = Seconds $ a * 60
101
+
97
102
{-# COMPLETE Minutes #-}
98
103
99
104
pattern Hours :: Pico -> DiffTime
100
105
pattern Hours a <- Minutes ((/ 60 ) -> a)
101
- where Hours a = Minutes $ a * 60
106
+ where
107
+ Hours a = Minutes $ a * 60
108
+
102
109
{-# COMPLETE Hours #-}
103
110
104
111
-- | Create a 'DiffTime' which represents an integral number of seconds.
Original file line number Diff line number Diff line change @@ -15,12 +15,11 @@ import Data.Fixed
15
15
#ifdef __GLASGOW_HASKELL__
16
16
import GHC.Read
17
17
#endif
18
+ import Data.Time.Clock.Internal.DiffTime
18
19
import Language.Haskell.TH.Syntax qualified as TH
19
20
import Text.ParserCombinators.ReadP
20
21
import Text.ParserCombinators.ReadPrec
21
22
22
- import Data.Time.Clock.Internal.DiffTime
23
-
24
23
-- | This is a length of time, as measured by UTC.
25
24
-- It has a precision of one picosecond (10^-12 s).
26
25
--
@@ -38,8 +37,10 @@ newtype NominalDiffTime
38
37
39
38
-- | convert from DiffTime
40
39
pattern Nominal :: DiffTime -> NominalDiffTime
41
- pattern Nominal dt <- MkNominalDiffTime (realToFrac -> dt) where
42
- Nominal dt = MkNominalDiffTime $ realToFrac dt
40
+ pattern Nominal dt <- MkNominalDiffTime (realToFrac -> dt)
41
+ where
42
+ Nominal dt = MkNominalDiffTime $ realToFrac dt
43
+
43
44
{-# COMPLETE Nominal #-}
44
45
45
46
-- | Create a 'NominalDiffTime' from a number of seconds.
Original file line number Diff line number Diff line change @@ -7,11 +7,11 @@ module Data.Time.LocalTime.Internal.CalendarDiffTime (
7
7
8
8
import Control.DeepSeq
9
9
import Data.Data
10
- import Data.Time.Calendar.Gregorian
11
10
import Data.Time.Calendar.CalendarDiffDays
11
+ import Data.Time.Calendar.Gregorian
12
12
import Data.Time.Clock.Internal.NominalDiffTime
13
- import Data.Time.Clock.Internal.UTCTime
14
13
import Data.Time.Clock.Internal.UTCDiff
14
+ import Data.Time.Clock.Internal.UTCTime
15
15
import GHC.Generics
16
16
import Language.Haskell.TH.Syntax qualified as TH
17
17
@@ -54,11 +54,13 @@ addUTCDurationRollOver (CalendarDiffTime m d) (UTCTime day t) =
54
54
diffUTCDurationClip :: UTCTime -> UTCTime -> CalendarDiffTime
55
55
diffUTCDurationClip (UTCTime day1 t1) (UTCTime day2 t2) =
56
56
let
57
- CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationClip day1 day2
58
- in CalendarDiffTime m $ t + realToFrac (t1 - t2)
57
+ CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationClip day1 day2
58
+ in
59
+ CalendarDiffTime m $ t + realToFrac (t1 - t2)
59
60
60
61
diffUTCDurationRollOver :: UTCTime -> UTCTime -> CalendarDiffTime
61
62
diffUTCDurationRollOver (UTCTime day1 t1) (UTCTime day2 t2) =
62
63
let
63
- CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationRollOver day1 day2
64
- in CalendarDiffTime m $ t + realToFrac (t1 - t2)
64
+ CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationRollOver day1 day2
65
+ in
66
+ CalendarDiffTime m $ t + realToFrac (t1 - t2)
Original file line number Diff line number Diff line change @@ -27,9 +27,9 @@ import Data.Time.Clock.Internal.NominalDiffTime
27
27
import Data.Time.Clock.Internal.UTCDiff
28
28
import Data.Time.Clock.Internal.UTCTime
29
29
import Data.Time.Clock.Internal.UniversalTime
30
+ import Data.Time.LocalTime.Internal.CalendarDiffTime
30
31
import Data.Time.LocalTime.Internal.TimeOfDay
31
32
import Data.Time.LocalTime.Internal.TimeZone
32
- import Data.Time.LocalTime.Internal.CalendarDiffTime
33
33
import GHC.Generics
34
34
import Language.Haskell.TH.Syntax qualified as TH
35
35
@@ -98,11 +98,13 @@ addLocalDurationRollOver (CalendarDiffTime m d) (LocalTime day t) =
98
98
diffLocalDurationClip :: LocalTime -> LocalTime -> CalendarDiffTime
99
99
diffLocalDurationClip (LocalTime day1 t1) (LocalTime day2 t2) =
100
100
let
101
- CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationClip day1 day2
102
- in CalendarDiffTime m $ t + diffTimeOfDay t1 t2
101
+ CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationClip day1 day2
102
+ in
103
+ CalendarDiffTime m $ t + diffTimeOfDay t1 t2
103
104
104
105
diffLocalDurationRollOver :: LocalTime -> LocalTime -> CalendarDiffTime
105
106
diffLocalDurationRollOver (LocalTime day1 t1) (LocalTime day2 t2) =
106
107
let
107
- CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationRollOver day1 day2
108
- in CalendarDiffTime m $ t + diffTimeOfDay t1 t2
108
+ CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationRollOver day1 day2
109
+ in
110
+ CalendarDiffTime m $ t + diffTimeOfDay t1 t2
Original file line number Diff line number Diff line change 1
1
module Test.Clock.Pattern (
2
- testClockPatterns
2
+ testClockPatterns ,
3
3
) where
4
4
5
5
import Data.Time.Clock
@@ -12,16 +12,17 @@ testClockPatterns =
12
12
testSame :: forall a . (Eq a , Show a ) => TestName -> a -> a -> TestTree
13
13
testSame name expected found = testCase name $ assertEqual " " expected found
14
14
in
15
- testGroup " pattern" $
16
- [
17
- testGroup " construct"
15
+ testGroup " pattern" $
16
+ [ testGroup
17
+ " construct"
18
18
[ testSame " Seconds" 52.4 (Seconds 52.4 )
19
19
, testSame " Seconds-Picoseconds" (Picoseconds 7_276_000_000_000 ) (Seconds 7.276 )
20
20
, testSame " Minutes-Seconds" (Seconds 210 ) (Minutes 3.5 )
21
21
, testSame " Hours-Minutes" (Minutes 120 ) (Hours 2 )
22
22
, testSame " Nominal" 37.4 (Nominal 37.4 )
23
- ],
24
- testGroup " deconstruct"
23
+ ]
24
+ , testGroup
25
+ " deconstruct"
25
26
[ testSame " Seconds" 52.4 ((\ (Seconds x) -> x) 52.4 )
26
27
, testSame " Seconds-Picoseconds" 7.276 ((\ (Seconds x) -> x) $ Picoseconds 7_276_000_000_000 )
27
28
, testSame " Minutes-Seconds" 3.5 ((\ (Minutes x) -> x) $ Seconds 210 )
Original file line number Diff line number Diff line change @@ -153,7 +153,7 @@ unixWorkarounds _ s = s
153
153
lastM :: [a ] -> Maybe a
154
154
lastM [] = Nothing
155
155
lastM [a] = Just a
156
- lastM (_: aa) = lastM aa
156
+ lastM (_ : aa) = lastM aa
157
157
158
158
compareFormat :: (String -> String ) -> String -> TimeZone -> UTCTime -> Result
159
159
compareFormat _modUnix fmt zone _time
You can’t perform that action at this time.
0 commit comments