From ed32f569e3b636e0f12efdbbd5bba9e05cc434ac Mon Sep 17 00:00:00 2001
From: Damien Doligez <damien.doligez-inria.fr>
Date: Wed, 20 May 2009 11:52:42 +0000
Subject: merge changes from ocaml3110 to ocaml3111rc0

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9270 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 debugger/main.ml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'debugger/main.ml')

diff --git a/debugger/main.ml b/debugger/main.ml
index fda242bc52..9cfcf447ff 100644
--- a/debugger/main.ml
+++ b/debugger/main.ml
@@ -13,8 +13,6 @@
 
 (* $Id$ *)
 
-open Primitives
-open Misc
 open Input_handling
 open Question
 open Command_line
@@ -47,12 +45,12 @@ let rec protect ppf restart loop =
           !current_checkpoint.c_pid;
         pp_print_flush ppf ();
         stop_user_input ();
-        loop ppf)
+        restart ppf)
   | Toplevel ->
       protect ppf restart (function ppf ->
         pp_print_flush ppf ();
         stop_user_input ();
-        loop ppf)
+        restart ppf)
   | Sys.Break ->
       protect ppf restart (function ppf ->
         fprintf ppf "Interrupted.@.";
@@ -62,7 +60,7 @@ let rec protect ppf restart loop =
             try_select_frame 0;
             show_current_event ppf;
           end);
-        loop ppf)
+        restart ppf)
   | Current_checkpoint_lost ->
       protect ppf restart (function ppf ->
         fprintf ppf "Trying to recover...@.";
@@ -70,7 +68,7 @@ let rec protect ppf restart loop =
         recover ();
         try_select_frame 0;
         show_current_event ppf;
-        loop ppf)
+        restart ppf)
   | Current_checkpoint_lost_start_at (time, init_duration) ->
       protect ppf restart (function ppf ->
         let b =
-- 
cgit v1.2.1