X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fmatita.ml;h=4fdc704e220a8593610a18635bf9f72a37304e23;hb=50a9ed8c6207145fccf59e6a5dbbff935cd2c6d7;hp=64d1a4513ebed04a6c7fa8427aa8094a9f4b3da3;hpb=f75a636a0f3d548bcf485df9b51ac72ed4759c97;p=helm.git diff --git a/helm/software/matita/matita.ml b/helm/software/matita/matita.ml index 64d1a4513..4fdc704e2 100644 --- a/helm/software/matita/matita.ml +++ b/helm/software/matita/matita.ml @@ -67,6 +67,8 @@ let script = ~parent:gui#main#toplevel ()) () in + Predefined_virtuals.load_predefined_virtuals (); + Predefined_virtuals.load_predefined_classes (); gui#sourceView#source_buffer#begin_not_undoable_action (); s#reset (); s#template (); @@ -79,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 = @@ -94,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; @@ -109,53 +133,35 @@ let _ = Helm_registry.get_bool "matita.debug_menu" then begin gui#main#debugMenu#misc#show (); - let addDebugItem ~label callback = + let addDebugItem label callback = let item = GMenu.menu_item ~packing:gui#main#debugMenu_menu#append ~label () in - ignore (item#connect#activate callback) in + ignore (item#connect#activate callback) + in + let addDebugCheckbox label ?(init=false) callback = + let item = + GMenu.check_menu_item + ~packing:gui#main#debugMenu_menu#append ~label () in + item#set_active init; + ignore (item#connect#toggled (callback item)) + in 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 prerr_endline "" status); +(* FG: DEBUGGING + addDebugItem "dump interpretations" (fun _ -> let status = script#lexicon_status in - HLog.debug (DisambiguatePp.pp_environment status.LexiconEngine.aliases)); - addDebugItem "dump environment to \"env.dump\"" (fun _ -> - let oc = open_out "env.dump" in - CicEnvironment.dump_to_channel oc; - close_out oc); - addDebugItem "load environment from \"env.dump\"" (fun _ -> - let ic = open_in "env.dump" in - CicEnvironment.restore_from_channel ic; - close_in ic); - addDebugItem "dump universes" (fun _ -> - List.iter (fun (u,_,g) -> - prerr_endline (UriManager.string_of_uri u); - CicUniv.print_ugraph g) (CicEnvironment.list_obj ()) - ); - addDebugItem "dump environment content" (fun _ -> - List.iter (fun (u,_,_) -> - prerr_endline (UriManager.string_of_uri u)) - (CicEnvironment.list_obj ())); - addDebugItem "dump script status" script#dump; - addDebugItem "dump configuration file to ./foo.conf.xml" (fun _ -> - Helm_registry.save_to "./foo.conf.xml"); - addDebugItem "dump metasenv" - (fun _ -> - if script#onGoingProof () then - HLog.debug (CicMetaSubst.ppmetasenv [] script#proofMetasenv)); - addDebugItem "print top-level grammar entries" - 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 - List.iter - (fun cmd -> - prerr_endline - (GrafiteAstPp.pp_command - ~term_pp:(fun _ -> assert false) - ~obj_pp:(fun _ -> assert false) - cmd)) - (List.rev moo)); + 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 "print metasenv goals and stack to stderr" (fun _ -> prerr_endline ("metasenv goals: " ^ String.concat " " @@ -168,113 +174,53 @@ 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 _,_,_subst,p,_, _ = i.GrafiteTypes.proof in p - | Proof p -> let _,_,_subst,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,_subst,p,ty, attrs = i.GrafiteTypes.proof in - Cic.CurrentProof ("current (incomplete) proof",m,p,ty,[],attrs) + Cic.CurrentProof ("current (incomplete) proof",m,Lazy.force p,ty,[],attrs) | Proof (_,m,_subst,p,ty, attrs) -> - Cic.CurrentProof ("current proof",m,p,ty,[],attrs) + Cic.CurrentProof ("current proof",m,Lazy.force p,ty,[],attrs) | Intermediate _ -> assert false))); -(* addDebugItem "ask record choice" - (fun _ -> - HLog.debug (string_of_int - (MatitaGtkMisc.ask_record_choice ~gui ~title:"title" ~message:"msg" - ~fields:["a"; "b"; "c"] - ~records:[ - ["0"; "0"; "0"]; ["0"; "0"; "1"]; ["0"; "1"; "0"]; ["0"; "1"; "1"]; - ["1"; "0"; "0"]; ["1"; "0"; "1"]; ["1"; "1"; "0"]; ["1"; "1"; "1"]] - ()))); *) -(* addDebugItem "rotate light bulbs" - (fun _ -> - let nb = gui#main#hintNotebook in - nb#goto_page ((nb#current_page + 1) mod 3)); *) - addDebugSeparator (); -(* - addDebugItem "meets between L and R" - (fun _ -> - let l = CoercDb.coerc_carr_of_term (CicUtil.term_of_uri - (UriManager.uri_of_string "cic:/matita/test/L.ind#xpointer(1/1)" )) - in - let r = CoercDb.coerc_carr_of_term (CicUtil.term_of_uri - (UriManager.uri_of_string "cic:/matita/test/R.ind#xpointer(1/1)" )) - in - let meets = CoercGraph.meets l r in - prerr_endline "MEETS:"; - List.iter (fun carr -> prerr_endline (CicPp.ppterm (CoercDb.term_of_carr - carr))) meets - ); addDebugSeparator (); -*) - addDebugItem "disable high level pretty printer" - (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 ()))); -*) + addDebugCheckbox "high level pretty printer" ~init:true + (fun mi () -> CicMetaSubst.use_low_level_ppterm_in_context := mi#active); addDebugSeparator (); - addDebugItem "enable multiple disambiguation passes (default)" - (fun _ -> GrafiteDisambiguator.only_one_pass := false); - addDebugItem "enable only one disambiguation pass" - (fun _ -> GrafiteDisambiguator.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)); - addDebugItem "show coercions graph (full)" (fun _ -> - let c = MatitaMathView.cicBrowser () in - c#load (`About `CoercionsFull)); - addDebugItem "dump coercions Db" (fun _ -> - List.iter - (fun (s,t,ul) -> - HLog.debug - ((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 ())); + addDebugCheckbox "multiple disambiguation passes" ~init:true + (fun mi () -> MultiPassDisambiguator.only_one_pass := mi#active); + addDebugCheckbox "tactics logging" + (fun mi () -> NTacStatus.debug := mi#active); + addDebugCheckbox "auto logging" + (fun mi () -> NAuto.debug := mi#active); + addDebugCheckbox "disambiguation/refiner/unification/metasubst logging" + (fun mi () -> NCicRefiner.debug := mi#active; NCicUnification.debug := + mi#active; MultiPassDisambiguator.debug := mi#active; NCicMetaSubst.debug := mi#active); + addDebugCheckbox "reduction logging" + (fun mi () -> NCicReduction.debug := mi#active; CicReduction.ndebug := mi#active); addDebugSeparator (); - let mview () = (MatitaMathView.sequentsViewer_instance ())#cicMathView in -(* addDebugItem "save (sequent) MathML to matita.xml" - (fun _ -> ignore ((Gdome.domImplementation ())#saveDocumentToFile - ~doc:(HExtlib.unopt (mview ())#get_document) ~name:"matita.xml" ())); *) - addDebugItem "load (sequent) MathML from matita.xml" - (fun _ -> (mview ())#load_uri ~filename:"matita.xml"); - addDebugItem "autoWin" - (fun _ -> MatitaAutoGui.auto_dialog Auto.get_auto_status); + addDebugItem "Expand virtuals" + (fun _ -> (MatitaScript.current ())#expandAllVirtuals); end (** Debugging }}} *) @@ -295,7 +241,7 @@ let _ = prerr_endline "Still cleaning the library: don't be impatient!")); prerr_endline "Matita is cleaning up. Please wait."; let baseuri = - GrafiteTypes.get_baseuri (MatitaScript.current ())#grafite_status + (MatitaScript.current ())#grafite_status#baseuri in LibraryClean.clean_baseuris [baseuri]