X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=b946ec69bf353f8028f8022f771b5c47130186ea;hb=1d431843f49b3658593c8cc918b53a43479a6486;hp=5fb0cb9061a7a8dfb6da9b9d39c3639be2dbef97;hpb=015263908d9142798bcbddbe4c4d13f71e08c5c3;p=helm.git diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml index 5fb0cb906..b946ec69b 100644 --- a/helm/matita/matita.ml +++ b/helm/matita/matita.ml @@ -23,75 +23,80 @@ * http://helm.cs.unibo.it/ *) +open Printf + open MatitaGtkMisc +open MatitaTypes +open MatitaMisc + +module DB = BuildTimeConf.DB (** {2 Internal status} *) let (get_proof, set_proof, has_proof) = let (current_proof: MatitaTypes.proof option ref) = ref None in - ((fun () -> + ((fun () -> (* get_proof *) match !current_proof with | Some proof -> proof | None -> failwith "No current proof"), - (fun proof -> (* TODO Zack: this function should probably be smarter taking - care also of unregistering notifications subscriber and so on *) - current_proof := proof), - (fun () -> !current_proof <> None)) - -(** {2 Settings} *) - -let debug_print = MatitaTypes.debug_print + (fun proof -> (* set_proof *) + current_proof := proof), + (fun () -> (* has_proof *) + !current_proof <> None)) (** {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) () let proof_viewer = - let mml_of_cic_object = BuildTimeConf.Transformer.mml_of_cic_object in - MatitaMathView.proof_viewer ~mml_of_cic_object ~show:true - ~packing:(gui#proof#scrolledProof#add) () -(* -let sequent_viewer = - let mml_of_cic_sequent = BuildTimeConf.Transformer.mml_of_cic_sequent in - MatitaMathView.sequent_viewer ~mml_of_cic_sequent ~show:true - ~packing:(gui#main#scrolledSequents#add) () -*) + 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) = - (* TODO Zack a lot: - * - ids_to_inner_types, ids_to_inner_sorts handling - * - sequent viewer notification - *) - let xmldump_observer _ (status, _) = print_endline proof#toString in - ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events - xmldump_observer); -(* + let xmldump_observer _ _ = print_endline proof#toString in let proof_observer _ (status, ()) = -prerr_endline "proof_observer"; - let ((uri_opt, metasenv, bo, ty), _) = status in + debug_print "proof_observer"; + let ((uri_opt, _, _, _), _) = status in let uri = MatitaTypes.unopt_uri uri_opt in - (* TODO CSC [] is wrong *) - let proof = Cic.Constant (UriManager.name_of_uri uri,Some bo,ty,[]) in -try - ignore (proof_viewer#load_proof uri proof) -with exn -> -prerr_endline "proof_observer exception:"; -prerr_endline (Printexc.to_string exn); -raise exn + debug_print "apply transformation"; + proof_viewer#load_proof status; + debug_print "/proof_observer" in - let proof_observer_id = - proof#attach_observer ~interested_in:StatefulProofEngine.all_events - proof_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); + ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events + proof_observer); + ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events + xmldump_observer); proof#notify; set_proof (Some proof) @@ -102,8 +107,15 @@ let quit () = (* quit program, asking for confirmation if needed *) then GMain.Main.quit () +let 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; @@ -131,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 (); @@ -164,6 +191,7 @@ let _ = addDebugItem "dump proof status to stdout" (fun _ -> print_endline ((get_proof ())#toString)); end + (** *) let _ = GtkThread.main ()