X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteDisambiguate.ml;h=65371bc67a85f85ee8a29f30901442ad3857f7c8;hb=36014ac060f150e7d93f607c914a0b06239715c0;hp=9a4cb472d75517b3742b956a3b2a2ec9c0580d28;hpb=6809084b2a99a1a7e64d87ca939118f77c07b8b5;p=helm.git diff --git a/helm/software/components/grafite_parser/grafiteDisambiguate.ml b/helm/software/components/grafite_parser/grafiteDisambiguate.ml index 9a4cb472d..65371bc67 100644 --- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml +++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml @@ -328,16 +328,16 @@ let disambiguate_tactic let metasenv,cic = match term1 with None -> metasenv,None - | Some t -> + | Some (start,t) -> let metasenv,t = disambiguate_term context metasenv t in - metasenv,Some t in + metasenv,Some (start,t) in let metasenv,cic'= disambiguate_term context metasenv term2 in let metasenv,cic'' = match term3 with - None -> metasenv,None - | Some t -> + `Auto _ as t -> metasenv,t + | `Term t -> let metasenv,t = disambiguate_term context metasenv t in - metasenv,Some t in + metasenv,`Term t in metasenv,GrafiteAst.RewritingStep (loc, cic, cic', cic'', cont) @@ -363,6 +363,19 @@ let disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj) = let disambiguate_command lexicon_status ~baseuri metasenv (text,prefix_len,cmd)= match cmd with + | GrafiteAst.Index(loc,key,uri) -> + let lexicon_status_ref = ref lexicon_status in + let disambiguate_term = + disambiguate_term text prefix_len lexicon_status_ref [] in + let disambiguate_term_option metasenv = + function + None -> metasenv,None + | Some t -> + let metasenv,t = disambiguate_term metasenv t in + metasenv, Some t + in + let metasenv,key = disambiguate_term_option metasenv key in + !lexicon_status_ref, metasenv,GrafiteAst.Index(loc,key,uri) | GrafiteAst.Coercion _ | GrafiteAst.Default _ | GrafiteAst.Drop _