ocaml 3.09 transition

[helm.git] / helm / matita / matita.ml

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 1d62cadb5be0c9dadb8a4316a5c1f32d29348987..11ae70642bf6b36c5f59e2b644648ca23522c7e7 100644 (file)
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -30,7 +30,8 @@ open MatitaTypes
 
 (** {2 Initialization} *)
 
-let _ = MatitaInit.initialize_all () 
+let _ = MatitaInit.initialize_all ()
+let _ = Paramodulation.Saturation.init () (* ALB to link paramodulation *)
 
 (** {2 GUI callbacks} *)
 
@@ -77,9 +78,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 *)
@@ -117,10 +121,6 @@ let _ =
     addDebugItem "print selections" (fun () ->
       let cicMathView = MatitaMathView.cicMathView_instance () in
       List.iter MatitaLog.debug (cicMathView#string_of_selections));
-    addDebugItem "dump getter settings" (fun _ ->
-      prerr_endline (Http_getter_env.env_to_string ()));
-    addDebugItem "getter: getalluris" (fun _ ->
-      List.iter prerr_endline (Http_getter.getalluris ()));
     addDebugItem "dump script status" script#dump;
     addDebugItem "dump configuration file to ./foo.conf.xml" (fun _ ->
       Helm_registry.save_to "./foo.conf.xml");
@@ -133,18 +133,46 @@ 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
+          (MatitaTypes.get_stack (MatitaScript.current ())#status)));
+(*     addDebugItem "ask record choice"
+      (fun _ ->
+        MatitaLog.debug (string_of_int
+          (MatitaGtkMisc.ask_record_choice ~gui ~title:"title" ~message:"msg"
+          ~fields:["a"; "b"; "c"]
+          ~records:[
+            ["0"; "0"; "0"]; ["0"; "0"; "1"]; ["0"; "1"; "0"]; ["0"; "1"; "1"];
+            ["1"; "0"; "0"]; ["1"; "0"; "1"]; ["1"; "1"; "0"]; ["1"; "1"; "1"]]
+          ()))); *)
     addDebugItem "rotate light bulbs"
       (fun _ ->
          let nb = gui#main#hintNotebook in
          nb#goto_page ((nb#current_page + 1) mod 3));
+    addDebugItem "print runtime dir"
+      (fun _ ->
+        prerr_endline BuildTimeConf.runtime_base_dir);
+    addDebugItem "disable all (pretty printing) notations"
+      (fun _ -> CicNotation.set_active_notations []);
+    addDebugItem "enable all (pretty printing) notations"
+      (fun _ ->
+        CicNotation.set_active_notations
+          (List.map fst (CicNotation.get_all_notations ())));
   end
   (** Debugging }}} *)