X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=b946ec69bf353f8028f8022f771b5c47130186ea;hb=1d431843f49b3658593c8cc918b53a43479a6486;hp=bf57dc8d91b1d7470117001c1893336550bf4844;hpb=fd96ce8e13f4f9adbeef2d9feb32f94dfcfaadad;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index bf57dc8d9..b946ec69b 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -26,6 +26,10 @@
 open Printf
 
 open MatitaGtkMisc
+open MatitaTypes
+open MatitaMisc
+
+module DB = BuildTimeConf.DB
 
 (** {2 Internal status} *)
 
@@ -40,28 +44,19 @@ let (get_proof, set_proof, has_proof) =
    (fun () -> (* has_proof *)
       !current_proof <> None))
 
-(** {2 Settings} *)
-
-let debug_print = MatitaTypes.debug_print
-
-let save_dom =
-  let domImpl = lazy (Gdome.domImplementation ()) in
-  fun ~doc ~dest ->
-    ignore
-      ((Lazy.force domImpl)#saveDocumentToFile ~doc ~name:dest ~indent:true ())
-
 (** {2 Initialization} *)
 
 let _ =
+  Helm_registry.load_from "matita.conf.xml";
   GtkMain.Rc.add_default_file BuildTimeConf.gtkrc;
-  GtkMain.Main.init ()
-let _ = Helm_registry.load_from "matita.conf.xml"
-let _ = GMain.Main.init ()
+  GMain.Main.init ()
 let parserr = new MatitaDisambiguator.parserr ()
-let mqiconn = MQIConn.init ()
+let dbh =
+  new DB.connection ~host:(Helm_registry.get "db.host")
+    ~user:(Helm_registry.get "db.user") (Helm_registry.get "db.database")
 let gui = MatitaGui.instance ()
 let disambiguator =
-  new MatitaDisambiguator.disambiguator ~parserr ~mqiconn
+  new MatitaDisambiguator.disambiguator ~parserr ~dbh
     ~chooseUris:(interactive_user_uri_choice ~gui)
     ~chooseInterp:(interactive_interp_choice ~gui)
     ()
@@ -70,40 +65,36 @@ let proof_viewer =
   MatitaMathView.proof_viewer ~show:true ~packing:(frame#add) ()
 let sequent_viewer = MatitaMathView.sequent_viewer ~show:true ()
 let sequents_viewer =
+  let set_goal goal =
+    debug_print (sprintf "Setting goal %d" goal);
+    if not (has_proof ()) then assert false;
+    (get_proof ())#set_goal goal
+  in
   MatitaMathView.sequents_viewer ~notebook:gui#main#sequentsNotebook
-    ~sequent_viewer ()
+    ~sequent_viewer ~set_goal ()
 
 let new_proof (proof: MatitaTypes.proof) =
   let xmldump_observer _ _ =  print_endline proof#toString in
-  let proof_observer _ (status, (proof_metadata, _)) =
+  let proof_observer _ (status, ()) =
     debug_print "proof_observer";
-    let (acic, ids_to_terms, ids_to_father_ids, ids_to_inner_sorts,
-        ids_to_inner_types, ids_to_conjectures, ids_to_hypotheses) =
-      proof_metadata
-    in
     let ((uri_opt, _, _, _), _) = status in
     let uri = MatitaTypes.unopt_uri uri_opt in
     debug_print "apply transformation";
-    let mathml =
-      ApplyTransformation.mml_of_cic_object
-        ~explode_all:true uri acic ids_to_inner_sorts ids_to_inner_types
-    in
-    if BuildTimeConf.debug then save_dom ~doc:mathml ~dest:"/tmp/matita.xml";
-    proof_viewer#load_proof mathml proof_metadata;
+    proof_viewer#load_proof status;
     debug_print "/proof_observer"
   in
-  let sequents_observer _ ((proof, goal_opt), (_, sequents_metadata)) =
+  let sequents_observer _ (((_, metasenv, _, _), goal_opt), ()) =
     sequents_viewer#reset;
     (match goal_opt with
     | None -> ()
     | Some goal ->
-        sequents_viewer#load_sequents sequents_metadata;
+        sequents_viewer#load_sequents metasenv;
         sequents_viewer#goto_sequent goal)
   in
   ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
-      sequents_observer);
+    sequents_observer);
   ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
-      proof_observer);
+    proof_observer);
   ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
     xmldump_observer);
   proof#notify;
@@ -125,6 +116,7 @@ let abort_proof () =
 let proof_handler =
   { MatitaTypes.get_proof = get_proof;
     MatitaTypes.abort_proof = abort_proof;
+    MatitaTypes.set_proof = set_proof;
     MatitaTypes.has_proof = has_proof;
     MatitaTypes.new_proof = new_proof;
     MatitaTypes.quit = quit;
@@ -151,9 +143,24 @@ let _ =
         disambiguator#disambiguateTerm (Stream.of_string input)
       in
       let proof = MatitaProof.proof ~typ:expr ~metasenv () in
-      new_proof proof))
+      new_proof proof));
+  ignore (gui#main#openMenuItem#connect#activate (fun _ ->
+    match gui#chooseFile () with
+    | None -> ()
+    | Some f when is_proof_script f ->
+        gui#script#scriptTextView#buffer#set_text (input_file f)
+    | Some f ->
+        gui#console#echo_error (sprintf
+          "Don't know what to do with file: %s\nUnrecognized file format." f)))
 
   (** <DEBUGGING> *)
+
+let save_dom =
+  let domImpl = lazy (Gdome.domImplementation ()) in
+  fun ~doc ~dest ->
+    ignore
+      ((Lazy.force domImpl)#saveDocumentToFile ~doc ~name:dest ~indent:true ())
+
 let _ =
   if BuildTimeConf.debug then begin
     gui#main#debugMenu#misc#show ();
@@ -184,6 +191,7 @@ let _ =
     addDebugItem "dump proof status to stdout" (fun _ ->
       print_endline ((get_proof ())#toString));
   end
+
   (** </DEBUGGING> *)
 
 let _ = GtkThread.main ()