X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteDisambiguate.ml;h=64c4c8ebe9e2d84043224b891aee6ca861575804;hb=134d8273511016e9b6de3423d301a080046f3948;hp=027cde4a599d090787e1e2d86661577444df8e8f;hpb=b225178112c2c5ef1a717ac7e647d854d94b2e52;p=helm.git diff --git a/helm/software/components/grafite_parser/grafiteDisambiguate.ml b/helm/software/components/grafite_parser/grafiteDisambiguate.ml index 027cde4a5..64c4c8ebe 100644 --- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml +++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml @@ -78,6 +78,7 @@ let ncic_mk_choice = 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))) + ~term_of_nref:(fun nref -> NCic.Const nref) name dsc | LexiconAst.Number_alias (_, dsc) -> let desc,f = DisambiguateChoices.lookup_num_by_dsc dsc in @@ -89,8 +90,13 @@ let ncic_mk_choice = function | 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))) + try + let nref = NReference.reference_of_string uri in + NCic.Const nref + with + NReference.IllFormedReference _ -> + let uri = UriManager.uri_of_string uri in + fst (OCic2NCic.convert_term uri (CicUtil.term_of_uri uri))) ;; @@ -152,6 +158,23 @@ let lookup_in_library | DisambiguateTypes.Num instance -> mk_num_alias instance ;; +let nlookup_in_library + interactive_user_uri_choice input_or_locate_uri item += + match item with + | DisambiguateTypes.Id id -> + (try + let references = NCicLibrary.resolve id in + List.map + (fun u -> LexiconAst.Ident_alias (id,NReference.string_of_reference u) + ) references @ + lookup_in_library interactive_user_uri_choice input_or_locate_uri item + with + NCicEnvironment.ObjectNotFound _ -> + lookup_in_library interactive_user_uri_choice input_or_locate_uri item) + | _ -> lookup_in_library interactive_user_uri_choice input_or_locate_uri item +;; + (** @param term not meaningful when context is given *) let disambiguate_term expty text prefix_len lexicon_status_ref context metasenv term = @@ -172,23 +195,24 @@ term = metasenv,(*subst,*) cic ;; -let disambiguate_nterm expty lexicon_status context metasenv subst thing +let disambiguate_nterm expty estatus context metasenv subst thing = let diff, metasenv, subst, cic = singleton "first" (NCicDisambiguate.disambiguate_term - ~coercion_db:(NCicCoercion.db ()) - ~aliases:lexicon_status.LexiconEngine.aliases + ~rdb:estatus.NEstatus.rstatus.NRstatus.refiner_status + ~aliases:estatus.NEstatus.lstatus.LexiconEngine.aliases ~expty - ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) - ~lookup_in_library + ~universe:(Some estatus.NEstatus.lstatus.LexiconEngine.multi_aliases) + ~lookup_in_library:nlookup_in_library ~mk_choice:ncic_mk_choice ~mk_implicit ~description_of_alias:LexiconAst.description_of_alias ~context ~metasenv ~subst thing) in - let lexicon_status = LexiconEngine.set_proof_aliases lexicon_status diff in - metasenv, subst, lexicon_status, cic + let lexicon_status = + LexiconEngine.set_proof_aliases estatus.NEstatus.lstatus diff in + metasenv, subst, { estatus with NEstatus.lstatus = lexicon_status }, cic ;; @@ -234,6 +258,20 @@ let disambiguate_pattern (wanted, hyp_paths, goal_path) ;; +type pattern = + CicNotationPt.term Disambiguate.disambiguator_input option * + (string * NCic.term) list * NCic.term option + +let disambiguate_npattern (text, prefix_len, (wanted, hyp_paths, goal_path)) = + let interp path = NCicDisambiguate.disambiguate_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 = + match wanted with None -> None | Some x -> Some (text,prefix_len,x) + in + (wanted, hyp_paths, goal_path) +;; + let disambiguate_reduction_kind text prefix_len lexicon_status_ref = function | `Unfold (Some t) -> let t = @@ -582,7 +620,7 @@ 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 disambiguate_obj estatus ?baseuri metasenv (text,prefix_len,obj) = let uri = let baseuri = match baseuri with Some x -> x | None -> raise BaseUriNotSetYet @@ -631,7 +669,7 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = let _,g = CicTypeChecker.typecheck uri in CicUniv.merge_ugraphs ~base_ugraph:graph ~increment:(g,uri)) graph l) - graph (CoercDb.to_list ()) + graph (CoercDb.to_list (CoercDb.dump ())) in ignore(CicUniv.do_rank graph); @@ -650,14 +688,14 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = (try (match NCicDisambiguate.disambiguate_obj - ~lookup_in_library:lookup_in_library + ~rdb:estatus.NEstatus.rstatus.NRstatus.refiner_status + ~lookup_in_library:nlookup_in_library ~description_of_alias:LexiconAst.description_of_alias ~mk_choice:ncic_mk_choice ~mk_implicit ~uri:(OCic2NCic.nuri_of_ouri uri) - ~coercion_db:(NCicCoercion.db ()) - ~aliases:lexicon_status.LexiconEngine.aliases - ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) + ~aliases:estatus.NEstatus.lstatus.LexiconEngine.aliases + ~universe:(Some estatus.NEstatus.lstatus.LexiconEngine.multi_aliases) (text,prefix_len,obj) with | [_,_,_,obj],_ -> @@ -690,6 +728,7 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = (* let time = Unix.gettimeofday () in *) + let lexicon_status = estatus.NEstatus.lstatus in let (diff, metasenv, _, cic, _) = singleton "third" (CicDisambiguate.disambiguate_obj @@ -700,7 +739,8 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = ~aliases:lexicon_status.LexiconEngine.aliases ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) ~uri:(Some uri) - (text,prefix_len,obj)) in + (text,prefix_len,obj)) + in (* @@ -712,21 +752,51 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = let lexicon_status = LexiconEngine.set_proof_aliases lexicon_status diff in - lexicon_status, metasenv, cic + { estatus with NEstatus.lstatus = lexicon_status }, metasenv, cic with | Sys.Break as exn -> raise exn | exn -> (* try_new None; *) raise exn +;; +let disambiguate_nobj estatus ?baseuri (text,prefix_len,obj) = + let uri = + let baseuri = + match baseuri with Some x -> x | None -> raise BaseUriNotSetYet + in + let name = + match obj with + | CicNotationPt.Inductive (_,(name,_,_,_)::_) + | CicNotationPt.Record (_,name,_,_) -> name ^ ".ind" + | CicNotationPt.Theorem (_,name,_,_) -> name ^ ".con" + | CicNotationPt.Inductive _ -> assert false + in + UriManager.uri_of_string (baseuri ^ "/" ^ name) + in + let diff, _, _, cic = + singleton "third" + (NCicDisambiguate.disambiguate_obj + ~lookup_in_library:nlookup_in_library + ~description_of_alias:LexiconAst.description_of_alias + ~mk_choice:ncic_mk_choice + ~mk_implicit + ~uri:(OCic2NCic.nuri_of_ouri uri) + ~rdb:estatus.NEstatus.rstatus.NRstatus.refiner_status + ~aliases:estatus.NEstatus.lstatus.LexiconEngine.aliases + ~universe:(Some estatus.NEstatus.lstatus.LexiconEngine.multi_aliases) + (text,prefix_len,obj)) in + let lexicon_status = + LexiconEngine.set_proof_aliases estatus.NEstatus.lstatus diff in + { estatus with NEstatus.lstatus = lexicon_status }, cic ;; -let disambiguate_command lexicon_status ?baseuri metasenv (text,prefix_len,cmd)= +let disambiguate_command estatus ?baseuri metasenv (text,prefix_len,cmd)= match cmd with - | GrafiteAst.NObj(loc,obj) -> lexicon_status, metasenv, GrafiteAst.NObj(loc,obj) + | GrafiteAst.NObj(loc,obj) -> estatus, metasenv, GrafiteAst.NObj(loc,obj) | GrafiteAst.Index(loc,key,uri) -> - let lexicon_status_ref = ref lexicon_status in + let lexicon_status_ref = ref estatus.NEstatus.lstatus in let disambiguate_term = disambiguate_term None text prefix_len lexicon_status_ref [] in let disambiguate_term_option metasenv = @@ -737,38 +807,55 @@ let disambiguate_command lexicon_status ?baseuri metasenv (text,prefix_len,cmd)= metasenv, Some t in let metasenv,key = disambiguate_term_option metasenv key in - !lexicon_status_ref, metasenv,GrafiteAst.Index(loc,key,uri) + { estatus with NEstatus.lstatus = !lexicon_status_ref }, + metasenv,GrafiteAst.Index(loc,key,uri) + | GrafiteAst.Select (loc,uri) -> + estatus, metasenv, GrafiteAst.Select(loc,uri) + | GrafiteAst.Pump(loc,i) -> + estatus, metasenv, GrafiteAst.Pump(loc,i) | GrafiteAst.PreferCoercion (loc,t) -> - let lexicon_status_ref = ref lexicon_status in + let lexicon_status_ref = ref estatus.NEstatus.lstatus 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.PreferCoercion (loc,t) + { estatus with NEstatus.lstatus = !lexicon_status_ref}, + metasenv, GrafiteAst.PreferCoercion (loc,t) | GrafiteAst.Coercion (loc,t,b,a,s) -> - let lexicon_status_ref = ref lexicon_status in + let lexicon_status_ref = ref estatus.NEstatus.lstatus 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.Coercion (loc,t,b,a,s) + { estatus with NEstatus.lstatus = !lexicon_status_ref }, + metasenv, GrafiteAst.Coercion (loc,t,b,a,s) + | GrafiteAst.Inverter (loc,n,indty,params) -> + let lexicon_status_ref = ref estatus.NEstatus.lstatus in + let disambiguate_term = + disambiguate_term None text prefix_len lexicon_status_ref [] in + let metasenv,indty = disambiguate_term metasenv indty in + { estatus with NEstatus.lstatus = !lexicon_status_ref }, + metasenv, GrafiteAst.Inverter (loc,n,indty,params) | GrafiteAst.UnificationHint (loc, t, n) -> - let lexicon_status_ref = ref lexicon_status in + let lexicon_status_ref = ref estatus.NEstatus.lstatus 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,n) + { estatus with NEstatus.lstatus = !lexicon_status_ref }, + metasenv, GrafiteAst.UnificationHint (loc,t,n) | GrafiteAst.Default _ | GrafiteAst.Drop _ | GrafiteAst.Include _ | GrafiteAst.Print _ | GrafiteAst.Qed _ + | GrafiteAst.NQed _ + | GrafiteAst.NUnivConstraint _ | GrafiteAst.Set _ as cmd -> - lexicon_status,metasenv,cmd + estatus,metasenv,cmd | GrafiteAst.Obj (loc,obj) -> - let lexicon_status,metasenv,obj = - disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj)in - lexicon_status, metasenv, GrafiteAst.Obj (loc,obj) + let estatus,metasenv,obj = + disambiguate_obj estatus ?baseuri metasenv (text,prefix_len,obj)in + estatus, metasenv, GrafiteAst.Obj (loc,obj) | GrafiteAst.Relation (loc,id,a,aeq,refl,sym,trans) -> - let lexicon_status_ref = ref lexicon_status in + let lexicon_status_ref = ref estatus.NEstatus.lstatus in let disambiguate_term = disambiguate_term None text prefix_len lexicon_status_ref [] in let disambiguate_term_option metasenv = @@ -783,7 +870,7 @@ let disambiguate_command lexicon_status ?baseuri metasenv (text,prefix_len,cmd)= let metasenv,refl = disambiguate_term_option metasenv refl in let metasenv,sym = disambiguate_term_option metasenv sym in let metasenv,trans = disambiguate_term_option metasenv trans in - !lexicon_status_ref, metasenv, + { estatus with NEstatus.lstatus = !lexicon_status_ref }, metasenv, GrafiteAst.Relation (loc,id,a,aeq,refl,sym,trans) let disambiguate_macro