From 3059c0a5a6fff2c9df537224e3d711cbf52f1d16 Mon Sep 17 00:00:00 2001
From: gareuselesinge
Date: Fri, 30 Aug 2013 12:20:08 +0000
Subject: 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
---
 lib/future.ml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/future.ml b/lib/future.ml
index 3cbaa95dc5..1e9cada513 100644
--- a/lib/future.ml
+++ b/lib/future.ml
@@ -96,9 +96,9 @@ let chain ?(id="none") ?(pure=false) c f = ref (match !c with
   | Closure _ | Delegated | Dropped -> Closure (fun () -> f (force ~pure c))
   | Exn _ as x -> x
   | Val (v, None) -> Closure (fun () -> f v)
-  | Val (v, Some _) when pure ->  Closure (fun () -> f v)
+  | Val (v, Some _) when pure -> Closure (fun () -> f v)
   | Val (v, Some state) ->
-       prerr_endline ("Future: restarting (check if optimizable): " ^ id);
+(*        prerr_endline ("Future: restarting (check if optimizable): " ^ id); *)
        Closure (fun () -> !unfreeze state; f v))
 
 let create_here f = chain ~pure:false (from_here ()) f
@@ -127,17 +127,17 @@ let join x =
   v
 
 let split2 x =
-  chain ~pure:true x (fun x -> fst x),
-  chain ~pure:true x (fun x -> snd x)
+  chain ~pure:false x (fun x -> fst x),
+  chain ~pure:false x (fun x -> snd x)
 
 let split3 x =
-  chain ~pure:true x (fun x -> Util.pi1 x),
-  chain ~pure:true x (fun x -> Util.pi2 x),
-  chain ~pure:true x (fun x -> Util.pi3 x)
+  chain ~pure:false x (fun x -> Util.pi1 x),
+  chain ~pure:false x (fun x -> Util.pi2 x),
+  chain ~pure:false x (fun x -> Util.pi3 x)
 
 let map2 f x l =
   CList.map_i (fun i y ->
-    let xi = chain ~pure:true x (fun x ->
+    let xi = chain ~pure:false x (fun x ->
         try List.nth x i
         with Failure _ | Invalid_argument _ ->
           Errors.anomaly (Pp.str "Future.map2 length mismatch")) in
-- 
cgit v1.2.3