X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fmatita.ml;h=1bfdf8ce372c49ab9cf93afa6a2ffd1c26ab8577;hb=ddd6560f4e70ec3306d223738a441d5f1dd3eac9;hp=dc0aa579db5975ccbd4fab189c1f6de071b27929;hpb=3f676ab6acafa32514a44bc84d287f44dbc5389e;p=helm.git diff --git a/helm/software/matita/matita.ml b/helm/software/matita/matita.ml index dc0aa579d..1bfdf8ce3 100644 --- a/helm/software/matita/matita.ml +++ b/helm/software/matita/matita.ml @@ -65,9 +65,10 @@ let script = (fun ~title ~message -> MatitaGtkMisc.ask_confirmation ~title ~message ~parent:gui#main#toplevel ()) - ~develcreator:gui#createDevelopment () in + Predefined_virtuals.load_predefined_virtuals (); + Predefined_virtuals.load_predefined_classes (); gui#sourceView#source_buffer#begin_not_undoable_action (); s#reset (); s#template (); @@ -80,14 +81,21 @@ let _ = let sequents_viewer = MatitaMathView.sequentsViewer_instance () in sequents_viewer#load_logo; cic_math_view#set_href_callback - (Some (fun uri -> (MatitaMathView.cicBrowser ())#load - (`Uri (UriManager.uri_of_string uri)))); - let browser_observer _ _ = MatitaMathView.refresh_all_browsers () in - let sequents_observer _ grafite_status = + (Some (fun uri -> + let uri = + try + `Uri (UriManager.uri_of_string uri) + with + UriManager.IllFormedUri _ -> + `NRef (NReference.reference_of_string uri) + in + (MatitaMathView.cicBrowser ())#load uri)); + let browser_observer _ = MatitaMathView.refresh_all_browsers () in + let sequents_observer grafite_status = sequents_viewer#reset; - match grafite_status.proof_status with + match grafite_status#proof_status with | Incomplete_proof ({ stack = stack } as incomplete_proof) -> - sequents_viewer#load_sequents incomplete_proof; + sequents_viewer#load_sequents grafite_status incomplete_proof; (try script#setGoal (Some (Continuationals.Stack.find_goal stack)); let goal = @@ -95,10 +103,25 @@ let _ = None -> assert false | Some n -> n in - sequents_viewer#goto_sequent goal + sequents_viewer#goto_sequent grafite_status goal with Failure _ -> script#setGoal None); | Proof proof -> sequents_viewer#load_logo_with_qed - | No_proof -> sequents_viewer#load_logo + | No_proof -> + (match grafite_status#ng_mode with + `ProofMode -> + sequents_viewer#nload_sequents grafite_status; + (try + script#setGoal + (Some (Continuationals.Stack.find_goal grafite_status#stack)); + let goal = + match script#goal with + None -> assert false + | Some n -> n + in + sequents_viewer#goto_sequent grafite_status goal + with Failure _ -> script#setGoal None); + | `CommandMode -> sequents_viewer#load_logo + ) | Intermediate _ -> assert false (* only the engine may be in this state *) in script#addObserver sequents_observer; @@ -106,7 +129,9 @@ let _ = (** {{{ Debugging *) let _ = - if BuildTimeConf.debug then begin + if BuildTimeConf.debug || + Helm_registry.get_bool "matita.debug_menu" + then begin gui#main#debugMenu#misc#show (); let addDebugItem ~label callback = let item = @@ -115,6 +140,20 @@ let _ = let addDebugSeparator () = ignore (GMenu.separator_item ~packing:gui#main#debugMenu_menu#append ()) in + addDebugItem "dump aliases" (fun _ -> + let status = script#grafite_status in + LexiconEngine.dump_aliases HLog.debug "" status); +(* FG: DEBUGGING + addDebugItem "dump interpretations" (fun _ -> + let status = script#lexicon_status in + let filter = + List.filter (function LexiconAst.Interpretation _ -> true | _ -> false) + in + HLog.debug (String.concat "\n" + (List.fold_right + (fun x l -> (LexiconAstPp.pp_command x)::l) + (filter status.LexiconEngine.lexicon_content_rev) []))); +*) addDebugItem "dump environment to \"env.dump\"" (fun _ -> let oc = open_out "env.dump" in CicEnvironment.dump_to_channel oc; @@ -143,12 +182,12 @@ let _ = CicNotationParser.print_l2_pattern; addDebugItem "dump moo to stderr" (fun _ -> let grafite_status = (MatitaScript.current ())#grafite_status in - let moo = grafite_status.moo_content_rev in + let moo = grafite_status#moo_content_rev in List.iter (fun cmd -> prerr_endline (GrafiteAstPp.pp_command - ~term_pp:(fun _ -> assert false) + ~term_pp:(fun t -> CicPp.ppterm t) ~obj_pp:(fun _ -> assert false) cmd)) (List.rev moo)); @@ -164,25 +203,29 @@ let _ = HLog.debug (CicPp.ppterm (match - (MatitaScript.current ())#grafite_status.GrafiteTypes.proof_status + (MatitaScript.current ())#grafite_status#proof_status with | GrafiteTypes.No_proof -> (Cic.Implicit None) - | Incomplete_proof i -> let _,_,p,_, _ = i.GrafiteTypes.proof in p - | Proof p -> let _,_,p,_, _ = p in p + | Incomplete_proof i -> + let _,_,_subst,p,_, _ = i.GrafiteTypes.proof in + Lazy.force p + | Proof p -> let _,_,_subst,p,_, _ = p in Lazy.force p | Intermediate _ -> assert false))); addDebugItem "Print current proof (natural language) to stderr" (fun _ -> prerr_endline - (ApplyTransformation.txt_of_cic_object 120 GrafiteAst.Declarative "" + (ApplyTransformation.txt_of_cic_object 120 [] + ~map_unicode_to_tex:(Helm_registry.get_bool + "matita.paste_unicode_as_tex") (match - (MatitaScript.current ())#grafite_status.GrafiteTypes.proof_status + (MatitaScript.current ())#grafite_status#proof_status with | GrafiteTypes.No_proof -> assert false | Incomplete_proof i -> - let _,m,p,ty, attrs = i.GrafiteTypes.proof in - Cic.CurrentProof ("current (incomplete) proof",m,p,ty,[],attrs) - | Proof (_,m,p,ty, attrs) -> - Cic.CurrentProof ("current proof",m,p,ty,[],attrs) + let _,m,_subst,p,ty, attrs = i.GrafiteTypes.proof in + Cic.CurrentProof ("current (incomplete) proof",m,Lazy.force p,ty,[],attrs) + | Proof (_,m,_subst,p,ty, attrs) -> + Cic.CurrentProof ("current proof",m,Lazy.force p,ty,[],attrs) | Intermediate _ -> assert false))); (* addDebugItem "ask record choice" (fun _ -> @@ -218,22 +261,30 @@ let _ = (fun _ -> CicMetaSubst.use_low_level_ppterm_in_context := true); addDebugItem "enable high level pretty printer" (fun _ -> CicMetaSubst.use_low_level_ppterm_in_context := false); +(* ZACK moved to the View menu addDebugItem "disable all (pretty printing) notations" (fun _ -> CicNotation.set_active_notations []); addDebugItem "enable all (pretty printing) notations" (fun _ -> CicNotation.set_active_notations (List.map fst (CicNotation.get_all_notations ()))); +*) addDebugSeparator (); addDebugItem "enable multiple disambiguation passes (default)" - (fun _ -> GrafiteDisambiguator.only_one_pass := false); + (fun _ -> MultiPassDisambiguator.only_one_pass := false); addDebugItem "enable only one disambiguation pass" - (fun _ -> GrafiteDisambiguator.only_one_pass := true); + (fun _ -> MultiPassDisambiguator.only_one_pass := true); + addDebugItem "always show all disambiguation errors" + (fun _ -> MatitaGui.all_disambiguation_passes := true); + addDebugItem "prune disambiguation errors" + (fun _ -> MatitaGui.all_disambiguation_passes := false); addDebugSeparator (); +(* ZACK moved to the View menu addDebugItem "enable coercions hiding" (fun _ -> Acic2content.hide_coercions := true); addDebugItem "disable coercions hiding" (fun _ -> Acic2content.hide_coercions := false); +*) addDebugItem "show coercions graph" (fun _ -> let c = MatitaMathView.cicBrowser () in c#load (`About `Coercions)); @@ -244,9 +295,14 @@ let _ = List.iter (fun (s,t,ul) -> HLog.debug - ((String.concat "," (List.map UriManager.name_of_uri ul)) ^ ":" - ^ CoercDb.name_of_carr s ^ " -> " ^ CoercDb.name_of_carr t)) - (CoercDb.to_list ())); + ((String.concat "," + (List.map + (fun u,saturations,_ -> + UriManager.name_of_uri u ^ + "(" ^ string_of_int saturations ^ ")") + ul)) ^ ":" + ^ CoercDb.string_of_carr s ^ " -> " ^ CoercDb.string_of_carr t)) + (CoercDb.to_list (CoercDb.dump ()))); addDebugSeparator (); let mview () = (MatitaMathView.sequentsViewer_instance ())#cicMathView in (* addDebugItem "save (sequent) MathML to matita.xml" @@ -254,49 +310,31 @@ let _ = ~doc:(HExtlib.unopt (mview ())#get_document) ~name:"matita.xml" ())); *) addDebugItem "load (sequent) MathML from matita.xml" (fun _ -> (mview ())#load_uri ~filename:"matita.xml"); + addDebugSeparator (); + addDebugItem "Expand virtuals" + (fun _ -> (MatitaScript.current ())#expandAllVirtuals); end (** Debugging }}} *) - (** {2 Command line parsing} *) - -let set_matita_mode () = - let matita_mode = - if Filename.basename Sys.argv.(0) = "cicbrowser" || - Filename.basename Sys.argv.(0) = "cicbrowser.opt" - then "cicbrowser" - else "matita" - in - Helm_registry.set "matita.mode" matita_mode - (** {2 Main} *) let _ = - set_matita_mode (); at_exit (fun () -> print_endline "\nThanks for using Matita!\n"); Sys.catch_break true; let args = Helm_registry.get_list Helm_registry.string "matita.args" in - if Helm_registry.get "matita.mode" = "cicbrowser" then (* cicbrowser *) - let browser = MatitaMathView.cicBrowser () in - let uri = match args with [] -> "cic:/" | _ -> String.concat " " args in - browser#loadInput uri - else begin (* matita *) - (try gui#loadScript (List.hd args) with Failure _ -> ()); - gui#main#mainWin#show (); - end; + (try gui#loadScript (List.hd args) with Failure _ -> ()); + gui#main#mainWin#show (); try - GtkThread.main () + GtkThread.main () with Sys.Break -> Sys.set_signal Sys.sigint (Sys.Signal_handle (fun _ -> prerr_endline "Still cleaning the library: don't be impatient!")); prerr_endline "Matita is cleaning up. Please wait."; - try - let baseuri = - GrafiteTypes.get_string_option - (MatitaScript.current ())#grafite_status "baseuri" - in + let baseuri = + (MatitaScript.current ())#grafite_status#baseuri + in LibraryClean.clean_baseuris [baseuri] - with GrafiteTypes.Option_error _ -> () (* vim:set foldmethod=marker: *)