Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Utils.with_control use VernacControl (adapt to coq/coq#19517 adding a control flag) #834

Merged
merged 1 commit into from
Sep 27, 2024
Merged

Utils.with_control use VernacControl (adapt to coq/coq#19517 adding a control flag) #834

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 12 additions & 43 deletions coq/utils.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,47 +45,16 @@ let to_range ~lines (p : Loc.t) : Lang.Range.t =

let to_orange ~lines = Option.map (to_range ~lines)

(* Separation of parsing and execution made upstream API hard to use for us
:/ *)
let pmeasure (measure, print) fn =
match measure fn () with
| Ok _ as r -> Feedback.msg_notice @@ print r
| Error (exn, _) as r ->
Feedback.msg_notice @@ print r;
Exninfo.iraise exn

let with_fail fn =
try
fn ();
CErrors.user_err (Pp.str "The command has not failed!")
with exn when CErrors.noncritical exn ->
let exn = Exninfo.capture exn in
let msg = CErrors.iprint exn in
Feedback.msg_notice ?loc:None
Pp.(str "The command has indeed failed with message:" ++ fnl () ++ msg)

let with_ctrl ctrl ~st ~fn =
let st = State.to_coq st in
match ctrl with
| Vernacexpr.ControlTime ->
pmeasure System.(measure_duration, fmt_transaction_result) fn
| Vernacexpr.ControlInstructions ->
pmeasure System.(count_instructions, fmt_instructions_result) fn
| Vernacexpr.ControlTimeout n -> (
match Control.timeout (float_of_int n) fn () with
| None -> Exninfo.iraise (Exninfo.capture CErrors.Timeout)
| Some x -> x)
(* fail and succeed *)
| Vernacexpr.ControlFail ->
with_fail fn;
Vernacstate.Interp.invalidate_cache ();
Vernacstate.unfreeze_full_state st
| Vernacexpr.ControlSucceed ->
fn ();
Vernacstate.Interp.invalidate_cache ();
Vernacstate.unfreeze_full_state st
(* Unsupported by coq-lsp, maybe deprecate upstream *)
| Vernacexpr.ControlRedirect _ -> fn ()
ejgallego marked this conversation as resolved.
Show resolved Hide resolved

let with_control ~fn ~control ~st =
List.fold_right (fun ctrl fn () -> with_ctrl ctrl ~st ~fn) control fn ()
let open VernacControl in
let control = from_syntax control in
let control, () =
under_control ~loc:None ~with_local_state:trivial_state control ~noop:() fn
in
let noop = after_last_phase ~loc:None control in
let () =
if noop then (
Vernacstate.Interp.invalidate_cache ();
Vernacstate.unfreeze_full_state (State.to_coq st))
in
()