diff options
author | 2013-10-05 17:44:45 +0000 | |
---|---|---|
committer | 2013-10-05 17:44:45 +0000 | |
commit | 65eec025bc0b581fae1af78f18d1a8666b76e69b (patch) | |
tree | 09a1d670468a2f141543c51a997f607f68eadef2 /proofs/pfedit.ml | |
parent | 29301ca3587f2069278745df83ad46717a3108a9 (diff) |
Moving side effects into evar_map. There was no reason to keep another
state out of one we were threading all the way along. This should be
safer, as one cannot forego side effects accidentally by manipulating
explicitly the [sigma] container.
Still, this patch raised the issue of badly used evar maps. There
is an ad-hoc workaround (i.e. a hack) in Rewrite to handle the
fact it uses evar maps in an unorthodox way.
Likewise, that mean we have to revert all contrib patches that added
effect threading...
There was also a dubious use of side effects in their toplevel handling,
that duplicates them, leading to the need of a rather unsafe List.uniquize
afterwards. It should be investigaged.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16850 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'proofs/pfedit.ml')
-rw-r--r-- | proofs/pfedit.ml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/proofs/pfedit.ml b/proofs/pfedit.ml index a45fe179a..a44b3bef3 100644 --- a/proofs/pfedit.ml +++ b/proofs/pfedit.ml @@ -62,15 +62,15 @@ let _ = Errors.register_handler begin function end let get_nth_V82_goal i = let p = Proof_global.give_me_the_proof () in - let { it=goals ; sigma = sigma; eff = eff } = Proof.V82.subgoals p in + let { it=goals ; sigma = sigma; } = Proof.V82.subgoals p in try - { it=(List.nth goals (i-1)) ; sigma=sigma; eff = eff } + { it=(List.nth goals (i-1)) ; sigma=sigma; } with Failure _ -> raise NoSuchGoal let get_goal_context_gen i = try -let { it=goal ; sigma=sigma; eff=eff } = get_nth_V82_goal i in -(sigma, Refiner.pf_env { it=goal ; sigma=sigma; eff=eff }) +let { it=goal ; sigma=sigma; } = get_nth_V82_goal i in +(sigma, Refiner.pf_env { it=goal ; sigma=sigma; }) with Proof_global.NoCurrentProof -> Errors.error "No focused proof." let get_goal_context i = |