wi

IntersectMBO · Oct 14, 2021 · 6921fbf · 6921fbf
1 parent b45d38d
commit 6921fbf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/plutus-core/plutus-ir/src/PlutusIR/Compiler.hs b/plutus-core/plutus-ir/src/PlutusIR/Compiler.hs
@@ -83,15 +83,13 @@ logDebug :: Compiling m e uni fun a => String -> m ()
 logDebug = whenM isDebug . traceM
 
 applyPass :: (Compiling m e uni fun a, b ~ Provenance a) => Pass uni fun -> Term TyName Name uni fun b -> m (Maybe (Term TyName Name uni fun b))
-applyPass pass term = do
-  c <- runIf (_shouldRun pass) $ do
-    let passName = _name pass
-    logVerbose $ "      !!! " ++ passName
-    logDebug   $ "        !!! Before " ++ passName ++ "\n" ++ show (pretty term)
-    term' <- _pass pass term
-    logDebug   $ "        !!! After " ++ passName ++ "\n" ++ show (pretty term')
-    pure term'
-  c >=> through check
+applyPass pass = runIf (_shouldRun pass) $ through check <=< \term -> do
+  let passName = _name pass
+  logVerbose $ "      !!! " ++ passName
+  logDebug   $ "        !!! Before " ++ passName ++ "\n" ++ show (pretty term)
+  term' <- _pass pass term
+  logDebug   $ "        !!! After " ++ passName ++ "\n" ++ show (pretty term')
+  pure term'
 
 availablePasses :: [Pass uni fun]
 availablePasses =
@@ -103,8 +101,8 @@ availablePasses =
 -- | Actual simplifier
 simplify
     :: forall m e uni fun a b. (Compiling m e uni fun a, b ~ Provenance a)
-    => Term TyName Name uni fun b -> m (Term TyName Name uni fun b)
-simplify = foldl' (>=>) pure (map applyPass availablePasses)
+    => Term TyName Name uni fun b -> m (Maybe (Term TyName Name uni fun b))
+simplify t = foldl' (>=>) (pure) (map applyPass availablePasses)
 
 -- | Perform some simplification of a 'Term'.
 simplifyTerm

diff --git a/plutus-core/plutus-ir/src/PlutusIR/Compiler/Types.hs b/plutus-core/plutus-ir/src/PlutusIR/Compiler/Types.hs
@@ -80,13 +80,13 @@ withEnclosing f = local (over ccEnclosing f)
 runIf
   :: MonadReader (CompilationCtx uni fun a) m
   => m Bool
-  -> (b -> m (Maybe b))
-  -> (b -> m (Maybe b))
+  -> (b -> m b)
+  -> (b -> m b)
 runIf condition pass arg = do
   doPass <- condition
-  if doPass then pass arg else pure $ Just arg
+  if doPass then pass arg else pure arg
 
-runIfOpts :: MonadReader (CompilationCtx uni fun a) m => (b -> m (Maybe b)) -> (b -> m (Maybe b))
+runIfOpts :: MonadReader (CompilationCtx uni fun a) m => (b -> m b) -> (b -> m b)
 runIfOpts = runIf $ view (ccOpts . coOptimize)
 
 type PLCTerm uni fun a = PLC.Term PLC.TyName PLC.Name uni fun (Provenance a)