diff options
| author | Jesse Rosenthal <jrosenthal@jhu.edu> | 2016-11-19 06:29:58 -0500 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2017-01-25 17:07:39 +0100 |
| commit | f22bc52864d753179ae0ac16980fc2be1ba1781d (patch) | |
| tree | 4b2781c7c4eb9b146b7d9bbf07e33f7330367f31 /src | |
| parent | 2ffd630a43749794bf72591f41d6b523676bd5b1 (diff) | |
| download | pandoc-f22bc52864d753179ae0ac16980fc2be1ba1781d.tar.gz | |
Remove GetPOSIXTime from Free monad.
We still export a P.getPOSIXTime function, but it's just internally
defined in terms of P.getCurrentTime.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Text/Pandoc/Free.hs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/Text/Pandoc/Free.hs b/src/Text/Pandoc/Free.hs index 3a62270a7..a1ea45cd6 100644 --- a/src/Text/Pandoc/Free.hs +++ b/src/Text/Pandoc/Free.hs @@ -68,10 +68,9 @@ import qualified Text.Pandoc.Shared as IO ( fetchItem , warn , readDataFile) import Text.Pandoc.MediaBag (MediaBag, lookupMedia) -import Data.Time.Clock.POSIX (POSIXTime, utcTimeToPOSIXSeconds) -import qualified Data.Time.Clock.POSIX as IO (getPOSIXTime) import Text.Pandoc.Compat.Time (UTCTime) import qualified Text.Pandoc.Compat.Time as IO (getCurrentTime) +import Data.Time.Clock.POSIX ( utcTimeToPOSIXSeconds, POSIXTime ) import Text.Pandoc.MIME (MimeType, getMimeType) import qualified Data.ByteString as B import qualified Data.ByteString.Lazy as BL @@ -89,7 +88,6 @@ import Data.Typeable data PandocActionF nxt = LookupEnv String (Maybe String -> nxt) | GetCurrentTime (UTCTime -> nxt) - | GetPOSIXTime (POSIXTime -> nxt) | GetDefaultReferenceDocx (Maybe FilePath) (Archive -> nxt) | GetDefaultReferenceODT (Maybe FilePath) (Archive -> nxt) | NewStdGen (StdGen -> nxt) @@ -114,7 +112,7 @@ getCurrentTime :: PandocAction UTCTime getCurrentTime = liftF $ GetCurrentTime id getPOSIXTime :: PandocAction POSIXTime -getPOSIXTime = liftF $ GetPOSIXTime id +getPOSIXTime = utcTimeToPOSIXSeconds <$> getCurrentTime getDefaultReferenceDocx :: Maybe FilePath -> PandocAction Archive getDefaultReferenceDocx fp = liftF $ GetDefaultReferenceDocx fp id @@ -158,7 +156,6 @@ glob s = liftF $ Glob s id runIO :: PandocAction nxt -> IO nxt runIO (Free (LookupEnv s f)) = IO.lookupEnv s >>= runIO . f runIO (Free (GetCurrentTime f)) = IO.getCurrentTime >>= runIO . f -runIO (Free (GetPOSIXTime f)) = IO.getPOSIXTime >>= runIO . f runIO (Free (GetDefaultReferenceDocx mfp f)) = IO.getDefaultReferenceDocx mfp >>= runIO . f runIO (Free (GetDefaultReferenceODT mfp f)) = @@ -211,8 +208,6 @@ runTest (Free (LookupEnv s f)) = do return (lookup s env) >>= runTest . f runTest (Free (GetCurrentTime f)) = asks envTime >>= runTest . f -runTest (Free (GetPOSIXTime f)) = - (utcTimeToPOSIXSeconds <$> asks envTime) >>= runTest . f runTest (Free (GetDefaultReferenceDocx _ f)) = asks envReferenceDocx >>= runTest . f runTest (Free (GetDefaultReferenceODT _ f)) = |