diff options
| author | Pierre-Marie Pédrot | 2020-07-18 11:31:52 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2020-07-18 11:31:52 +0200 |
| commit | 689a391bddb956fdc05ec267866ef2253c731cc3 (patch) | |
| tree | f2eb014c354225802683ec8a6323bc11ff0c24ce /plugins/ssr | |
| parent | 81a1bcfd4c56017719061a906850d9a9e71d9916 (diff) | |
| parent | 4a4d35baf47944f4d30bd10de7e71f46f17da8f2 (diff) | |
Merge PR #12696: [gramlib] Remove legacy located exception wrapper in favor of standard infrastructure.
Reviewed-by: ppedrot
Diffstat (limited to 'plugins/ssr')
| -rw-r--r-- | plugins/ssr/ssrcommon.ml | 3 | ||||
| -rw-r--r-- | plugins/ssr/ssrelim.ml | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/plugins/ssr/ssrcommon.ml b/plugins/ssr/ssrcommon.ml index ba978c0705..1b7768852e 100644 --- a/plugins/ssr/ssrcommon.ml +++ b/plugins/ssr/ssrcommon.ml @@ -1129,8 +1129,7 @@ let tclDO n tac = let _, info = Exninfo.capture e in let e' = CErrors.UserError (l, prefix i ++ s) in Exninfo.iraise (e', info) - | Gramlib.Ploc.Exc(loc, CErrors.UserError (l, s)) -> - raise (Gramlib.Ploc.Exc(loc, CErrors.UserError (l, prefix i ++ s))) in + in let rec loop i gl = if i = n then tac_err_at i gl else (tclTHEN (tac_err_at i) (loop (i + 1))) gl in diff --git a/plugins/ssr/ssrelim.ml b/plugins/ssr/ssrelim.ml index a12b4aad11..1c81fbc10b 100644 --- a/plugins/ssr/ssrelim.ml +++ b/plugins/ssr/ssrelim.ml @@ -490,7 +490,6 @@ let equality_inj l b id c = let msg = ref "" in try Proofview.V82.of_tactic (Equality.inj None l b None c) gl with - | Gramlib.Ploc.Exc(_,CErrors.UserError (_,s)) | CErrors.UserError (_,s) when msg := Pp.string_of_ppcmds s; !msg = "Not a projectable equality but a discriminable one." || |