X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteDisambiguate.ml;h=9950b4eb747ded55b256995bd108313d2a9da7ba;hb=63e7ef727ce32552106c4d8f3030fd264532fffe;hp=2b66594c9477003c292980e5e175c804775d06d4;hpb=bd05377dd2aa36fbbb7edd34726918dab8dd9792;p=helm.git diff --git a/helm/software/components/grafite_parser/grafiteDisambiguate.ml b/helm/software/components/grafite_parser/grafiteDisambiguate.ml index 2b66594c9..9950b4eb7 100644 --- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml +++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml @@ -45,12 +45,80 @@ let singleton msg = function in HLog.debug debug; assert false +let __Implicit = "__Implicit__" +let __Closed_Implicit = "__Closed_Implicit__" -let lookup_in_library interactive_user_uri_choice input_or_locate_uri item = +let cic_mk_choice = function + | LexiconAst.Symbol_alias (name, _, dsc) -> + if name = __Implicit then + dsc, `Sym_interp (fun _ -> Cic.Implicit None) + else if name = __Closed_Implicit then + dsc, `Sym_interp (fun _ -> Cic.Implicit (Some `Closed)) + else + DisambiguateChoices.cic_lookup_symbol_by_dsc name dsc + | LexiconAst.Number_alias (_, dsc) -> + DisambiguateChoices.lookup_num_by_dsc dsc + | LexiconAst.Ident_alias (name, uri) -> + uri, `Sym_interp + (fun l->assert(l = []);CicUtil.term_of_uri (UriManager.uri_of_string uri)) +;; + +let ncic_mk_choice = function + | LexiconAst.Symbol_alias (name, _, dsc) -> + if name = __Implicit then + dsc, `Sym_interp (fun _ -> NCic.Implicit `Term) + else if name = __Closed_Implicit then + dsc, `Sym_interp (fun _ -> NCic.Implicit `Closed) + else + DisambiguateChoices.lookup_symbol_by_dsc + ~mk_implicit:(function + | true -> NCic.Implicit `Closed + | false -> NCic.Implicit `Term) + ~mk_appl:(function + (NCic.Appl l)::tl -> NCic.Appl (l@tl) | l -> NCic.Appl l) + ~term_of_uri:(fun uri -> + fst (OCic2NCic.convert_term uri (CicUtil.term_of_uri uri))) + name dsc + | LexiconAst.Number_alias (_, dsc) -> + let desc,f = DisambiguateChoices.lookup_num_by_dsc dsc in + desc, `Num_interp + (fun num -> + fst (OCic2NCic.convert_term + (UriManager.uri_of_string "cic:/xxx/x.con") + (match f with `Num_interp f -> f num | _ -> assert false))) + | LexiconAst.Ident_alias (name, uri) -> + uri, `Sym_interp + (fun l->assert(l = []); + let uri = UriManager.uri_of_string uri in + fst (OCic2NCic.convert_term uri (CicUtil.term_of_uri uri))) +;; + + +let mk_implicit b = + match b with + | false -> + LexiconAst.Symbol_alias (__Implicit,-1,"Fake Implicit") + | true -> + LexiconAst.Symbol_alias (__Closed_Implicit,-1,"Fake Closed Implicit") +;; + +let lookup_in_library + interactive_user_uri_choice input_or_locate_uri item += + let mk_ident_alias id u = + LexiconAst.Ident_alias (id,UriManager.string_of_uri u) + in + let mk_num_alias instance = + List.map + (fun dsc,_ -> LexiconAst.Number_alias (instance,dsc)) + (DisambiguateChoices.lookup_num_choices()) + in + let mk_symbol_alias symb ino (dsc, _,_) = + LexiconAst.Symbol_alias (symb,ino,dsc) + in let dbd = LibraryDb.instance () in let choices_of_id id = let uris = Whelp.locate ~dbd id in - let uris = match uris with | [] -> (match @@ -70,29 +138,18 @@ let lookup_in_library interactive_user_uri_choice input_or_locate_uri item = "\". Please, choose one or more interpretations:") ~id uris - in - List.map - (fun uri -> - (UriManager.string_of_uri uri, - let term = - try - CicUtil.term_of_uri uri - with exn -> - assert false - in - fun _ _ _ -> term)) - uris in match item with - | DisambiguateTypes.Id id -> choices_of_id id - | DisambiguateTypes.Symbol (symb, _) -> + | DisambiguateTypes.Id id -> + let uris = choices_of_id id in + List.map (mk_ident_alias id) uris + | DisambiguateTypes.Symbol (symb, ino) -> (try - List.map DisambiguateChoices.mk_choice + List.map (mk_symbol_alias symb ino) (TermAcicContent.lookup_interpretations symb) with TermAcicContent.Interpretation_not_found -> []) - | DisambiguateTypes.Num instance -> - DisambiguateChoices.lookup_num_choices () + | DisambiguateTypes.Num instance -> mk_num_alias instance ;; (** @param term not meaningful when context is given *) @@ -101,10 +158,13 @@ term = let lexicon_status = !lexicon_status_ref in let (diff, metasenv, subst, cic, _) = singleton "first" - (GrafiteDisambiguator.disambiguate_term + (CicDisambiguate.disambiguate_term ~aliases:lexicon_status.LexiconEngine.aliases ?goal ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) ~lookup_in_library + ~mk_choice:cic_mk_choice + ~mk_implicit + ~description_of_alias:LexiconAst.description_of_alias ~context ~metasenv ~subst:[] (text,prefix_len,term)) in let lexicon_status = LexiconEngine.set_proof_aliases lexicon_status diff in @@ -122,7 +182,11 @@ let disambiguate_lazy_term goal text prefix_len lexicon_status_ref term = let lexicon_status = !lexicon_status_ref in let (diff, metasenv, _, cic, ugraph) = singleton "second" - (GrafiteDisambiguator.disambiguate_term ~lookup_in_library + (CicDisambiguate.disambiguate_term + ~lookup_in_library + ~mk_choice:cic_mk_choice + ~mk_implicit + ~description_of_alias:LexiconAst.description_of_alias ~initial_ugraph:ugraph ~aliases:lexicon_status.LexiconEngine.aliases ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) ~context ~metasenv ~subst:[] ?goal @@ -135,7 +199,7 @@ let disambiguate_lazy_term goal text prefix_len lexicon_status_ref term = let disambiguate_pattern text prefix_len lexicon_status_ref (wanted, hyp_paths, goal_path) = - let interp path = Disambiguate.interpretate_path [] path in + let interp path =CicDisambiguate.interpretate_path [] path in let goal_path = HExtlib.map_option interp goal_path in let hyp_paths = List.map (fun (name, path) -> name, interp path) hyp_paths in let wanted = @@ -495,7 +559,6 @@ let rec disambiguate_tactic | `Proof as t -> metasenv,t in metasenv,GrafiteAst.RewritingStep (loc, cic, cic', cic'', cont) - let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = let uri = match obj with @@ -507,30 +570,55 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = | None -> raise BaseUriNotSetYet) | CicNotationPt.Inductive _ -> assert false | CicNotationPt.Theorem _ -> None in - (match obj with + (* + (let time = Unix.gettimeofday () in + prerr_endline "INIZIO NUOVA DISAMBIGUAZIONE"; + (match obj with CicNotationPt.Theorem (_,_,ty,_) -> (try - let [_,_,_,ty],_ = - NGrafiteDisambiguator.disambiguate_term + (match + NCicDisambiguate.disambiguate_term + ~lookup_in_library:lookup_in_library + ~description_of_alias:LexiconAst.description_of_alias + ~mk_choice:ncic_mk_choice + ~mk_implicit + ~coercion_db:(NCicCoercion.db ()) ~context:[] ~metasenv:[] ~subst:[] - ~aliases:DisambiguateTypes.Environment.empty - ~universe:(Some DisambiguateTypes.Environment.empty) - ("",0,ty) - in - prerr_endline ("NUOVA DISAMBIGUAZIONE OK!!!!!!!!! " ^ - NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] ty) - with NGrafiteDisambiguator.DisambiguationError _ -> - prerr_endline "ERRORE NUOVA DISAMBIGUAZIONE"; -(* assert false *) - | exn -> ()) - | _ -> () - ); + ~aliases:lexicon_status.LexiconEngine.aliases + ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) + (text,prefix_len,ty) + with + | [_,metasenv,subst,ty],_ -> + let time = Unix.gettimeofday () -. time in + prerr_endline ("NUOVA DISAMBIGUAZIONE OK: "^ string_of_float time); + prerr_endline (NCicPp.ppterm ~metasenv ~subst ~context:[] ty) + | _ -> + prerr_endline ("NUOVA DISAMBIGUAZIONE AMBIGUO!!!!!!!!! ")) + with + | MultiPassDisambiguator.DisambiguationError (_,s) -> + prerr_endline ("ERRORE NUOVA DISAMBIGUAZIONE:\n" ^ + String.concat "\n" + (List.map (fun _,_,x,_ -> snd (Lazy.force x)) (List.flatten s))) +(* | exn -> prerr_endline (Printexc.to_string exn) *) + ) + | _ -> ()) + ); + let time = Unix.gettimeofday () in + *) let (diff, metasenv, _, cic, _) = singleton "third" - (GrafiteDisambiguator.disambiguate_obj ~lookup_in_library + (CicDisambiguate.disambiguate_obj + ~lookup_in_library + ~mk_choice:cic_mk_choice + ~mk_implicit + ~description_of_alias:LexiconAst.description_of_alias ~aliases:lexicon_status.LexiconEngine.aliases ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) ~uri (text,prefix_len,obj)) in +(* + let time = Unix.gettimeofday () -. time in + prerr_endline ("VECCHIA DISAMBIGUAZIONE: " ^ string_of_float time); +*) let lexicon_status = LexiconEngine.set_proof_aliases lexicon_status diff in lexicon_status, metasenv, cic