X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=e8c030b61cc3aeeb208ba95b67b9f1a57b965f67;hb=ef9ec8cb57d15426a96fe40d056eb07804753bb9;hp=fad12b563772db8166e0c850c46fae22402211b2;hpb=142d3076f2a4dc17d9045c2bba4d4b01eddfd008;p=helm.git diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml index fad12b563..e8c030b61 100644 --- a/helm/matita/matita.ml +++ b/helm/matita/matita.ml @@ -29,25 +29,13 @@ open MatitaGtkMisc open MatitaTypes open MatitaMisc -(** {2 Internal status} *) - -let (get_proof, set_proof, has_proof) = - let (current_proof: MatitaTypes.proof option ref) = ref None in - ((fun () -> (* get_proof *) - match !current_proof with - | Some proof -> proof - | None -> failwith "No current proof"), - (fun proof -> (* set_proof *) - current_proof := proof), - (fun () -> (* has_proof *) - !current_proof <> None)) - (** {2 Initialization} *) let _ = Helm_registry.load_from "matita.conf.xml"; GtkMain.Rc.add_default_file BuildTimeConf.gtkrc; GMain.Main.init () + let parserr = new MatitaDisambiguator.parserr () let dbd = Mysql.quick_connect @@ -55,27 +43,26 @@ let dbd = ~user:(Helm_registry.get "db.user") ~database:(Helm_registry.get "db.database") () +let _ = MetadataDb.clean ~dbd ~owner:(Helm_registry.get "matita.owner") let gui = MatitaGui.instance () let disambiguator = new MatitaDisambiguator.disambiguator ~parserr ~dbd ~chooseUris:(interactive_user_uri_choice ~gui) ~chooseInterp:(interactive_interp_choice ~gui) () -let proof_viewer = MatitaMathView.proof_viewer_instance () + +let currentProof = new MatitaProof.currentProof + let sequent_viewer = MatitaMathView.sequent_viewer ~show:true () let sequents_viewer = let set_goal goal = - if not (has_proof ()) then assert false; - (get_proof ())#set_goal goal + if not (currentProof#onGoing ()) then assert false; + currentProof#proof#set_goal goal in MatitaMathView.sequents_viewer ~notebook:gui#main#sequentsNotebook ~sequent_viewer ~set_goal () - -let new_proof (proof: MatitaTypes.proof) = - let proof_observer _ (status, ()) = - let ((uri_opt, _, _, _), _) = status in - proof_viewer#load_proof status; - in +let _ = (* attach observers to proof status *) + let browser_observer _ _ = MatitaMathView.refresh_all_browsers () in let sequents_observer _ (((_, metasenv, _, _), goal_opt), ()) = sequents_viewer#reset; (match goal_opt with @@ -84,48 +71,44 @@ let new_proof (proof: MatitaTypes.proof) = 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); - proof#notify; - set_proof (Some proof) - -let quit () = (* quit program, asking for confirmation if needed *) - if not (has_proof ()) || - (ask_confirmation ~gui - ~msg:("Proof in progress, are you sure you want to quit?") ()) - 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; - MatitaTypes.quit = quit; - } - + currentProof#addObserver sequents_observer; + currentProof#addObserver browser_observer; + currentProof#connect `Quit (fun () -> + (* quit program, asking for confirmation if needed *) + if not (currentProof#onGoing ()) || + (ask_confirmation ~gui + ~msg:("Proof in progress, are you sure you want to quit?") ()) + then + GMain.Main.quit (); + false); + currentProof#connect `Abort (fun () -> sequents_viewer#reset; false) + +let currentProof = (currentProof :> MatitaTypes.currentProof) +let mathViewer = + MatitaMathView.mathViewer ~disambiguator + ~currentProof:(currentProof :> MatitaTypes.currentProof) () let interpreter = - let console = gui#console in - new MatitaInterpreter.interpreter ~disambiguator ~proof_handler ~console () + let console = (gui#console :> MatitaTypes.console) in + new MatitaInterpreter.interpreter + ~disambiguator ~currentProof:(currentProof :> MatitaTypes.currentProof) + ~console ~mathViewer ~dbd () +let _ = + let href_callback uri = + let term = CicAst.Uri (UriManager.string_of_uri uri, None) in + ignore (interpreter#evalAst (TacticAst.Command (TacticAst.Check term))) + in + sequent_viewer#set_href_callback (Some href_callback) (** {2 Script window handling} *) let script_forward _ = let buf = gui#script#scriptTextView#buffer in let locked_iter = buf#get_iter_at_mark (`NAME "locked") in - if + let (success, hide) = interpreter#evalPhrase - (buf#get_text ~start:locked_iter ~stop:buf#end_iter ()); - then + (buf#get_text ~start:locked_iter ~stop:buf#end_iter ()) + in + if success then gui#lockScript (locked_iter#offset + interpreter#endOffset) let script_jump _ = @@ -136,10 +119,10 @@ let script_jump _ = let len = String.length raw_text in let rec parse offset = if offset < len then begin - if - interpreter#evalPhrase ~transparent:true - (String.sub raw_text offset (len - offset)); - then begin + let (success, hide) = + interpreter#evalPhrase (String.sub raw_text offset (len - offset)) + in + if success then begin let new_offset = interpreter#endOffset + offset in gui#lockScript (new_offset + locked_iter#offset); parse new_offset @@ -161,11 +144,12 @@ let load_script fname = (** {2 GUI callbacks} *) let _ = - gui#setQuitCallback quit; + gui#setQuitCallback currentProof#quit; gui#setPhraseCallback interpreter#evalPhrase; gui#main#debugMenu#misc#hide (); - ignore (gui#main#newProofMenuItem#connect#activate - (gui#console#show ~msg:"theorem ")); + ignore (gui#main#newProofMenuItem#connect#activate (fun _ -> + gui#console#clear (); + gui#console#show ~msg:"theorem " ())); ignore (gui#main#openMenuItem#connect#activate (fun _ -> match gui#chooseFile () with | None -> () @@ -174,6 +158,9 @@ let _ = gui#console#echo_error (sprintf "Don't know what to do with file: %s\nUnrecognized file format." f))); + ignore (gui#main#newCicBrowserMenuItem#connect#activate (fun _ -> + let currentProof = (currentProof :> MatitaTypes.currentProof) in + ignore (MatitaMathView.cicBrowser ~disambiguator ~currentProof ()))); connect_button gui#script#scriptWinForwardButton script_forward; connect_button gui#script#scriptWinBackButton script_back; connect_button gui#script#scriptWinJumpButton script_jump; @@ -181,7 +168,7 @@ let _ = let hole = CicAst.UserInput in let tac ast _ = ignore (interpreter#evalAst (A.Tactic ast)) in let tac_w_term ast _ = - gui#console#clear (); +(* gui#console#clear (); *) gui#console#show ~msg:(TacticAstPp.pp_tactic ast) (); gui#main#mainWin#present () in @@ -217,16 +204,26 @@ let _ = Helm_registry.set_bool "matita.auto_disambiguation" (not (Helm_registry.get_bool "matita.auto_disambiguation"))); addDebugItem "dump proof status to stdout" (fun _ -> - print_endline ((get_proof ())#toString)); - addDebugItem "hide console" gui#console#hide; - addDebugItem "show console" gui#console#show; + print_endline (currentProof#proof#toString)); + addDebugItem "dump environment to \"env.dump\"" (fun _ -> + let oc = open_out "env.dump" in + CicEnvironment.dump_to_channel oc; + close_out oc); + addDebugItem "print selected terms" (fun () -> + let i = ref 0 in + List.iter + (fun t -> incr i; debug_print (sprintf "%d: %s" !i (CicPp.ppterm t))) + sequent_viewer#get_selected_terms); + addDebugItem "refresh all browsers" MatitaMathView.refresh_all_browsers; end (** *) let _ = +(* CicEnvironment.set_trust (fun _ -> false); *) (try load_script Sys.argv.(1) with Invalid_argument _ -> ()); + gui#console#show (); GtkThread.main ()