X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2FgTopLevel.ml;h=b6aa28caea1655e9569d1274188be940841580e5;hb=a84be8db90f3f27148074c22d80b21a2dcf58576;hp=197b6f1ee305b6db4d121934f19f228bd8d57795;hpb=f36273550bc0538ea194cf0dee32ec608a6790f7;p=helm.git diff --git a/helm/gTopLevel/gTopLevel.ml b/helm/gTopLevel/gTopLevel.ml index 197b6f1ee..b6aa28cae 100644 --- a/helm/gTopLevel/gTopLevel.ml +++ b/helm/gTopLevel/gTopLevel.ml @@ -40,15 +40,12 @@ let warning s = prerr_endline ("W: " ^ s) open Printf -(* DEBUGGING *) - module MQI = MQueryInterpreter module MQIC = MQIConn module MQGT = MQGTypes module MQGU = MQGUtil module MQG = MQueryGenerator - (* first of all let's initialize the Helm_registry *) let _ = let configuration_file = "gTopLevel.conf.xml" in @@ -61,8 +58,14 @@ let _ = (* GLOBAL CONSTANTS *) -let mqi_debug_fun s = debug_print ~level:2 s -let mqi_handle = MQIC.init ~log:mqi_debug_fun () +let mqi_handle = MQIC.init_if_connected () + +let dbd = + Mysql.quick_connect + ~host:(Helm_registry.get "db.host") + ~user:(Helm_registry.get "db.user") + ~database:(Helm_registry.get "db.database") + () let xlinkns = Gdome.domString "http://www.w3.org/1999/xlink";; @@ -120,35 +123,6 @@ let argspec = in Arg.parse argspec ignore "" -(* MISC FUNCTIONS *) - -let term_of_cic_textual_parser_uri uri = - let module C = Cic in - let module CTP = CicTextualParser0 in - match uri with - CTP.ConUri uri -> C.Const (uri,[]) - | CTP.VarUri uri -> C.Var (uri,[]) - | CTP.IndTyUri (uri,tyno) -> C.MutInd (uri,tyno,[]) - | CTP.IndConUri (uri,tyno,consno) -> C.MutConstruct (uri,tyno,consno,[]) -;; - -let string_of_cic_textual_parser_uri uri = - let module C = Cic in - let module CTP = CicTextualParser0 in - let uri' = - match uri with - CTP.ConUri uri -> UriManager.string_of_uri uri - | CTP.VarUri uri -> UriManager.string_of_uri uri - | CTP.IndTyUri (uri,tyno) -> - UriManager.string_of_uri uri ^ "#1/" ^ string_of_int (tyno + 1) - | CTP.IndConUri (uri,tyno,consno) -> - UriManager.string_of_uri uri ^ "#1/" ^ string_of_int (tyno + 1) ^ "/" ^ - string_of_int consno - in - (* 4 = String.length "cic:" *) - String.sub uri' 4 (String.length uri' - 4) -;; - (* UTILITY FUNCTIONS TO DISAMBIGUATE AN URI *) (* Check window *) @@ -175,10 +149,7 @@ let check_window uris = ~mml_of_cic_sequent:ChosenTransformer.mml_of_cic_sequent ~packing:scrolled_window#add ~width:400 ~height:280 () in let expr = - let term = - term_of_cic_textual_parser_uri - (MQueryMisc.cic_textual_parser_uri_of_string uri) - in + let term = CicUtil.term_of_uri uri in (Cic.Cast (term, CicTypeChecker.type_of_aux' [] [] term)) in try @@ -536,9 +507,9 @@ let decompose_uris_choice_callback uris = let module U = UriManager in List.map (function uri -> - match MQueryMisc.cic_textual_parser_uri_of_string uri with - CicTextualParser0.IndTyUri (uri,typeno) -> (uri,typeno,[]) - | _ -> assert false) + match CicUtil.term_of_uri uri with + | Cic.MutInd (uri, typeno, _) -> (uri, typeno, []) + | _ -> assert false) (interactive_user_uri_choice ~selection_mode:`MULTIPLE ~ok:"Ok" ~enable_button_for_non_vars:false ~title:"Decompose" ~msg:"Please, select the Inductive Types to decompose" @@ -636,7 +607,10 @@ let refresh_goals ?(empty_notebook=true) notebook = begin notebook#set_current_page ~may_skip_switch_page_event:true metano ; - notebook#proofw#load_sequent metasenv currentsequent +prerr_endline "CIAO CIAO" ; +prerr_endline ("SEQUENTE CORRENTE: " ^ SequentPp.TextualPp.print_sequent currentsequent) ; + notebook#proofw#load_sequent metasenv currentsequent ; +prerr_endline "pASSO CIAO CIAO" end with e -> @@ -676,6 +650,7 @@ module InvokeTacticsCallbacks = let decompose_uris_choice_callback = decompose_uris_choice_callback let mk_fresh_name_callback = mk_fresh_name_callback let mqi_handle = mqi_handle + let dbd = dbd end ;; module InvokeTactics' = InvokeTactics.Make (InvokeTacticsCallbacks);; @@ -939,21 +914,12 @@ let user_uri_choice ~title ~msg uris = ;; let locate_callback id = - let query = MQG.locate id in - let result = MQI.execute mqi_handle query in - let uris = - List.map - (function uri,_ -> - MQueryMisc.wrong_xpointer_format_from_wrong_xpointer_format' uri) - result in - HelmLogger.log (`Msg (`T "Locate Query:")) ; - MQueryUtil.text_of_query (fun m -> HelmLogger.log (`Msg (`T m))) "" query; + let uris = MetadataQuery.locate ~dbd id in + HelmLogger.log (`Msg (`T ("Locate Query: " ^ id))) ; HelmLogger.log (`Msg (`T "Result:")) ; - MQueryUtil.text_of_result (fun m -> HelmLogger.log (`Msg (`T m))) "" result; + List.iter (fun uri -> HelmLogger.log (`Msg (`T uri))) uris; user_uri_choice ~title:"Ambiguous input." - ~msg: - ("Ambiguous input \"" ^ id ^ - "\". Please, choose one interpetation:") + ~msg:(sprintf "Ambiguous input \"%s\". Please, choose one interpetation:" id) uris ;; @@ -1007,7 +973,7 @@ let input_or_locate_uri ~title = HelmLogger.log (`Msg (`T "OK")) ; true with - Http_getter_types.Unresolvable_URI _ -> + Http_getter_types.Key_not_found _ -> HelmLogger.log (`Error (`T ("URI " ^ uri ^ " does not correspond to any object."))) ; @@ -1190,7 +1156,7 @@ let new_inductive () = try ignore (Http_getter.resolve' uri) ; raise UriAlreadyInUse - with Http_getter_types.Unresolvable_URI _ -> + with Http_getter_types.Key_not_found _ -> get_uri := (function () -> uri) ; get_names := (function () -> names) ; inductive := inductiveb#active ; @@ -1220,7 +1186,7 @@ let new_inductive () = ~packing:(vbox#pack ~expand:true ~padding:0) () in let newinputt = TermEditor'.term_editor - mqi_handle + ~dbd ~width:400 ~height:20 ~packing:scrolled_window#add ~share_environment_with:inputt () ~isnotempty_callback: @@ -1332,7 +1298,7 @@ let new_inductive () = ~packing:(vbox#pack ~expand:true ~padding:0) () in let newinputt = TermEditor'.term_editor - mqi_handle + ~dbd ~width:400 ~height:20 ~packing:scrolled_window#add ~share_environment_with:inputt () ~isnotempty_callback: @@ -1478,7 +1444,7 @@ let new_proof () = (* moved here to have visibility of the ok button *) let newinputt = TermEditor'.term_editor - mqi_handle + ~dbd ~width:400 ~height:100 ~packing:scrolled_window#add ~share_environment_with:inputt () ~isnotempty_callback: @@ -1511,7 +1477,7 @@ let new_proof () = try ignore (Http_getter.resolve' uri) ; raise UriAlreadyInUse - with Http_getter_types.Unresolvable_URI _ -> + with Http_getter_types.Key_not_found _ -> get_metasenv_and_term := (function () -> metasenv,parsed) ; get_uri := (function () -> uri) ; window#destroy () @@ -1665,16 +1631,13 @@ let show_query_results results = (clist#connect#select_row (fun ~row ~column ~event -> let (uristr,_) = List.nth results row in - match - MQueryMisc.cic_textual_parser_uri_of_string - (MQueryMisc.wrong_xpointer_format_from_wrong_xpointer_format' - uristr) - with - CicTextualParser0.ConUri uri - | CicTextualParser0.VarUri uri - | CicTextualParser0.IndTyUri (uri,_) - | CicTextualParser0.IndConUri (uri,_,_) -> + match CicUtil.term_of_uri uristr with + | Cic.Const (uri, _) + | Cic.Var (uri, _) + | Cic.MutInd (uri, _, _) + | Cic.MutConstruct (uri, _, _, _) -> show_in_show_window_uri uri + | _ -> assert false ) ) ; window#show () @@ -2092,10 +2055,7 @@ let searchPattern () = match !ProofEngine.goal with | None -> () | Some metano -> - let uris' = - TacticChaser.matchConclusion mqi_handle - ~choose_must () (proof, metano) - in + let uris' = List.map fst (MetadataQuery.hint ~dbd (proof, metano)) in let uri' = user_uri_choice ~title:"Ambiguous input." ~msg: "Many lemmas can be successfully applied. Please, choose one:" @@ -2824,7 +2784,7 @@ class rendering_window output (notebook : notebook) = ~packing:frame#add () in let inputt = TermEditor'.term_editor - mqi_handle + ~dbd ~width:400 ~height:100 ~packing:scrolled_window1#add () ~isnotempty_callback: (function b -> @@ -2869,13 +2829,16 @@ end (* MAIN *) let initialize_everything () = +prerr_endline "STO PER CREARE LA PROOF WINDOW" ; let output = TermViewer.proof_viewer ~mml_of_cic_object:ChosenTransformer.mml_of_cic_object ~width:350 ~height:280 () in +prerr_endline "CREATA" ; let notebook = new notebook in let rendering_window' = new rendering_window output notebook in +prerr_endline "OK" ; rendering_window'#set_auto_disambiguation !auto_disambiguation; set_rendering_window rendering_window'; let print_error_as_html prefix msg = @@ -2893,6 +2856,7 @@ let initialize_everything () = ;; let main () = +prerr_endline "CIAO" ; ignore (GtkMain.Main.init ()) ; initialize_everything () ; MQIC.close mqi_handle;