git.iko.soy/typeable/pandoc
on master help sign in
Remove GetPOSIXTime from Free monad.

We still export a P.getPOSIXTime function, but it's just internally defined in terms of P.getCurrentTime.

commit887beb41f12df5d5d948a91bce7abbb4ccac55d8 authorJesse Rosenthal <jrosenthal@jhu.edu> dateSat 19 Nov 2016, 06:29 (10 years ago) parent2fb8107
1 file changed+2−7
compare with master
unifiedsplit
src/Text/Pandoc/Free.hs+2−7
src/Text/Pandoc/Free.hs+2−7
@@ -68,10 +68,9 @@ import qualified Text.Pandoc.Shared as IO ( fetchItem
6868 , warn
6969 , readDataFile)
7070import Text.Pandoc.MediaBag (MediaBag, lookupMedia)
71−import Data.Time.Clock.POSIX (POSIXTime, utcTimeToPOSIXSeconds)
72−import qualified Data.Time.Clock.POSIX as IO (getPOSIXTime)
7371import Text.Pandoc.Compat.Time (UTCTime)
7472import qualified Text.Pandoc.Compat.Time as IO (getCurrentTime)
73+import Data.Time.Clock.POSIX ( utcTimeToPOSIXSeconds, POSIXTime )
7574import Text.Pandoc.MIME (MimeType, getMimeType)
7675import qualified Data.ByteString as B
7776import qualified Data.ByteString.Lazy as BL
@@ -89,7 +88,6 @@ import Data.Typeable
8988data PandocActionF nxt =
9089 LookupEnv String (Maybe String -> nxt)
9190 | GetCurrentTime (UTCTime -> nxt)
92− | GetPOSIXTime (POSIXTime -> nxt)
9391 | GetDefaultReferenceDocx (Maybe FilePath) (Archive -> nxt)
9492 | GetDefaultReferenceODT (Maybe FilePath) (Archive -> nxt)
9593 | NewStdGen (StdGen -> nxt)
@@ -114,7 +112,7 @@ getCurrentTime :: PandocAction UTCTime
114112getCurrentTime = liftF $ GetCurrentTime id
115113
116114getPOSIXTime :: PandocAction POSIXTime
117−getPOSIXTime = liftF $ GetPOSIXTime id
115+getPOSIXTime = utcTimeToPOSIXSeconds <$> getCurrentTime
118116
119117getDefaultReferenceDocx :: Maybe FilePath -> PandocAction Archive
120118getDefaultReferenceDocx fp = liftF $ GetDefaultReferenceDocx fp id
@@ -158,7 +156,6 @@ glob s = liftF $ Glob s id
158156runIO :: PandocAction nxt -> IO nxt
159157runIO (Free (LookupEnv s f)) = IO.lookupEnv s >>= runIO . f
160158runIO (Free (GetCurrentTime f)) = IO.getCurrentTime >>= runIO . f
161−runIO (Free (GetPOSIXTime f)) = IO.getPOSIXTime >>= runIO . f
162159runIO (Free (GetDefaultReferenceDocx mfp f)) =
163160 IO.getDefaultReferenceDocx mfp >>= runIO . f
164161runIO (Free (GetDefaultReferenceODT mfp f)) =
@@ -211,8 +208,6 @@ runTest (Free (LookupEnv s f)) = do
211208 return (lookup s env) >>= runTest . f
212209runTest (Free (GetCurrentTime f)) =
213210 asks envTime >>= runTest . f
214−runTest (Free (GetPOSIXTime f)) =
215− (utcTimeToPOSIXSeconds <$> asks envTime) >>= runTest . f
216211runTest (Free (GetDefaultReferenceDocx _ f)) =
217212 asks envReferenceDocx >>= runTest . f
218213runTest (Free (GetDefaultReferenceODT _ f)) =