@@ -603,7 +603,7 @@ elabClause info opts (cnum, PClause fc fname lhs_in_as withs rhs_in_as wherebloc
603603 -- If we're inferring metavariables in the type, don't recheck,
604604 -- because we're only doing this to try to work out those metavariables
605605 (clhs_c, clhsty) <- if not inf
606− then recheckC fc [] lhs_tm
606+ then recheckC fc id [] lhs_tm
607607 else return (lhs_tm, lhs_ty)
608608 let clhs = normalise ctxt [] clhs_c
609609 let borrowed = borrowedNames [] clhs
@@ -681,7 +681,7 @@ elabClause info opts (cnum, PClause fc fname lhs_in_as withs rhs_in_as wherebloc
681681 logLvl 4 $ "---> " ++ show rhs'
682682 when (not (null defer)) $ iLOG $ "DEFERRED " ++
683683 show (map (\ (n, (_,_,t)) -> (n, t)) defer)
684− def' <- checkDef fc defer
684+ def' <- checkDef fc (Elaborating "deferred type of ") defer
685685 let def'' = map (\(n, (i, top, t)) -> (n, (i, top, t, False))) def'
686686 addDeferred def''
687687 mapM_ (\(n, _) -> addIBC (IBCDef n)) def''
@@ -700,7 +700,7 @@ elabClause info opts (cnum, PClause fc fname lhs_in_as withs rhs_in_as wherebloc
700700 logLvl 6 $ " ==> " ++ show (forget rhs')
701701
702702 (crhs, crhsty) <- if not inf
703− then recheckC_borrowing True borrowed fc [] rhs'
703+ then recheckC_borrowing True borrowed fc id [] rhs'
704704 else return (rhs', clhsty)
705705 logLvl 6 $ " ==> " ++ show crhsty ++ " against " ++ show clhsty
706706 ctxt <- getContext
@@ -828,7 +828,7 @@ elabClause info opts (_, PWith fc fname lhs_in withs wval_in pn_in withblock)
828828 let ret_ty = getRetTy (explicitNames (normalise ctxt [] lhs_ty))
829829 let static_names = getStaticNames i lhs_tm
830830 logLvl 5 (show lhs_tm ++ "\n" ++ show static_names)
831− (clhs, clhsty) <- recheckC fc [] lhs_tm
831+ (clhs, clhsty) <- recheckC fc id [] lhs_tm
832832 logLvl 5 ("Checked " ++ show clhs)
833833 let bargs = getPBtys (explicitNames (normalise ctxt [] lhs_tm))
834834 let wval = addImplBound i (map fst bargs) wval_in
@@ -847,12 +847,12 @@ elabClause info opts (_, PWith fc fname lhs_in withs wval_in pn_in withblock)
847847 return (tt, d, is, ctxt', newDecls))
848848 setContext ctxt'
849849 processTacticDecls newDecls
850− def' <- checkDef fc defer
850+ def' <- checkDef fc iderr defer
851851 let def'' = map (\(n, (i, top, t)) -> (n, (i, top, t, False))) def'
852852 addDeferred def''
853853 mapM_ (elabCaseBlock info opts) is
854854 logLvl 5 ("Checked wval " ++ show wval')
855− (cwval, cwvalty) <- recheckC fc [] (getInferTerm wval')
855+ (cwval, cwvalty) <- recheckC fc id [] (getInferTerm wval')
856856 let cwvaltyN = explicitNames (normalise ctxt [] cwvalty)
857857 let cwvalN = explicitNames (normalise ctxt [] cwval)
858858 logLvl 3 ("With type " ++ show cwvalty ++ "\nRet type " ++ show ret_ty)
@@ -907,7 +907,7 @@ elabClause info opts (_, PWith fc fname lhs_in withs wval_in pn_in withblock)
907907 addIBC (IBCImp wname)
908908 addIBC (IBCStatic wname)
909909
910− def' <- checkDef fc [(wname, (-1, Nothing, wtype))]
910+ def' <- checkDef fc iderr [(wname, (-1, Nothing, wtype))]
911911 let def'' = map (\(n, (i, top, t)) -> (n, (i, top, t, False))) def'
912912 addDeferred def''
913913
@@ -943,12 +943,12 @@ elabClause info opts (_, PWith fc fname lhs_in withs wval_in pn_in withblock)
943943 setContext ctxt'
944944 processTacticDecls newDecls
945945
946− def' <- checkDef fc defer
946+ def' <- checkDef fc iderr defer
947947 let def'' = map (\(n, (i, top, t)) -> (n, (i, top, t, False))) def'
948948 addDeferred def''
949949 mapM_ (elabCaseBlock info opts) is
950950 logLvl 5 ("Checked RHS " ++ show rhs')
951− (crhs, crhsty) <- recheckC fc [] rhs'
951+ (crhs, crhsty) <- recheckC fc id [] rhs'
952952 return $ (Right (clhs, crhs), lhs)
953953 where
954954 getImps (Bind n (Pi _ _ _) t) = pexp Placeholder : getImps t