Put function shortcuts back in Functions module

byg/src/ComputationM.hs

@@ -1,10 +1,15 @@
-module ComputationM where
+module ComputationM
+  ( ComputationM
+  , evalComputationM
+  , inject
+  , mapComputationM
+  , runFunction
+  , runFunctionIO
+  ) where
 
 import Types
 import Sources
-import Functions
 
-import Unsafe.Coerce (unsafeCoerce)
 import Control.Monad.State
 import Control.Monad.Writer
 
@@ -71,20 +76,11 @@ setListElem a outer = do
   tellDep (Dependency a SetListElem outer)
   pure NoToken
 
-run :: (Show a, Show b, IsFunction f a b) => f -> Token a -> ComputationM b
-run f input = genDependency (Dependency input (Function f))
+runFunction :: (Show a, Show b, IsFunction f a b) => f -> Token a -> ComputationM b
+runFunction f input = genDependency (Dependency input (Function f))
 
-isImageFilename = run IsImageFilename
-convertedImageFilename = run ConvertedImageFilename
-
-runIO :: (Show a, Show b, IsFunctionIO f a b) => f -> Token a -> ComputationM b
-runIO f input = genDependency (Dependency input (FunctionIO f))
-
-listDirectory = runIO ListDirectory
-openImage = runIO OpenImage
-convertImage = runIO ConvertImage
-saveFile = runIO SaveFile
-runPandoc = runIO RunPandoc
+runFunctionIO :: (Show a, Show b, IsFunctionIO f a b) => f -> Token a -> ComputationM b
+runFunctionIO f input = genDependency (Dependency input (FunctionIO f))
 
 mapComputationM :: (Show a, Show b) => (Token a -> ComputationM b) -> Token [a] -> ComputationM [b]
 mapComputationM f input = genDependency' $ \target -> do