diff options
| author | Pierre-Marie Pédrot | 2019-07-15 13:13:01 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2019-07-15 13:13:01 +0200 |
| commit | 8cb590a246a1d8a795857a1196c3b8334f465e69 (patch) | |
| tree | f8071914813c968989d34fa1c618560ed469c905 | |
| parent | 76dfd0b95a7fd2de99f65de9fc10925d58777cd4 (diff) | |
| parent | d6165297c45389cdd9675f49327bc5b54464974c (diff) | |
Merge PR #10512: Remove Stm.call_process_error_once
Reviewed-by: ppedrot
| -rw-r--r-- | stm/stm.ml | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/stm/stm.ml b/stm/stm.ml index 9bbff476f8..d5e6e6fd8b 100644 --- a/stm/stm.ml +++ b/stm/stm.ml @@ -118,15 +118,6 @@ include Hook (* enables: Hooks.(call foo args) *) let call = get -let call_process_error_once = - let processed : unit Exninfo.t = Exninfo.make () in - fun (e, info) -> - match Exninfo.get info processed with - | Some _ -> e, info - | None -> - let info = Exninfo.add info processed () in - e, info - end let async_proofs_workers_extra_env = ref [||] @@ -988,7 +979,6 @@ end = struct (* {{{ *) | Some _ -> (e, info) | None -> let loc = Loc.get_loc info in - let (e, info) = Hooks.(call_process_error_once (e, info)) in execution_error ?loc id (iprint (e, info)); (e, Stateid.add info ~valid id) @@ -1066,11 +1056,7 @@ end (* }}} *) (* Wrapper for the proof-closing special path for Qed *) let stm_qed_delay_proof ?route ~proof ~info ~id ~st ~loc pending : Vernacstate.t = set_id_for_feedback ?route dummy_doc id; - try - Vernacentries.interp_qed_delayed_proof ~proof ~info ~st ?loc:loc pending - with e -> - let e = CErrors.push e in - Exninfo.iraise Hooks.(call_process_error_once e) + Vernacentries.interp_qed_delayed_proof ~proof ~info ~st ?loc:loc pending (* Wrapper for Vernacentries.interp to set the feedback id *) (* It is currently called 19 times, this number should be certainly @@ -1097,10 +1083,7 @@ let stm_vernac_interp ?route id st { verbose; expr } : Vernacstate.t = (stm_pperr_endline Pp.(fun () -> str "ignoring " ++ Ppvernac.pr_vernac expr); st) else begin stm_pperr_endline Pp.(fun () -> str "interpreting " ++ Ppvernac.pr_vernac expr); - try Vernacentries.interp ?verbosely:(Some verbose) ~st expr - with e -> - let e = CErrors.push e in - Exninfo.iraise Hooks.(call_process_error_once e) + Vernacentries.interp ?verbosely:(Some verbose) ~st expr end (****************************** CRUFT *****************************************) |
