X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2Fmatita.ml;h=b9e09f24d8dbc88bcbbaa4ca05c4ca30dc71e4c7;hb=9b193e984a2ab8c94e4c032c382f17c6c436938d;hp=1d62cadb5be0c9dadb8a4316a5c1f32d29348987;hpb=afe21e48aefe81db3ca150fac9a5bbfbc893fa59;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 1d62cadb5..b9e09f24d 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -77,9 +77,12 @@ let _ =
   let sequents_observer status =
     sequents_viewer#reset;
     match status.proof_status with
-    | Incomplete_proof ((proof, goal) as status) ->
-        sequents_viewer#load_sequents status;
-        sequents_viewer#goto_sequent goal
+    | Incomplete_proof ({ stack = stack } as incomplete_proof) ->
+        sequents_viewer#load_sequents incomplete_proof;
+        (try
+          script#setGoal (Continuationals.Stack.find_goal stack);
+          sequents_viewer#goto_sequent script#goal
+        with Failure _ -> script#setGoal ~-1);
     | Proof proof -> sequents_viewer#load_logo_with_qed
     | No_proof -> sequents_viewer#load_logo
     | Intermediate _ -> assert false (* only the engine may be in this state *)
@@ -133,14 +136,24 @@ let _ =
         (fun (s,t,u) -> 
           MatitaLog.debug
             (UriManager.name_of_uri u ^ ":"
-             ^ UriManager.name_of_uri s ^ " -> " ^ UriManager.name_of_uri t))
+             ^ CoercDb.name_of_carr s ^ " -> " ^ CoercDb.name_of_carr t))
         (CoercDb.to_list ()));
     addDebugItem "print top-level grammar entries"
       CicNotationParser.print_l2_pattern;
     addDebugItem "dump moo to stderr" (fun _ ->
-      let status = (MatitaScript.instance ())#status in
+      let status = (MatitaScript.current ())#status in
+      let moo, metadata = status.moo_content_rev in
       List.iter (fun cmd -> prerr_endline
-        (GrafiteAstPp.pp_command cmd)) (List.rev status.moo_content_rev));
+        (GrafiteAstPp.pp_command cmd)) (List.rev moo);
+      List.iter (fun m -> prerr_endline
+        (GrafiteAstPp.pp_metadata m)) metadata);
+    addDebugItem "print metasenv goals and stack to stderr"
+      (fun _ ->
+        prerr_endline ("metasenv goals: " ^ String.concat " "
+          (List.map (fun (g, _, _) -> string_of_int g)
+            (MatitaScript.current ())#proofMetasenv));
+        prerr_endline ("stack: " ^ Continuationals.Stack.pp
+          (MatitaMisc.get_stack (MatitaScript.current ())#status)));
     addDebugItem "rotate light bulbs"
       (fun _ ->
          let nb = gui#main#hintNotebook in