X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=07f7f900ae9c1f727b97b797b3eab362445ed165;hb=5104e38ee747fd1052ce21f3f9f2ecc778d590ba;hp=0b457dd0ce1bd1cb6f2c872c14ae3d832e9be0b6;hpb=64e9baf5488aa0ad2e2d356ef6eb72b8ecb9fca0;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 0b457dd0c..07f7f900a 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -23,6 +23,8 @@
  * http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
 open Printf
 
 open MatitaGtkMisc
@@ -31,7 +33,7 @@ open GrafiteTypes
 (** {2 Initialization} *)
 
 let _ = MatitaInit.initialize_all ()
-let _ = Paramodulation.Saturation.init () (* ALB to link paramodulation *)
+(* let _ = Saturation.init () (* ALB to link paramodulation *) *)
 
 (** {2 GUI callbacks} *)
 
@@ -73,16 +75,21 @@ let _ =
   cic_math_view#set_href_callback
     (Some (fun uri -> (MatitaMathView.cicBrowser ())#load
       (`Uri (UriManager.uri_of_string uri))));
-  let browser_observer _ = MatitaMathView.refresh_all_browsers () in
-  let sequents_observer status =
+  let browser_observer _ _ = MatitaMathView.refresh_all_browsers () in
+  let sequents_observer _ grafite_status =
     sequents_viewer#reset;
-    match status.proof_status with
+    match grafite_status.proof_status with
     | 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);
+          script#setGoal (Some (Continuationals.Stack.find_goal stack));
+          let goal =
+           match script#goal with
+              None -> assert false
+            | Some n -> n
+          in
+           sequents_viewer#goto_sequent goal
+        with Failure _ -> script#setGoal None);
     | 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 *)
@@ -137,8 +144,8 @@ let _ =
     addDebugItem "print top-level grammar entries"
       CicNotationParser.print_l2_pattern;
     addDebugItem "dump moo to stderr" (fun _ ->
-      let status = (MatitaScript.current ())#status in
-      let moo = status.moo_content_rev in
+      let grafite_status = (MatitaScript.current ())#grafite_status in
+      let moo = grafite_status.moo_content_rev in
       List.iter
         (fun cmd ->
           prerr_endline (GrafiteAstPp.pp_command ~obj_pp:(fun _ -> assert false)
@@ -150,7 +157,7 @@ let _ =
           (List.map (fun (g, _, _) -> string_of_int g)
             (MatitaScript.current ())#proofMetasenv));
         prerr_endline ("stack: " ^ Continuationals.Stack.pp
-          (GrafiteTypes.get_stack (MatitaScript.current ())#status)));
+          (GrafiteTypes.get_stack (MatitaScript.current ())#grafite_status)));
 (*     addDebugItem "ask record choice"
       (fun _ ->
         HLog.debug (string_of_int