fix stage2
diff --git a/src/Std/Do/WP/Basic.lean b/src/Std/Do/WP/Basic.lean index 42b3054..23942d6 100644 --- a/src/Std/Do/WP/Basic.lean +++ b/src/Std/Do/WP/Basic.lean
@@ -156,7 +156,9 @@ -- `inferInstanceAs` in `Except.instWP` wraps the `WP.wp` field into an auxiliary lemma that isn't -- a simp lemma (for good reasons since its definitional lemma only holds up to default -- transparency). - simp only [wp, instWP._aux_1, ExceptT.run, Id.run, PredTrans.apply_pushExcept, + try simp only [wp, instWP._aux_1, ExceptT.run, Id.run, PredTrans.apply_pushExcept, + PredTrans.apply_Pure_pure] at hspec + try simp only [wp, ExceptT.run, Id.run, PredTrans.apply_pushExcept, PredTrans.apply_Pure_pure] at hspec split at hspec <;> exact hspec True.intro @@ -173,7 +175,9 @@ -- `inferInstanceAs` in `Except.instWP` wraps the `WP.wp` field into an auxiliary lemma that isn't -- a simp lemma (for good reasons since its definitional lemma only holds up to default -- transparency). - simp only [wp, instWP._aux_1, ExceptT.run, Id.run, PredTrans.apply_pushExcept, + try simp only [wp, instWP._aux_1, ExceptT.run, Id.run, PredTrans.apply_pushExcept, + PredTrans.apply_Pure_pure] at hspec + try simp only [wp, ExceptT.run, Id.run, PredTrans.apply_pushExcept, PredTrans.apply_Pure_pure] at hspec split at hspec <;> exact hspec True.intro @@ -189,7 +193,9 @@ -- TODO: Because `OptionT Id` is not defeq to `Option` at implicit transparency, -- `inferInstanceAs` wraps the `WP.wp` field into an auxiliary lemma that isn't a simp lemma -- (for good reasons since its definitional lemma only holds up to default transparency). - simp only [wp, instWP._aux_1, OptionT.run, Id.run, PredTrans.apply_pushOption, + try simp only [wp, instWP._aux_1, OptionT.run, Id.run, PredTrans.apply_pushOption, + PredTrans.apply_Pure_pure] at hspec + try simp only [wp, OptionT.run, Id.run, PredTrans.apply_pushOption, PredTrans.apply_Pure_pure] at hspec split at hspec <;> exact hspec True.intro
diff --git a/src/Std/Do/WP/SimpLemmas.lean b/src/Std/Do/WP/SimpLemmas.lean index f6a2263..ac7f636 100644 --- a/src/Std/Do/WP/SimpLemmas.lean +++ b/src/Std/Do/WP/SimpLemmas.lean
@@ -426,7 +426,8 @@ -- `inferInstanceAs` in `Except.instWP` wraps the `WP.wp` field into an auxiliary lemma that isn't -- a simp lemma (for good reasons since its definitional lemma only holds up to default -- transparency). - simp [wp, MonadExceptOf.throw, Except.instWP._aux_1, Id.run, ExceptT.run] + try simp [wp, MonadExceptOf.throw, Except.instWP._aux_1, Id.run, ExceptT.run] + try simp [wp, MonadExceptOf.throw, Id.run, ExceptT.run] @[simp] theorem throw_ExceptT [Monad m] [WPMonad m ps] : @@ -439,7 +440,8 @@ -- TODO: Because `OptionT Id` is not defeq to `Option` at implicit transparency, -- `inferInstanceAs` wraps the `WP.wp` field into an auxiliary lemma that isn't a simp lemma -- (for good reasons since its definitional lemma only holds up to default transparency). - simp [wp, MonadExceptOf.throw, Option.instWP._aux_1, Id.run, OptionT.run] + try simp [wp, MonadExceptOf.throw, Option.instWP._aux_1, Id.run, OptionT.run] + try simp [wp, MonadExceptOf.throw, Id.run, OptionT.run] @[simp] theorem throw_OptionT [Monad m] [WPMonad m ps] : @@ -495,7 +497,9 @@ -- `inferInstanceAs` in `Except.instWP` wraps the `WP.wp` field into an auxiliary lemma that isn't -- a simp lemma (for good reasons since its definitional lemma only holds up to default -- transparency). - simp only [wp, Except.instWP._aux_1, ExceptT.run, Id.run, MonadExceptOf.tryCatch, Except.tryCatch, + try simp only [wp, Except.instWP._aux_1, ExceptT.run, Id.run, MonadExceptOf.tryCatch, Except.tryCatch, + PredTrans.apply_pushExcept] + try simp only [wp, ExceptT.run, Id.run, MonadExceptOf.tryCatch, Except.tryCatch, PredTrans.apply_pushExcept] cases x <;> simp @@ -515,7 +519,9 @@ -- TODO: Because `OptionT Id` is not defeq to `Option` at implicit transparency, -- `inferInstanceAs` wraps the `WP.wp` field into an auxiliary lemma that isn't a simp lemma -- (for good reasons since its definitional lemma only holds up to default transparency). - simp only [wp, Option.instWP._aux_1, Id.run, OptionT.run, MonadExceptOf.tryCatch, Option.tryCatch, + try simp only [wp, Option.instWP._aux_1, Id.run, OptionT.run, MonadExceptOf.tryCatch, Option.tryCatch, + PredTrans.apply_pushOption] + try simp only [wp, Id.run, OptionT.run, MonadExceptOf.tryCatch, Option.tryCatch, PredTrans.apply_pushOption] cases x <;> simp @@ -607,7 +613,9 @@ -- TODO: Because `OptionT Id` is not defeq to `Option` at implicit transparency, -- `inferInstanceAs` wraps the `WP.wp` field into an auxiliary lemma that isn't a simp lemma -- (for good reasons since its definitional lemma only holds up to default transparency). - cases x <;> simp [OrElse.orElse, Option.orElse, wp, Option.instWP._aux_1, Id.run, OptionT.run] + cases x <;> + (try simp [OrElse.orElse, Option.orElse, wp, Option.instWP._aux_1, Id.run, OptionT.run]) <;> + try simp [OrElse.orElse, Option.orElse, wp, Id.run, OptionT.run] @[simp] theorem orElse_OptionT [Monad m] [WPMonad m ps] :