X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=b946ec69bf353f8028f8022f771b5c47130186ea;hb=1d431843f49b3658593c8cc918b53a43479a6486;hp=28dee494728511a693ce7e6a9cb06cabb0ce276c;hpb=1fa0472bfe2ed04c7adf166fa48df687f0022226;p=helm.git diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml index 28dee4947..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,25 +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" -let _ = GMain.Main.init () -let gui = new MatitaGui.gui (Helm_registry.get "matita.glade_file") +let _ = + Helm_registry.load_from "matita.conf.xml"; + GtkMain.Rc.add_default_file BuildTimeConf.gtkrc; + 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) () @@ -66,94 +64,37 @@ let proof_viewer = let frame = GBin.frame ~packing:(gui#proof#scrolledProof#add) ~show:true () in 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 ~set_goal () let new_proof (proof: MatitaTypes.proof) = let xmldump_observer _ _ = print_endline proof#toString in - let proof_observer _ (status, 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) = - (fst 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 metadata; + proof_viewer#load_proof status; debug_print "/proof_observer" in - let sequents_observer = - let pages = ref 0 in - let callback_id = ref None in - let mathmls = ref [] in - fun _ ((proof, goal_opt) as status, metadata) -> - debug_print "sequents_observer"; - let notebook = gui#main#sequentsNotebook in - for i = 1 to !pages do - notebook#remove_page 0 - done; - mathmls := []; - (match !callback_id with - | Some id -> GtkSignal.disconnect notebook#as_widget id - | None -> ()); - if goal_opt <> None then begin - let sequents = snd metadata in - let sequents_no = List.length sequents in - debug_print (sprintf "sequents no: %d" sequents_no); - pages := sequents_no; - let widget = sequent_viewer#coerce in - List.iter - (fun (metano, (asequent, _, _, ids_to_inner_sorts, _)) -> - let tab_label = - (GMisc.label ~text:(sprintf "?%d" metano) ~show:true ())#coerce - in - notebook#append_page ~tab_label widget; - let mathml = lazy - (let content_sequent = Cic2content.map_sequent asequent in - let pres_sequent = - Sequent2pres.sequent2pres ~ids_to_inner_sorts content_sequent - in - let xmlpres = Box.document_of_box pres_sequent in - Xml2Gdome.document_of_xml Misc.domImpl xmlpres) - in - mathmls := (metano, mathml) :: !mathmls) - sequents; - mathmls := List.rev !mathmls; - let render_page page = - let (metano, mathml) = List.nth !mathmls page in - sequent_viewer#load_sequent (Lazy.force mathml) metadata metano - in - callback_id := - (* TODO Zack the "#after" may probably be removed after Luca's fix for - * widget not loading documents before being realized *) - Some (notebook#connect#after#switch_page ~callback:(fun page -> - debug_print "switch_page callback"; - render_page page)); - (match goal_opt with - | Some goal -> (* current goal available, go to corresponding page *) - let page = ref 0 in - (try - List.iter - (fun (metano, _) -> - if (metano = goal) then raise Exit; - incr page) - sequents; - with Exit -> - debug_print (sprintf "going to page %d" !page); - notebook#goto_page !page; - render_page !page) - | None -> ()); - end; - debug_print "/sequents_observer" + let sequents_observer _ (((_, metasenv, _, _), goal_opt), ()) = + sequents_viewer#reset; + (match goal_opt with + | None -> () + | Some goal -> + 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; @@ -167,11 +108,15 @@ let quit () = (* quit program, asking for confirmation if needed *) GMain.Main.quit () let abort_proof () = - MatitaTypes.not_implemented "Matita.abort_proof" + if has_proof () then begin + set_proof None; + sequents_viewer#reset + end 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; @@ -198,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))) (** *) + +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 (); @@ -231,6 +191,7 @@ let _ = addDebugItem "dump proof status to stdout" (fun _ -> print_endline ((get_proof ())#toString)); end + (** *) let _ = GtkThread.main ()