X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteDisambiguate.ml;h=c1fd03af2225403f5fd3d5204f8a1525cdd34f88;hb=5c30190ffa401334eb2fa9fab0be7db0de26a458;hp=58666eed5b43a6b217d9f000b00784408ff3a15a;hpb=9a9c5b863f68367119450ae7b806d454ba1265e3;p=helm.git diff --git a/helm/software/components/grafite_parser/grafiteDisambiguate.ml b/helm/software/components/grafite_parser/grafiteDisambiguate.ml index 58666eed5..c1fd03af2 100644 --- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml +++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml @@ -45,21 +45,6 @@ let singleton msg = function in HLog.debug debug; assert false -(* -let cic_codomain_of_uri uri = - (UriManager.string_of_uri uri, - let term = - try - CicUtil.term_of_uri uri - with exn -> - assert false - in - fun _ _ _ -> term) -;; -*) - -(*let cic_num_choices = DisambiguateChoices.lookup_num_choices;;*) - let __Implicit = "__Implicit__" let __Closed_Implicit = "__Closed_Implicit__" @@ -78,7 +63,38 @@ let cic_mk_choice = function (fun l->assert(l = []);CicUtil.term_of_uri (UriManager.uri_of_string uri)) ;; -let cic_mk_implicit b = +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") @@ -86,28 +102,6 @@ let cic_mk_implicit b = LexiconAst.Symbol_alias (__Closed_Implicit,-1,"Fake Closed Implicit") ;; -let ncic_codomain_of_uri uri = - (UriManager.string_of_uri uri, - let term = - try - fst (OCic2NCic.convert_term uri (CicUtil.term_of_uri uri)) - with exn -> - assert false - in - fun _ _ _ -> term) -;; - -let ncic_num_choices _ = (*assert false*) [];; -let ncic_mk_choice = - DisambiguateChoices.mk_choice - ~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))) -;; - let lookup_in_library interactive_user_uri_choice input_or_locate_uri item = @@ -169,7 +163,7 @@ term = ?goal ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) ~lookup_in_library ~mk_choice:cic_mk_choice - ~mk_implicit:cic_mk_implicit + ~mk_implicit ~description_of_alias:LexiconAst.description_of_alias ~context ~metasenv ~subst:[] (text,prefix_len,term)) in @@ -191,7 +185,7 @@ let disambiguate_lazy_term goal text prefix_len lexicon_status_ref term = (CicDisambiguate.disambiguate_term ~lookup_in_library ~mk_choice:cic_mk_choice - ~mk_implicit:cic_mk_implicit + ~mk_implicit ~description_of_alias:LexiconAst.description_of_alias ~initial_ugraph:ugraph ~aliases:lexicon_status.LexiconEngine.aliases ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) @@ -576,22 +570,62 @@ 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 try_new cic = + (NCicLibrary.clear_cache (); + NCicEnvironment.invalidate (); + OCic2NCic.clear (); + (match obj with CicNotationPt.Theorem (_,_,ty,_) -> + let graph = + match cic with + | Cic.CurrentProof (_,metasenv, _, ty,_,_) -> + let _, ugraph = + CicTypeChecker.type_of_aux' metasenv [] ty CicUniv.empty_ugraph + in + ugraph + | Cic.Constant (_,_, ty,_,_) -> + let _, ugraph = + CicTypeChecker.type_of_aux' [] [] ty CicUniv.empty_ugraph + in + ugraph + | _ -> CicUniv.empty_ugraph + in +(* + let _,l = CicUniv.do_rank graph in + List.iter (fun k -> + prerr_endline (CicUniv.string_of_universe k ^ " = " ^ string_of_int + (CicUniv.get_rank k))) l; +*) + let graph = + List.fold_left + (fun graph (_,_,l) -> + List.fold_left + (fun graph (uri,_,_) -> + let _,g = CicTypeChecker.typecheck uri in + CicUniv.merge_ugraphs ~base_ugraph:graph ~increment:(g,uri)) + graph l) + graph (CoercDb.to_list ()) + in + ignore(CicUniv.do_rank graph); + prerr_endline "INIZIO NUOVA DISAMBIGUAZIONE"; + let time = Unix.gettimeofday () in (try (match NCicDisambiguate.disambiguate_term - ~lookup_in_library:(lookup_in_library ncic_codomain_of_uri - ncic_mk_choice ncic_num_choices) + ~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) + ~aliases:lexicon_status.LexiconEngine.aliases + ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) (text,prefix_len,ty) with | [_,metasenv,subst,ty],_ -> - prerr_endline ("NUOVA DISAMBIGUAZIONE OK!!!!!!!!! " ^ - NCicPp.ppterm ~metasenv ~subst ~context:[] 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 @@ -601,21 +635,45 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = (List.map (fun _,_,x,_ -> snd (Lazy.force x)) (List.flatten s))) (* | exn -> prerr_endline (Printexc.to_string exn) *) ) - | _ -> () - ); + | _ -> ()) + ) + in + +(* + try + let time = Unix.gettimeofday () in *) + let (diff, metasenv, _, cic, _) = singleton "third" (CicDisambiguate.disambiguate_obj ~lookup_in_library ~mk_choice:cic_mk_choice - ~mk_implicit:cic_mk_implicit + ~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); + try_new cic; +*) + + let lexicon_status = LexiconEngine.set_proof_aliases lexicon_status diff in lexicon_status, metasenv, cic + +(* + with + | Sys.Break as exn -> raise exn + | exn -> + try_new (Cic.InductiveDefinition ([],[],0,[])); + raise exn +*) + +;; let disambiguate_command lexicon_status ?baseuri metasenv (text,prefix_len,cmd)= match cmd with @@ -638,6 +696,12 @@ let disambiguate_command lexicon_status ?baseuri metasenv (text,prefix_len,cmd)= disambiguate_term None text prefix_len lexicon_status_ref [] in let metasenv,t = disambiguate_term metasenv t in !lexicon_status_ref, metasenv, GrafiteAst.Coercion (loc,t,b,a,s) + | GrafiteAst.UnificationHint (loc, t) -> + let lexicon_status_ref = ref lexicon_status in + let disambiguate_term = + disambiguate_term None text prefix_len lexicon_status_ref [] in + let metasenv,t = disambiguate_term metasenv t in + !lexicon_status_ref, metasenv, GrafiteAst.UnificationHint (loc,t) | GrafiteAst.Default _ | GrafiteAst.Drop _ | GrafiteAst.Include _