upgrade to output-blocks

fmidue · Jul 3, 2024 · b5dbd4b · b5dbd4b
1 parent 36c213f
commit b5dbd4b
Show file tree

Hide file tree

Showing 59 changed files with 279 additions and 271 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ stack ghci --stack-yaml=stack-examples.yaml
 ```
 
 ``` haskell
-:m + Control.Monad.Output Control.Monad.Output.Generic
+:m +Control.OutputCapable.Blocks Control.OutputCapable.Blocks.Generic
 inst <- nameCdErrorGenerate defaultNameCdErrorConfig 0 0
 runLangMReport (return ()) (>>) (nameCdErrorTask "/tmp/" inst) >>= \(Just (), x) -> (x English :: IO ())
 runLangMReport (return ()) (>>) (nameCdErrorSyntax inst NameCdErrorAnswer {reason = 'b', dueTo = [1,2,4]}) >>= \(Just (), x) -> (x English :: IO ())
@@ -35,7 +35,7 @@ runLangMReport (return ()) (>>) (nameCdErrorEvaluation inst NameCdErrorAnswer {r
 For running all steps at once in `ghci`, the following approach is also possible:
 
 ``` haskell
-:m + Control.Monad.Output.Debug System.Random Text.Parsec
+:m +Control.OutputCapable.Blocks.Debug System.Random Text.Parsec
 let getLines = init <$> getLines' where getLines' = do { x <- getLine; if null x then pure [] else (\l -> x ++ '\n' : l) <$> getLines' }
 testTask English (randomRIO (0,1000) >>= nameCdErrorGenerate defaultNameCdErrorConfig 0) (nameCdErrorTask "/tmp/") nameCdErrorSyntax nameCdErrorEvaluation (either (error . show) id . parse parseNameCdErrorAnswer "" <$> getLines)
 ```

diff --git a/app/common/Common.hs b/app/common/Common.hs
@@ -8,9 +8,9 @@ module Common (
   withLang,
   ) where
 
-import qualified Control.Monad.Output.Generic     as GenericOutput (withLang)
+import qualified Control.OutputCapable.Blocks.Generic as GenericOutput (withLang)
 
-import Control.Monad.Output             (LangM', Language, ReportT)
+import Control.OutputCapable.Blocks     (LangM', Language, ReportT)
 import Control.Monad.Trans.Except       (ExceptT, runExceptT)
 import Data.Maybe                       (fromMaybe)
 import Diagrams.Prelude                 (Diagram, mkWidth)

diff --git a/app/concurrency.hs b/app/concurrency.hs
@@ -32,7 +32,7 @@ import Modelling.PetriNet.Types (
   defaultFindConcurrencyConfig, defaultPickConcurrencyConfig,
   )
 
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import Control.Monad.Trans.Class        (lift)
 import Data.Maybe                        (isNothing)
 import System.IO (

diff --git a/app/conflicts.hs b/app/conflicts.hs
@@ -33,7 +33,7 @@ import Modelling.PetriNet.Types         (
   defaultFindConflictConfig, defaultPickConflictConfig,
   )
 
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import Control.Monad.Trans.Class        (MonadTrans (lift))
 import Data.Maybe                       (isNothing)
 import System.IO (

diff --git a/app/different-names.hs b/app/different-names.hs
@@ -10,7 +10,7 @@ import Modelling.CdOd.DifferentNames
   (defaultDifferentNamesConfig, differentNames, differentNamesTask)
 import EvaluateArgs                     (evaluateArgs)
 
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import Control.Monad.Trans.Except       (runExceptT)
 import System.Environment               (getArgs)
 

diff --git a/app/enterASTaskDemo.hs b/app/enterASTaskDemo.hs
@@ -9,7 +9,7 @@ import Modelling.ActivityDiagram.EnterAS (
   enterASSyntax,
   enterASEvaluation
   )
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import System.Environment               (getArgs)
 
 import Common                           (withLang)

diff --git a/app/findSupportSTTaskDemo.hs b/app/findSupportSTTaskDemo.hs
@@ -8,7 +8,7 @@ import Modelling.ActivityDiagram.FindSupportST (
   findSupportSTTask,
   findSupportSTEvaluation
   )
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import System.Environment               (getArgs)
 
 import Common                           (withLang)

diff --git a/app/match-cd-od.hs b/app/match-cd-od.hs
@@ -18,7 +18,7 @@ import Modelling.CdOd.MatchCdOd (
   )
 import EvaluateArgs                     (evaluateArgs)
 
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import System.Environment               (getArgs)
 
 main :: IO ()

diff --git a/app/matchAdTaskDemo.hs b/app/matchAdTaskDemo.hs
@@ -9,7 +9,7 @@ import Modelling.ActivityDiagram.MatchAd (
   matchAdSyntax,
   matchAdEvaluation
   )
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import System.Environment               (getArgs)
 
 import Common                           (withLang)

diff --git a/app/matchPetriTaskDemo.hs b/app/matchPetriTaskDemo.hs
@@ -12,7 +12,7 @@ import Modelling.ActivityDiagram.MatchPetri (
   matchPetriSyntax,
   matchPetriEvaluation
   )
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import System.Environment               (getArgs)
 
 import Common                           (withLang)

diff --git a/app/matchToMath.hs b/app/matchToMath.hs
@@ -24,7 +24,7 @@ import Modelling.PetriNet.Types (
   )
 
 import Control.Monad                    (when)
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import Control.Monad.Trans.Class        (lift)
 import Control.Monad.Trans.Except       (throwE)
 import System.IO (

diff --git a/app/modelling-tasks-apps.cabal b/app/modelling-tasks-apps.cabal
@@ -52,7 +52,7 @@ executable concurrency
     , digest
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , pretty-simple
     , transformers
   default-language: Haskell2010
@@ -78,7 +78,7 @@ executable conflicts
     , digest
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , pretty-simple
     , transformers
   default-language: Haskell2010
@@ -105,7 +105,7 @@ executable different-names
     , digest
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , transformers
   default-language: Haskell2010
 
@@ -128,7 +128,7 @@ executable enterASTaskDemo
     , diagrams-svg
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , transformers
   default-language: Haskell2010
 
@@ -203,7 +203,7 @@ executable findSupportSTTaskDemo
     , diagrams-svg
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , transformers
   default-language: Haskell2010
 
@@ -229,7 +229,7 @@ executable match-cd-od
     , digest
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , transformers
   default-language: Haskell2010
 
@@ -252,7 +252,7 @@ executable matchAdTaskDemo
     , diagrams-svg
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , transformers
   default-language: Haskell2010
 
@@ -275,7 +275,7 @@ executable matchPetriTaskDemo
     , diagrams-svg
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , transformers
   default-language: Haskell2010
 
@@ -300,7 +300,7 @@ executable matchToMath
     , digest
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , pretty-simple
     , transformers
   default-language: Haskell2010
@@ -327,7 +327,7 @@ executable repair-incorrect
     , digest
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , transformers
   default-language: Haskell2010
 
@@ -350,7 +350,7 @@ executable selectASTaskDemo
     , diagrams-svg
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , transformers
   default-language: Haskell2010
 
@@ -373,6 +373,6 @@ executable selectPetriTaskDemo
     , diagrams-svg
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , transformers
   default-language: Haskell2010
diff --git a/app/package.yaml b/app/package.yaml
@@ -40,7 +40,7 @@ executables:
       - bytestring
       - digest
       - modelling-tasks
-      - output-monad
+      - output-blocks
       - pretty-simple
     other-modules:
       - Common
@@ -53,7 +53,7 @@ executables:
       - bytestring
       - digest
       - modelling-tasks
-      - output-monad
+      - output-blocks
       - pretty-simple
     other-modules:
       - Common
@@ -66,7 +66,7 @@ executables:
       - bytestring
       - digest
       - modelling-tasks
-      - output-monad
+      - output-blocks
     other-modules:
       - EvaluateArgs
       - Common
@@ -77,7 +77,7 @@ executables:
       - common
     dependencies:
       - modelling-tasks
-      - output-monad
+      - output-blocks
     other-modules:
       - Common
   evalIsomorphic:
@@ -107,7 +107,7 @@ executables:
       - common
     dependencies:
       - modelling-tasks
-      - output-monad
+      - output-blocks
     other-modules:
       - Common
   matchAdTaskDemo:
@@ -117,7 +117,7 @@ executables:
       - common
     dependencies:
       - modelling-tasks
-      - output-monad
+      - output-blocks
     other-modules:
       - Common
   matchPetriTaskDemo:
@@ -127,7 +127,7 @@ executables:
       - common
     dependencies:
       - modelling-tasks
-      - output-monad
+      - output-blocks
     other-modules:
       - Common
   match-cd-od:
@@ -139,7 +139,7 @@ executables:
       - bytestring
       - digest
       - modelling-tasks
-      - output-monad
+      - output-blocks
     other-modules:
       - Common
       - EvaluateArgs
@@ -152,7 +152,7 @@ executables:
       - bytestring
       - digest
       - modelling-tasks
-      - output-monad
+      - output-blocks
       - pretty-simple
     other-modules:
       - Common
@@ -165,7 +165,7 @@ executables:
       - bytestring
       - digest
       - modelling-tasks
-      - output-monad
+      - output-blocks
     other-modules:
       - Common
       - EvaluateArgs
@@ -176,7 +176,7 @@ executables:
       - common
     dependencies:
       - modelling-tasks
-      - output-monad
+      - output-blocks
     other-modules:
       - Common
   selectPetriTaskDemo:
@@ -186,6 +186,6 @@ executables:
       - common
     dependencies:
       - modelling-tasks
-      - output-monad
+      - output-blocks
     other-modules:
       - Common
diff --git a/app/repair-incorrect.hs b/app/repair-incorrect.hs
@@ -14,7 +14,7 @@ import Modelling.CdOd.SelectValidCd
   (defaultSelectValidCdConfig, selectValidCd, selectValidCdTask)
 import EvaluateArgs                     (evaluateArgs)
 
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import System.Environment               (getArgs)
 
 main :: IO ()

diff --git a/app/selectASTaskDemo.hs b/app/selectASTaskDemo.hs
@@ -9,7 +9,7 @@ import Modelling.ActivityDiagram.SelectAS (
   selectASSyntax,
   selectASEvaluation
   )
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import System.Environment               (getArgs)
 
 import Common                           (withLang)

diff --git a/app/selectPetriTaskDemo.hs b/app/selectPetriTaskDemo.hs
@@ -12,7 +12,7 @@ import Modelling.ActivityDiagram.SelectPetri (
   selectPetriSyntax,
   selectPetriEvaluation
   )
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import System.Environment               (getArgs)
 
 import Common                           (withLang)

diff --git a/legacy-app/different-names.hs b/legacy-app/different-names.hs
@@ -11,7 +11,7 @@ import Modelling.CdOd.DifferentNames
 import Modelling.CdOd.Generate.DifferentNames (differentNames)
 import EvaluateArgs                     (evaluateArgs)
 
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import System.Environment               (getArgs)
 
 main :: IO ()

diff --git a/legacy-app/match-cd-od.hs b/legacy-app/match-cd-od.hs
@@ -21,7 +21,7 @@ import Modelling.CdOd.MatchCdOd (
   )
 import EvaluateArgs                     (evaluateArgs)
 
-import Control.Monad.Output             (Language (English))
+import Control.OutputCapable.Blocks     (Language (English))
 import System.Environment               (getArgs)
 
 main :: IO ()

diff --git a/legacy-app/modelling-task-legacy-apps.cabal b/legacy-app/modelling-task-legacy-apps.cabal
@@ -77,7 +77,7 @@ executable different-names-legacy
     , graphviz
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , random-shuffle
     , transformers
   default-language: Haskell2010
@@ -137,7 +137,7 @@ executable match-cd-od-legacy
     , graphviz
     , modelling-tasks
     , mtl
-    , output-monad
+    , output-blocks
     , random-shuffle
     , transformers
   default-language: Haskell2010