Merge SolverM and InfererM as part of an effort to simplify Inference.

google-research · Aug 16, 2023 · 900c9e0 · 900c9e0
1 parent 3cbde4c
commit 900c9e0
Show file tree

Hide file tree

Showing 5 changed files with 134 additions and 188 deletions.
diff --git a/src/lib/Err.hs b/src/lib/Err.hs
@@ -347,6 +347,10 @@ instance Alternative SearcherM where
       Just ans -> return $ Just ans
       Nothing -> m2
 
+instance Catchable SearcherM where
+  SearcherM (MaybeT m) `catchErr` handler = SearcherM $ MaybeT $
+    m `catchErr` \errs -> runMaybeT $ runSearcherM' $ handler errs
+
 instance Searcher SearcherM where
   (<!>) = (<|>)
   {-# INLINE (<!>) #-}

diff --git a/src/lib/Imp.hs b/src/lib/Imp.hs
@@ -1235,7 +1235,7 @@ buildImpFunction cc argHintsTys body = do
   return $ ImpFunction impFun $ Abs bs $ ImpBlock decls results
 
 buildImpNaryAbs
-  :: (SinkableE e, HasNamesE e, RenameE e, HoistableE e)
+  :: HasNamesE e
   => [(NameHint, IType)]
   -> (forall l. (Emits l, DExt n l) => [(Name ImpNameC l, BaseType)] -> SubstImpM i l (e l))
   -> SubstImpM i n (Abs (Nest IBinder) (Abs (Nest ImpDecl) e) n)