add missing Capabilities instances

src/Capabilities/Alloy.hs

@@ -9,7 +9,9 @@ import qualified Language.Alloy.Call              as Alloy (
   getInstancesWith,
   )
 
-import Language.Alloy.Call              as Alloy (
+import Control.Monad.IO.Class           (MonadIO (liftIO))
+import Control.Monad.Output.Generic     (GenericReportT)
+import Language.Alloy.Call (
   AlloyInstance,
   CallAlloyConfig (..),
   SatSolver (..),
@@ -22,6 +24,9 @@ class Monad m => MonadAlloy m where
 instance MonadAlloy IO where
   getInstancesWith = Alloy.getInstancesWith
 
+instance MonadIO m => MonadAlloy (GenericReportT l o m)  where
+  getInstancesWith config = liftIO . getInstancesWith config
+
 getInstances
   :: MonadAlloy m
   => Maybe Integer

src/Capabilities/Cache.hs

@@ -12,8 +12,10 @@ import qualified Data.ByteString.Lazy             as LBS (fromStrict)
 import qualified Data.ByteString.UTF8             as BS (fromString)
 
 import Control.Monad                    (when)
+import Control.Monad.IO.Class           (MonadIO (liftIO))
 import Control.Monad.Trans.Class        (MonadTrans (lift))
 import Control.Monad.Trans.Maybe        (MaybeT (MaybeT, runMaybeT))
+import Control.Monad.Output.Generic     (GenericReportT)
 import Data.ByteString                  (ByteString)
 import Data.Digest.Pure.SHA             (sha256, showDigest)
 import Data.Maybe                       (fromJust)
@@ -31,6 +33,12 @@ instance MonadCache IO where
   readShowFile = BS.readFile
   writeShowFile = BS.writeFile
 
+instance MonadIO m => MonadCache (GenericReportT l o m)  where
+  appendCollisionFile f = liftIO . appendCollisionFile f
+  doesCacheExist = liftIO . doesCacheExist
+  readShowFile = liftIO . readShowFile
+  writeShowFile f = liftIO . writeShowFile f
+
 {-|
 Caches some file which is generated by using some 'Show'able input.
 The textual representation (using 'show') of the input is stored in a file

src/Capabilities/Diagrams.hs

@@ -23,6 +23,8 @@ import qualified Graphics.SVGFonts.Fonts          (lin)
 
 import Modelling.Auxiliary.Diagrams               (renderSVG)
 
+import Control.Monad.IO.Class                     (MonadIO (liftIO))
+import Control.Monad.Output.Generic               (GenericReportT)
 import Data.ByteString.Internal                   (w2c)
 import Data.Data                                  (Typeable)
 import Diagrams.Backend.SVG                       (SVG)
@@ -72,6 +74,10 @@ instance MonadDiagrams IO where
     svg <- groupSVG $ renderSVG (dims2D 400 400) g
     T.writeFile file $ LT.toStrict svg
 
+instance MonadIO m => MonadDiagrams (GenericReportT l o m)  where
+  lin = liftIO lin
+  writeSvg file = liftIO . writeSvg file
+
 data SVGOptions = SVGOptions
   { xmlns, height, iStrokeOpacity, viewBox, fontSize, width, xmlnsXlink, iStroke, version :: T.Text,
     groups :: [SVGGroup] }

src/Capabilities/Graphviz.hs

@@ -7,6 +7,9 @@ module Capabilities.Graphviz (
   ) where
 
 import qualified Diagrams.TwoD.GraphViz           as GV
+
+import Control.Monad.IO.Class           (MonadIO (liftIO))
+import Control.Monad.Output.Generic     (GenericReportT)
 import Data.GraphViz (
   AttributeEdge,
   AttributeNode,
@@ -39,3 +42,8 @@ instance MonadGraphviz IO where
       |]
   layoutGraph = GV.layoutGraph
   layoutGraph' = GV.layoutGraph'
+
+instance MonadIO m => MonadGraphviz (GenericReportT l o m)  where
+  errorWithoutGraphviz = liftIO errorWithoutGraphviz
+  layoutGraph command = liftIO . layoutGraph command
+  layoutGraph' params command = liftIO . layoutGraph' params command

src/Modelling/CdOd/NameCdError.hs

@@ -16,6 +16,7 @@ module Modelling.CdOd.NameCdError (
   NameCdErrorTaskTextElement (..),
   NumberOfReasons (..),
   Reason (..),
+  Relevance (..),
   TaskTextPart (..),
   checkNameCdErrorConfig,
   checkNameCdErrorInstance,