diff options
| author | Enrico Tassi | 2014-10-13 16:33:28 +0200 |
|---|---|---|
| committer | Enrico Tassi | 2014-10-13 18:13:20 +0200 |
| commit | bce50a4e984a4aaf4f6582f079d7c4bddf4d1ff8 (patch) | |
| tree | 743d76cec163702a51706fd2ba011eeaada374e2 /stm | |
| parent | 9d0011125da2b24ccf006154ab205c6987fb03d2 (diff) | |
STM: simplify how the term part of a side effect is retrieved
Now the seff contains it directly, no need to force the future
or to hope that it is a Direct opaque proof.
Diffstat (limited to 'stm')
| -rw-r--r-- | stm/lemmas.ml | 4 | ||||
| -rw-r--r-- | stm/stm.ml | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/stm/lemmas.ml b/stm/lemmas.ml index b0fea5916f..0bcefc0e6a 100644 --- a/stm/lemmas.ml +++ b/stm/lemmas.ml @@ -71,9 +71,9 @@ let adjust_guardness_conditions const = function with Not_found -> false in if exists c e then e else Environ.add_constant c cb e in let env = Declareops.fold_side_effects (fun env -> function - | SEsubproof (c, cb) -> add c cb env + | SEsubproof (c, cb,_) -> add c cb env | SEscheme (l,_) -> - List.fold_left (fun e (_,c,cb) -> add c cb e) env l) + List.fold_left (fun e (_,c,cb,_) -> add c cb e) env l) env (Declareops.uniquize_side_effects eff) in let indexes = search_guard Loc.ghost env diff --git a/stm/stm.ml b/stm/stm.ml index b68ef94969..5349b85a81 100644 --- a/stm/stm.ml +++ b/stm/stm.ml @@ -802,14 +802,6 @@ module Task = struct let rc, time = let wall_clock = Unix.gettimeofday () in let l = Future.force (build_proof_here r_exn_info r_loc eop) in - List.iter (fun (_,se) -> Declareops.iter_side_effects (function - | Declarations.SEsubproof(_, - { Declarations.const_body = Declarations.OpaqueDef f; - const_universes = univs } ) -> - (* They are Direct *) - Opaqueproof.join_opaque Opaqueproof.empty_opaquetab f - | _ -> ()) - se) (fst l); l, Unix.gettimeofday () -. wall_clock in VCS.print (); RespBuiltProof(rc,time) |