aboutsummaryrefslogtreecommitdiff
path: root/proofs/proofview.ml
diff options
context:
space:
mode:
authorArnaud Spiwack2014-02-25 13:33:58 +0100
committerArnaud Spiwack2014-02-25 17:16:56 +0100
commitce9adc468df630e0fa1a0888fcff1fafc5b183ed (patch)
treedf7e5c99d80ffe540f3f87840a7c2231a7ca7105 /proofs/proofview.ml
parentb8f2df148d4c6ef4c2242a37a6287a93f2aa36c0 (diff)
Tacinterp: fewer Proofview.Goal.enterl.
I'm trying to avoid unecessary construction of intermediate lists. Interpretation function don't modify the goals, they just need a goal in their context. Some care has to be given to the evar maps, though, as we can extract an outdated evar map from a goal (this is probably an undesirable feature, but significantly simplified the compatibility API). Also, Proofview.Goal.enter{,l} catch exceptions (and transfer the non-critical ones into errors of the tactics monad). So I had to do just that for every "enter" removed (I probably have been overprotective but it's better that way). Not as trivial a modification as it should, but it will hopefully go over well. It was much needed anyway.
Diffstat (limited to 'proofs/proofview.ml')
-rw-r--r--proofs/proofview.ml8
1 files changed, 8 insertions, 0 deletions
diff --git a/proofs/proofview.ml b/proofs/proofview.ml
index 013b2f2047..49615a5f88 100644
--- a/proofs/proofview.ml
+++ b/proofs/proofview.ml
@@ -774,6 +774,11 @@ module V82 = struct
Proof.put (b,([],[]))
let catchable_exception = catchable_exception
+
+ let wrap_exceptions f =
+ try f ()
+ with e when catchable_exception e -> let e = Errors.push e in tclZERO e
+
end
@@ -845,6 +850,9 @@ module Goal = struct
(* compatibility *)
let goal { self=self } = self
+ let refresh_sigma g =
+ tclEVARMAP >= fun sigma ->
+ tclUNIT { g with sigma }
end