corrections mineures suite au commit de restructuration du noyau

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@2165 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 5 insertions, 11 deletions

diff --git a/library/states.ml b/library/states.ml
index 6bd8b7d64..9b1068a2b 100644
--- a/library/states.ml
+++ b/library/states.ml
@@ -9,17 +9,15 @@
 (* $Id$ *)
 
 open System
-open Lib
-open Summary
 
 type state = Lib.frozen * Summary.frozen
 
 let get_state () =
-  (Lib.freeze(), freeze_summaries())
+  (Lib.freeze(), Summary.freeze_summaries())
 
 let set_state (fl,fs) =
   Lib.unfreeze fl;
-  unfreeze_summaries fs
+  Summary.unfreeze_summaries fs
 
 let state_magic_number = 19764
 
@@ -34,12 +32,8 @@ let freeze = get_state
 let unfreeze = set_state
 
 let with_heavy_rollback f x =
-  let sum = freeze_summaries ()
-  and flib = freeze() in
+  let st = get_state () in
   try 
     f x
-  with reraise -> begin
-    unfreeze_summaries sum;
-    unfreeze flib;
-    raise reraise
-  end
+  with reraise ->
+    (set_state st; raise reraise)