aboutsummaryrefslogtreecommitdiff
path: root/proofs
diff options
context:
space:
mode:
authorgareuselesinge2013-08-30 12:20:08 +0000
committergareuselesinge2013-08-30 12:20:08 +0000
commit3059c0a5a6fff2c9df537224e3d711cbf52f1d16 (patch)
treee875dfd7a494f3aabaa64af71be809b0dd99dc2b /proofs
parentde9798346c7df0593d4d7b83a8f316991f6fb230 (diff)
safe Conv_oracle state for type checking
safe_typing is not purely functional, hence we cannot chain it as if it was a pure computation. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16744 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'proofs')
-rw-r--r--proofs/proof_global.ml4
1 files changed, 2 insertions, 2 deletions
diff --git a/proofs/proof_global.ml b/proofs/proof_global.ml
index 58eb2e21d8..2365e2bdbd 100644
--- a/proofs/proof_global.ml
+++ b/proofs/proof_global.ml
@@ -274,7 +274,7 @@ let close_proof ~now fpl =
const_entry_inline_code = false;
const_entry_opaque = true }) fpl initial_goals in
if now then
- List.iter (fun x -> ignore(Future.join x.Entries.const_entry_body)) entries;
+ List.iter (fun x -> ignore(Future.compute x.Entries.const_entry_body)) entries;
(pid, (entries, compute_guard, strength, hook))
let return_proof ~fix_exn =
@@ -293,7 +293,7 @@ let return_proof ~fix_exn =
let close_future_proof proof = close_proof ~now:false proof
let close_proof () =
- close_proof ~now:true (Future.from_val (return_proof ~fix_exn:(fun x -> x)))
+ close_proof ~now:true (Future.from_here (return_proof ~fix_exn:(fun x -> x)))
(**********************************************************)
(* *)