X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=107691932b6fc5b71eaa4226ab192087f3847de1;hb=d0991ea0c7c83c100b2d223644cb2f11a8554fa1;hp=6a5e2e51debf5c20bedc785d079ffba14e357c60;hpb=190e42f1030ea3d459c4040bb0e8503a7c096820;p=helm.git diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml index 6a5e2e51d..107691932 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,24 +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 currentProof = new MatitaProof.currentProof + let proof_viewer = MatitaMathView.proof_viewer_instance () 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 xmldump_observer _ _ = print_endline proof#toString in +let _ = (* attach observers to proof status *) let proof_observer _ (status, ()) = let ((uri_opt, _, _, _), _) = status in proof_viewer#load_proof status; @@ -85,59 +75,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); -(* - ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events - xmldump_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 proof_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 mathViewer = MatitaMathView.mathViewer () let interpreter = - let console = gui#console in - new MatitaInterpreter.interpreter ~disambiguator ~proof_handler ~console () - - (** prompt the user for the textual input of a term and disambiguate it *) -let ask_term ?(title = "term input") ?(msg = "insert term") () = - match gui#askText ~title ~msg () with - | Some t -> - let (_, _, term) = disambiguator#disambiguateTerm (Stream.of_string t) in - Some term - | None -> None + let console = (gui#console :> MatitaTypes.console) in + let currentProof = (currentProof :> MatitaTypes.currentProof) in + new MatitaInterpreter.interpreter + ~disambiguator ~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 + proof_viewer#set_href_callback (Some href_callback); + sequent_viewer#set_href_callback (Some href_callback); + mathViewer#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 - interpreter#evalPhrase - (buf#get_text ~start:locked_iter ~stop:buf#end_iter ()); - gui#lockScript (locked_iter#offset + interpreter#endOffset) + let (success, hide) = + interpreter#evalPhrase + (buf#get_text ~start:locked_iter ~stop:buf#end_iter ()) + in + if success then + gui#lockScript (locked_iter#offset + interpreter#endOffset) let script_jump _ = let buf = gui#script#scriptTextView#buffer in @@ -147,16 +122,20 @@ let script_jump _ = let len = String.length raw_text in let rec parse offset = if offset < len then begin - interpreter#evalPhrase ~transparent:true - (String.sub raw_text offset (len - offset)); - let new_offset = interpreter#endOffset + offset in - gui#lockScript (new_offset + locked_iter#offset); - parse new_offset + 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 + end else + raise Exit end in try parse 0 - with CicTextualParser2.Parse_error _ -> () + with Exit -> () let script_back _ = not_implemented "script_back" @@ -168,23 +147,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 (fun _ -> - if has_proof () && - not (ask_confirmation ~gui - ~msg:("Proof in progress, are you sure you want to start a new one?") - ()) - then - () (* abort new proof process *) - else - let input = ask_text ~gui ~msg:"Insert proof goal" ~multiline:true () in - let (env, metasenv, expr) = - disambiguator#disambiguateTerm (Stream.of_string input) - in - let proof = MatitaProof.proof ~typ:expr ~metasenv () in - new_proof proof)); + gui#console#clear (); + gui#console#show ~msg:"theorem " ())); ignore (gui#main#openMenuItem#connect#activate (fun _ -> match gui#chooseFile () with | None -> () @@ -193,47 +161,36 @@ let _ = gui#console#echo_error (sprintf "Don't know what to do with file: %s\nUnrecognized file format." f))); - ignore (gui#script#scriptWinForwardButton#connect#clicked script_forward); - ignore (gui#script#scriptWinBackButton#connect#clicked script_back); - ignore (gui#script#scriptWinJumpButton#connect#clicked script_jump); - let tac_w_term name tac _ = - match ask_term ~title:name ~msg:("term for " ^ name) () with - | Some term -> (get_proof ())#apply_tactic (tac ~term) - | None -> () + connect_button gui#script#scriptWinForwardButton script_forward; + connect_button gui#script#scriptWinBackButton script_back; + connect_button gui#script#scriptWinJumpButton script_jump; + let module A = TacticAst in + 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#show ~msg:(TacticAstPp.pp_tactic ast) (); + gui#main#mainWin#present () in - let tac _ tac _ = (get_proof ())#apply_tactic tac in let tbar = gui#toolbar in - ignore (tbar#introsButton#connect#clicked (tac "intros" (Tactics.intros ()))); - ignore (tbar#applyButton#connect#clicked (tac_w_term "apply" Tactics.apply)); - ignore (tbar#exactButton#connect#clicked (tac_w_term "exact" Tactics.exact)); - ignore (tbar#elimButton#connect#clicked (tac_w_term "elim" - Tactics.elim_intros_simpl)); - ignore (tbar#elimTypeButton#connect#clicked (tac_w_term "elim type" - Tactics.elim_type)); - ignore (tbar#splitButton#connect#clicked (tac "split" Tactics.split)); - ignore (tbar#leftButton#connect#clicked (tac "left" Tactics.left)); - ignore (tbar#rightButton#connect#clicked (tac "right" Tactics.right)); - ignore (tbar#existsButton#connect#clicked (tac "exists" Tactics.exists)); - ignore (tbar#reflexivityButton#connect#clicked (tac "reflexivity" - Tactics.reflexivity)); - ignore (tbar#symmetryButton#connect#clicked (tac "symmetry" - Tactics.symmetry)); - ignore (tbar#transitivityButton#connect#clicked (tac_w_term "transitivity" - Tactics.transitivity)); - ignore (tbar#assumptionButton#connect#clicked (tac "assumption" - Tactics.assumption)); - ignore (tbar#cutButton#connect#clicked (tac_w_term "cut" - (Tactics.cut ?mk_fresh_name_callback:None))); - ignore (tbar#autoButton#connect#clicked (tac "auto" (Tactics.auto ~dbd))) + connect_button tbar#introsButton (tac (A.Intros (None, []))); + connect_button tbar#applyButton (tac_w_term (A.Apply hole)); + connect_button tbar#exactButton (tac_w_term (A.Exact hole)); + connect_button tbar#elimButton (tac_w_term (A.Elim (hole, None))); + connect_button tbar#elimTypeButton (tac_w_term (A.ElimType hole)); + connect_button tbar#splitButton (tac A.Split); + connect_button tbar#leftButton (tac A.Left); + connect_button tbar#rightButton (tac A.Right); + connect_button tbar#existsButton (tac A.Exists); + connect_button tbar#reflexivityButton (tac A.Reflexivity); + connect_button tbar#symmetryButton (tac A.Symmetry); + connect_button tbar#transitivityButton (tac_w_term (A.Transitivity hole)); + connect_button tbar#assumptionButton (tac A.Assumption); + connect_button tbar#cutButton (tac_w_term (A.Cut hole)); + connect_button tbar#autoButton (tac A.Auto) (** *) -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 (); @@ -243,33 +200,29 @@ let _ = in ignore (item#connect#activate callback) in - addDebugItem "interactive user uri choice" (fun _ -> - try - let uris = - interactive_user_uri_choice ~gui ~selection_mode:`MULTIPLE - ~msg:"messaggio" ~nonvars_button:true - ["cic:/uno.con"; "cic:/due.var"; "cic:/tre.con"; "cic:/quattro.con"; - "cic:/cinque.var"] - in - List.iter prerr_endline uris - with MatitaGtkMisc.Cancel -> MatitaTypes.error "no choice"); addDebugItem "toggle auto disambiguation" (fun _ -> Helm_registry.set_bool "matita.auto_disambiguation" (not (Helm_registry.get_bool "matita.auto_disambiguation"))); - addDebugItem "mono line text input" (fun _ -> - prerr_endline (ask_text ~gui ~title:"title" ~msg:"message" ())); - addDebugItem "multi line text input" (fun _ -> - prerr_endline - (ask_text ~gui ~title:"title" ~multiline:true ~msg:"message" ())); addDebugItem "dump proof status to stdout" (fun _ -> - print_endline ((get_proof ())#toString)); + 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) end (** *) let _ = +(* CicEnvironment.set_trust (fun _ -> false); *) (try load_script Sys.argv.(1) with Invalid_argument _ -> ()); + gui#console#show (); GtkThread.main ()