express function in terms of flex utility

src/Formula/Parsing/Delayed.hs

@@ -5,7 +5,7 @@ module Formula.Parsing.Delayed (
   withDelayed,
   displayParseError,
   withDelayedSucceeding,
-  parseDelayedAbortOrProcess,
+  withDelayedReportOrSucceed,
   parseDelayedWithAndThen,
   complainAboutMissingParenthesesIfNotFailingOn,
   complainAboutWrongNotation
@@ -23,14 +23,10 @@ import Control.OutputCapable.Blocks (
   ReportT,
   english,
   german,
-  indent,
-  translate
-  )
-import Control.OutputCapable.Blocks.Generic (
-  toAbort,
   )
 import Control.Monad.State (State)
 import Data.Map (Map)
+import FlexTask.Generic.Parse (parseWithOrReport)
 
 import LogicTasks.Helpers (reject)
 import Formula.Parsing.Delayed.Internal (Delayed(..))
@@ -61,24 +57,20 @@ displayParseError err = do
   english $ show err
   german $ show err
 
-parseDelayedAbortOrProcess ::
+withDelayedReportOrSucceed ::
   (Monad m, OutputCapable (ReportT o m))
   => Parser a
   -> (Maybe ParseError -> ParseError -> State (Map Language String) ())
   -> Parser ()
   -> String
-  -> (a -> LangM' (ReportT o m) b)
-  -> LangM' (ReportT o m) b
-parseDelayedAbortOrProcess p messaging fallBackParser answerString whatToDo =
-  case parseDelayed (fully p) asDelayed of
-    Left err -> toAbort (indent $ translate $
-                  messaging (either Just (const Nothing) $
-                    parseDelayedRaw (fully fallBackParser) asDelayed)
-                    err
-                )
-    Right x  -> whatToDo x
-  where
-    asDelayed = delayed answerString
+  -> LangM' (ReportT o m) a
+withDelayedReportOrSucceed p messaging fallBackParser =
+  parseWithOrReport
+    (parseDelayed (fully p))
+    (\answer -> messaging (either Just (const Nothing) $
+                    parseDelayedRaw (fully fallBackParser) answer)
+    )
+    . delayed
 
 parseDelayedWithAndThen ::
   OutputCapable m

stack.yaml

@@ -10,11 +10,11 @@ extra-deps:
   - minisat-solver-0.1
   - latex-svg-image-0.2
   - git: https://github.com/fmidue/output-blocks.git
-    commit: d155aa5a1978329ae5ab936a78ab6dd5f74919c2
+    commit: 77dd77fcbb8084a31c6633089605f7654af12ece
     subdirs:
       - output-blocks
   - git: https://github.com/fmidue/flex-tasks.git
-    commit: b50ab20b157f3009835da0206e4bfe8872de6f81
+    commit: 26c7fe304007e78f669519bb62ae374cc85281a9
     subdirs:
       - flex-tasks
       - flex-tasks-processing