Ajout : Hcompta.Chart.

[comptalang.git] / lib / Hcompta / Date / Interval.hs

diff --git a/lib/Hcompta/Date/Interval.hs b/lib/Hcompta/Date/Interval.hs
index 00d8d633a0469e05fcc8f98c320530ea28be7872..c9941fc8a1ff3fad3bf04001e3b4d7ea229db4ed 100644 (file)
--- a/lib/Hcompta/Date/Interval.hs
+++ b/lib/Hcompta/Date/Interval.hs
@@ -1,13 +1,17 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Hcompta.Date.Interval where
 
-import qualified Data.Fixed
+-- import qualified Data.Fixed -- NOTE: not useful before base >=4.7
 import qualified Data.List
-import           Data.Maybe (fromJust)
+import           Data.Maybe (Maybe(..), fromJust)
 import qualified Data.Time.Calendar    as Time
 import qualified Data.Time.Clock       as Time
 import qualified Data.Time.Format      as Time ()
 import qualified Data.Time.LocalTime   as Time
+import           Prelude ( ($)
+                         , Integral(..)
+                         , Num(..)
+                         )
 
 import           Hcompta.Date hiding (year, month, dom, hour, minute, second)
 import qualified Hcompta.Date as Date
@@ -63,6 +67,7 @@ minute y m d h n =
        let hn = Time.addUTCTime 60 ln in
        fromJust $ (Interval.<=..<) ln hn
 
+{- NOTE: Data.Fixed.MkFixed requires base >=4.7
 second :: Year -> Month -> DoM -> Hour -> Minute -> Second -> Interval Date
 second y m d h n (Data.Fixed.MkFixed s) =
        let ly = Time.addGregorianYearsClip (y - 1970) (day nil) in
@@ -73,6 +78,7 @@ second y m d h n (Data.Fixed.MkFixed s) =
        let ls = Time.addUTCTime (fromInteger $ s) ln in
        let hs = Time.addUTCTime 1 ls in
        fromJust $ (Interval.<=..<) ls hs
+-}
 
 -- * Slice
 
@@ -112,8 +118,10 @@ minute_slice d =
        let Time.TimeOfDay h n _ = tod d in
        minute y m o h n
 
+{-
 second_slice :: Date -> Interval Date
 second_slice d =
        let (y, m, o) = Date.gregorian d in
        let Time.TimeOfDay h n s = tod d in
        second y m o h n s
+-}