X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fmatita.ml;h=cd3fe798253830c9df78ed1d63523fed8096a58c;hb=779859f7a9e317e378d258897c289f447adea7ad;hp=64d1a4513ebed04a6c7fa8427aa8094a9f4b3da3;hpb=f75a636a0f3d548bcf485df9b51ac72ed4759c97;p=helm.git diff --git a/helm/software/matita/matita.ml b/helm/software/matita/matita.ml index 64d1a4513..cd3fe7982 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,12 +81,19 @@ 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; (try @@ -97,7 +106,22 @@ let _ = sequents_viewer#goto_sequent 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 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; @@ -117,8 +141,19 @@ let _ = 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 - HLog.debug (DisambiguatePp.pp_environment status.LexiconEngine.aliases)); + 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; @@ -147,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)); @@ -168,27 +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 _,_,_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 _ -> @@ -234,9 +271,9 @@ let _ = *) 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" @@ -265,7 +302,7 @@ let _ = "(" ^ string_of_int saturations ^ ")") ul)) ^ ":" ^ CoercDb.string_of_carr s ^ " -> " ^ CoercDb.string_of_carr t)) - (CoercDb.to_list ())); + (CoercDb.to_list (CoercDb.dump ()))); addDebugSeparator (); let mview () = (MatitaMathView.sequentsViewer_instance ())#cicMathView in (* addDebugItem "save (sequent) MathML to matita.xml" @@ -273,8 +310,9 @@ let _ = ~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); + addDebugSeparator (); + addDebugItem "Expand virtuals" + (fun _ -> (MatitaScript.current ())#expandAllVirtuals); end (** Debugging }}} *) @@ -295,7 +333,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]