X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fcic_disambiguation%2Fdisambiguate.ml;h=9d42899c6895fffeeb3366f210c7dd6a3fbbe2f4;hb=8d58fba703fcb1cfddd2a78a0b157a087bcf2a5b;hp=3d671cd7fd62b5b4fa800559dd80fb79b34a2939;hpb=b6f67d53a7772e7872356412fd470ca5b92e2bdb;p=helm.git diff --git a/helm/software/components/cic_disambiguation/disambiguate.ml b/helm/software/components/cic_disambiguation/disambiguate.ml index 3d671cd7f..9d42899c6 100644 --- a/helm/software/components/cic_disambiguation/disambiguate.ml +++ b/helm/software/components/cic_disambiguation/disambiguate.ml @@ -37,7 +37,7 @@ exception NoWellTypedInterpretation of int * ((Stdpp.location list * string * string) list * (DisambiguateTypes.domain_item * DisambiguateTypes.codomain_item) list * - Stdpp.location option * string Lazy.t * bool) list + (Stdpp.location * string) Lazy.t * bool) list exception PathNotWellFormed (** raised when an environment is not enough informative to decide *) @@ -103,58 +103,61 @@ let descr_of_domain_item = function | Symbol (s, _) -> s | Num i -> string_of_int i -type 'a test_result = - | Ok of 'a * Cic.metasenv - | Ko of Stdpp.location option * string Lazy.t - | Uncertain of Stdpp.location option * string Lazy.t +type ('term,'metasenv,'subst,'graph) test_result = + | Ok of 'term * 'metasenv * 'subst * 'graph + | Ko of (Stdpp.location * string) Lazy.t + | Uncertain of (Stdpp.location * string) Lazy.t -let refine_term metasenv context uri term ugraph ~localization_tbl = +let refine_term metasenv subst context uri term ugraph ~localization_tbl = (* if benchmark then incr actual_refinements; *) assert (uri=None); debug_print (lazy (sprintf "TEST_INTERPRETATION: %s" (CicPp.ppterm term))); try let term', _, metasenv',ugraph1 = CicRefine.type_of_aux' metasenv context term ugraph ~localization_tbl in - (Ok (term', metasenv')),ugraph1 + (Ok (term', metasenv',[],ugraph1)) with exn -> let rec process_exn loc = function - HExtlib.Localized (loc,exn) -> process_exn (Some loc) exn + HExtlib.Localized (loc,exn) -> process_exn loc exn | CicRefine.Uncertain msg -> debug_print (lazy ("UNCERTAIN!!! [" ^ (Lazy.force msg) ^ "] " ^ CicPp.ppterm term)) ; - Uncertain (loc,msg),ugraph + Uncertain (lazy (loc,Lazy.force msg)) | CicRefine.RefineFailure msg -> debug_print (lazy (sprintf "PRUNED!!!\nterm%s\nmessage:%s" (CicPp.ppterm term) (Lazy.force msg))); - Ko (loc,msg),ugraph + Ko (lazy (loc,Lazy.force msg)) | exn -> raise exn in - process_exn None exn + process_exn Stdpp.dummy_loc exn -let refine_obj metasenv context uri obj ugraph ~localization_tbl = - assert (context = []); +let refine_obj metasenv subst context uri obj ugraph ~localization_tbl = + assert (context = []); + assert (metasenv = []); + assert (subst = []); debug_print (lazy (sprintf "TEST_INTERPRETATION: %s" (CicPp.ppobj obj))) ; try let obj', metasenv,ugraph = - CicRefine.typecheck metasenv uri obj ~localization_tbl + CicRefine.typecheck metasenv uri obj ~localization_tbl in - (Ok (obj', metasenv)),ugraph + (Ok (obj', metasenv,[],ugraph)) with exn -> let rec process_exn loc = function - HExtlib.Localized (loc,exn) -> process_exn (Some loc) exn + HExtlib.Localized (loc,exn) -> process_exn loc exn | CicRefine.Uncertain msg -> - debug_print (lazy ("UNCERTAIN!!! [" ^ (Lazy.force msg) ^ "] " ^ CicPp.ppobj obj)) ; - Uncertain (loc,msg),ugraph + debug_print (lazy ("UNCERTAIN!!! [" ^ + (Lazy.force msg) ^ "] " ^ CicPp.ppobj obj)) ; + Uncertain (lazy (loc,Lazy.force msg)) | CicRefine.RefineFailure msg -> debug_print (lazy (sprintf "PRUNED!!!\nterm%s\nmessage:%s" (CicPp.ppobj obj) (Lazy.force msg))) ; - Ko (loc,msg),ugraph + Ko (lazy (loc,Lazy.force msg)) | exn -> raise exn in - process_exn None exn + process_exn Stdpp.dummy_loc exn let resolve (env: codomain_item Environment.t) (item: domain_item) ?(num = "") ?(args = []) () = try @@ -172,12 +175,12 @@ let find_in_context name context = in aux 1 context -let interpretate_term ?(create_dummy_ids=false) ~(context: Cic.name list) ~env ~uri ~is_path ast +let interpretate_term ?(create_dummy_ids=false) ~context ~env ~uri ~is_path ast ~localization_tbl = (* create_dummy_ids shouldbe used only for interpretating patterns *) assert (uri = None); - let rec aux ~localize loc (context: Cic.name list) = function + let rec aux ~localize loc context = function | CicNotationPt.AttributedTerm (`Loc loc, term) -> let res = aux ~localize loc context term in if localize then Cic.CicHash.add localization_tbl res loc; @@ -203,18 +206,18 @@ let interpretate_term ?(create_dummy_ids=false) ~(context: Cic.name list) ~env ~ let cic_term = aux ~localize loc context term in let cic_outtype = aux_option ~localize loc context None outtype in let do_branch ((head, _, args), term) = - let rec do_branch' context = function - | [] -> aux ~localize loc context term - | (name, typ) :: tl -> - let cic_name = CicNotationUtil.cic_name_of_name name in - let cic_body = do_branch' (cic_name :: context) tl in - let typ = - match typ with - | None -> Cic.Implicit (Some `Type) - | Some typ -> aux ~localize loc context typ - in - Cic.Lambda (cic_name, typ, cic_body) - in + let rec do_branch' context = function + | [] -> aux ~localize loc context term + | (name, typ) :: tl -> + let cic_name = CicNotationUtil.cic_name_of_name name in + let cic_body = do_branch' (cic_name :: context) tl in + let typ = + match typ with + | None -> Cic.Implicit (Some `Type) + | Some typ -> aux ~localize loc context typ + in + Cic.Lambda (cic_name, typ, cic_body) + in do_branch' context args in let indtype_uri, indtype_no = @@ -231,12 +234,13 @@ let interpretate_term ?(create_dummy_ids=false) ~(context: Cic.name list) ~env ~ | _ -> raise (Invalid_choice (Some loc, lazy "The type of the term to be matched is not (co)inductive!"))) | None -> - let fst_constructor = - match branches with - | ((head, _, _), _) :: _ -> head - | [] -> raise (Invalid_choice (Some loc, lazy "The type of the term to be matched is an inductive type without constructors that cannot be determined")) + let rec fst_constructor = + function + (Ast.Pattern (head, _, _), _) :: _ -> head + | (Ast.Wildcard, _) :: tl -> fst_constructor tl + | [] -> raise (Invalid_choice (Some loc, lazy "The type of the term to be matched cannot be determined because it is an inductive type without constructors or because all patterns use wildcards")) in - (match resolve env (Id fst_constructor) () with + (match resolve env (Id (fst_constructor branches)) () with | Cic.MutConstruct (indtype_uri, indtype_no, _, _) -> (indtype_uri, indtype_no) | Cic.Implicit _ -> @@ -246,7 +250,15 @@ let interpretate_term ?(create_dummy_ids=false) ~(context: Cic.name list) ~env ~ raise (Invalid_choice (Some loc, lazy "The type of the term to be matched is not (co)inductive!"))) in let branches = - match fst(CicEnvironment.get_obj CicUniv.empty_ugraph indtype_uri) with + if create_dummy_ids then + List.map + (function + Ast.Wildcard,term -> ("wildcard",None,[]), term + | Ast.Pattern _,_ -> + raise (Invalid_choice (Some loc, lazy "Syntax error: the left hand side of a branch patterns must be \"_\"")) + ) branches + else + match fst(CicEnvironment.get_obj CicUniv.oblivion_ugraph indtype_uri) with Cic.InductiveDefinition (il,_,leftsno,_) -> let _,_,_,cl = try @@ -261,14 +273,31 @@ let interpretate_term ?(create_dummy_ids=false) ~(context: Cic.name list) ~env ~ let rec sort branches cl = match cl with [] -> - if branches = [] then [] - else - raise (Invalid_choice - (Some loc, - lazy - ("Unrecognized constructors: " ^ - String.concat " " - (List.map (fun ((head,_,_),_) -> head) branches)))) + let rec analyze unused unrecognized useless = + function + [] -> + if unrecognized != [] then + raise (Invalid_choice + (Some loc, + lazy + ("Unrecognized constructors: " ^ + String.concat " " unrecognized))) + else if useless > 0 then + raise (Invalid_choice + (Some loc, + lazy + ("The last " ^ string_of_int useless ^ + "case" ^ if useless > 1 then "s are" else " is" ^ + " unused"))) + else + [] + | (Ast.Wildcard,_)::tl when not unused -> + analyze true unrecognized useless tl + | (Ast.Pattern (head,_,_),_)::tl when not unused -> + analyze unused (head::unrecognized) useless tl + | _::tl -> analyze unused unrecognized (useless + 1) tl + in + analyze false [] 0 branches | (name,ty)::cltl -> let rec find_and_remove = function @@ -276,21 +305,36 @@ let interpretate_term ?(create_dummy_ids=false) ~(context: Cic.name list) ~env ~ raise (Invalid_choice (Some loc, lazy ("Missing case: " ^ name))) - | ((name',_,_),_) as branch :: tl when name = name' -> - branch,tl + | ((Ast.Wildcard, _) as branch :: _) as branches -> + branch, branches + | (Ast.Pattern (name',_,_),_) as branch :: tl + when name = name' -> + branch,tl | branch::tl -> let found,rest = find_and_remove tl in found, branch::rest in let branch,tl = find_and_remove branches in - let (_,_,args),_ = branch in - if List.length args = count_prod ty - leftsno then - branch::sort tl cltl - else - raise - (Invalid_choice - (Some loc, - lazy ("Wrong number of arguments for " ^ name))) + match branch with + Ast.Pattern (name,y,args),term -> + if List.length args = count_prod ty - leftsno then + ((name,y,args),term)::sort tl cltl + else + raise + (Invalid_choice + (Some loc, + lazy ("Wrong number of arguments for " ^ name))) + | Ast.Wildcard,term -> + let rec mk_lambdas = + function + 0 -> term + | n -> + CicNotationPt.Binder + (`Lambda, (CicNotationPt.Ident ("_", None), None), + mk_lambdas (n - 1)) + in + (("wildcard",None,[]), + mk_lambdas (count_prod ty - leftsno)) :: sort tl cltl in sort branches cl | _ -> assert false @@ -304,13 +348,13 @@ let interpretate_term ?(create_dummy_ids=false) ~(context: Cic.name list) ~env ~ | CicNotationPt.LetIn ((name, typ), def, body) -> let cic_def = aux ~localize loc context def in let cic_name = CicNotationUtil.cic_name_of_name name in - let cic_def = + let cic_typ = match typ with - | None -> cic_def - | Some t -> Cic.Cast (cic_def, aux ~localize loc context t) + | None -> Cic.Implicit (Some `Type) + | Some t -> aux ~localize loc context t in let cic_body = aux ~localize loc (cic_name :: context) body in - Cic.LetIn (cic_name, cic_def, cic_body) + Cic.LetIn (cic_name, cic_def, cic_typ, cic_body) | CicNotationPt.LetRec (kind, defs, body) -> let context' = List.fold_left @@ -339,6 +383,8 @@ let interpretate_term ?(create_dummy_ids=false) ~(context: Cic.name list) ~env ~ if localize then match body with CicNotationPt.AttributedTerm (_,CicNotationPt.Appl(_::l)) -> + (* since we avoid the letin, the context has no + * recfuns in it *) let l' = List.map (aux ~localize loc context) l in `AvoidLetIn (n,l') | _ -> assert false @@ -390,9 +436,9 @@ let interpretate_term ?(create_dummy_ids=false) ~(context: Cic.name list) ~env ~ Cic.CoFix (n,coinductiveFuns) in let counter = ref ~-1 in - let build_term funs (var,_,_,_) t = + let build_term funs (var,_,ty,_) t = incr counter; - Cic.LetIn (Cic.Name var, fix_or_cofix !counter, t) + Cic.LetIn (Cic.Name var, fix_or_cofix !counter, ty, t) in (match cic_body with `AvoidLetInNoAppl n -> @@ -443,16 +489,16 @@ let interpretate_term ?(create_dummy_ids=false) ~(context: Cic.name list) ~env ~ (try match cic with | Cic.Const (uri, []) -> - let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + let o,_ = CicEnvironment.get_obj CicUniv.oblivion_ugraph uri in let uris = CicUtil.params_of_obj o in Cic.Const (uri, mk_subst uris) | Cic.Var (uri, []) -> - let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + let o,_ = CicEnvironment.get_obj CicUniv.oblivion_ugraph uri in let uris = CicUtil.params_of_obj o in Cic.Var (uri, mk_subst uris) | Cic.MutInd (uri, i, []) -> (try - let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + let o,_ = CicEnvironment.get_obj CicUniv.oblivion_ugraph uri in let uris = CicUtil.params_of_obj o in Cic.MutInd (uri, i, mk_subst uris) with @@ -465,7 +511,7 @@ let interpretate_term ?(create_dummy_ids=false) ~(context: Cic.name list) ~env ~ (*here the explicit_named_substituion is assumed to be of length 0 *) Cic.MutInd (uri,i,[])) | Cic.MutConstruct (uri, i, j, []) -> - let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + let o,_ = CicEnvironment.get_obj CicUniv.oblivion_ugraph uri in let uris = CicUtil.params_of_obj o in Cic.MutConstruct (uri, i, j, mk_subst uris) | Cic.Meta _ | Cic.Implicit _ as t -> @@ -499,11 +545,11 @@ let interpretate_term ?(create_dummy_ids=false) ~(context: Cic.name list) ~env ~ | CicNotationPt.Sort `Prop -> Cic.Sort Cic.Prop | CicNotationPt.Sort `Set -> Cic.Sort Cic.Set | CicNotationPt.Sort (`Type u) -> Cic.Sort (Cic.Type u) - | CicNotationPt.Sort `CProp -> Cic.Sort Cic.CProp + | CicNotationPt.Sort (`CProp u) -> Cic.Sort (Cic.CProp u) | CicNotationPt.Symbol (symbol, instance) -> resolve env (Symbol (symbol, instance)) () | _ -> assert false (* god bless Bologna *) - and aux_option ~localize loc (context: Cic.name list) annotation = function + and aux_option ~localize loc context annotation = function | None -> Cic.Implicit annotation | Some term -> aux ~localize loc context term in @@ -618,6 +664,16 @@ let interpretate_obj ~context ~env ~uri ~is_path obj ~localization_tbl = | Some bo,_ -> let bo' = Some (interpretate_term [] env None false bo) in Cic.Constant (name,bo',ty',[],attrs)) +;; + +let interpretate_term ?(create_dummy_ids=false) ~context ~env ~uri ~is_path ast + ~localization_tbl += + let context = List.map (function None -> Cic.Anonymous | Some (n,_) -> n) context in +interpretate_term ~create_dummy_ids ~context ~env ~uri ~is_path ast +~localization_tbl +;; + let rec domain_of_term ?(loc = HExtlib.dummy_floc) ~context = function | Ast.AttributedTerm (`Loc loc, term) -> @@ -684,20 +740,25 @@ let rec domain_of_term ?(loc = HExtlib.dummy_floc) ~context = function | Ast.Case (term, indty_ident, outtype, branches) -> let term_dom = domain_of_term ~loc ~context term in let outtype_dom = domain_of_term_option ~loc ~context outtype in - let get_first_constructor = function + let rec get_first_constructor = function | [] -> [] - | ((head, _, _), _) :: _ -> [ Node ([loc], Id head, []) ] in - let do_branch ((head, _, args), term) = - let (term_context, args_domain) = - List.fold_left - (fun (cont, dom) (name, typ) -> - (CicNotationUtil.cic_name_of_name name :: cont, - (match typ with - | None -> dom - | Some typ -> dom @ domain_of_term ~loc ~context:cont typ))) - (context, []) args - in - domain_of_term ~loc ~context:term_context term @ args_domain + | (Ast.Pattern (head, _, _), _) :: _ -> [ Node ([loc], Id head, []) ] + | _ :: tl -> get_first_constructor tl in + let do_branch = + function + Ast.Pattern (head, _, args), term -> + let (term_context, args_domain) = + List.fold_left + (fun (cont, dom) (name, typ) -> + (CicNotationUtil.cic_name_of_name name :: cont, + (match typ with + | None -> dom + | Some typ -> dom @ domain_of_term ~loc ~context:cont typ))) + (context, []) args + in + domain_of_term ~loc ~context:term_context term @ args_domain + | Ast.Wildcard, term -> + domain_of_term ~loc ~context term in let branches_dom = List.fold_left (fun dom branch -> dom @ do_branch branch) [] branches in @@ -739,6 +800,7 @@ let rec domain_of_term ?(loc = HExtlib.dummy_floc) ~context = function CicNotationUtil.cic_name_of_name var :: context, domain_of_term_option ~loc ~context ty @ res) (add_defs context,[]) params)) + @ dom @ domain_of_term_option ~loc ~context:context' typ @ domain_of_term ~loc ~context:context' body ) [] defs @@ -785,6 +847,7 @@ let domain_of_term ~context term = uniq_domain (domain_of_term ~context term) let domain_of_obj ~context ast = + let context = List.map (function None -> Cic.Anonymous | Some (n,_) -> n) context in assert (context = []); match ast with | Ast.Theorem (_,_,ty,bo) -> @@ -835,6 +898,14 @@ let domain_of_obj ~context ast = let domain_of_obj ~context obj = uniq_domain (domain_of_obj ~context obj) +let domain_of_ast_term = domain_of_term;; + +let domain_of_term ~context term = + let context = + List.map (function None -> Cic.Anonymous | Some (n,_) -> n) context + in + domain_of_term ~context term + (* dom1 \ dom2 *) let domain_diff dom1 dom2 = (* let domain_diff = Domain.diff *) @@ -862,17 +933,53 @@ let domain_diff dom1 dom2 = module type Disambiguator = sig + val disambiguate_thing: + dbd:HSql.dbd -> + context:'context -> + metasenv:'metasenv -> + subst:'subst -> + initial_ugraph:'ugraph -> + hint: ('metasenv -> 'raw_thing -> 'raw_thing) * + (('refined_thing,'metasenv,'subst,'ugraph) test_result -> + ('refined_thing,'metasenv,'subst,'ugraph) test_result) -> + aliases:DisambiguateTypes.codomain_item DisambiguateTypes.Environment.t -> + universe:DisambiguateTypes.codomain_item list + DisambiguateTypes.Environment.t option -> + uri:'uri -> + pp_thing:('ast_thing -> string) -> + domain_of_thing:(context:'context -> 'ast_thing -> domain) -> + interpretate_thing:(context:'context -> + env:DisambiguateTypes.codomain_item + DisambiguateTypes.Environment.t -> + uri:'uri -> + is_path:bool -> 'ast_thing -> localization_tbl:'cichash -> 'raw_thing) -> + refine_thing:('metasenv -> + 'subst -> + 'context -> + 'uri -> + 'raw_thing -> + 'ugraph -> localization_tbl:'cichash -> + ('refined_thing, 'metasenv,'subst,'ugraph) test_result) -> + localization_tbl:'cichash -> + string * int * 'ast_thing -> + ((DisambiguateTypes.Environment.key * DisambiguateTypes.codomain_item) + list * 'metasenv * 'subst * 'refined_thing * 'ugraph) + list * bool + val disambiguate_term : ?fresh_instances:bool -> dbd:HSql.dbd -> context:Cic.context -> - metasenv:Cic.metasenv -> + metasenv:Cic.metasenv -> + subst:Cic.substitution -> + ?goal:int -> ?initial_ugraph:CicUniv.universe_graph -> aliases:DisambiguateTypes.environment ->(* previous interpretation status *) universe:DisambiguateTypes.multiple_environment option -> CicNotationPt.term disambiguator_input -> ((DisambiguateTypes.domain_item * DisambiguateTypes.codomain_item) list * Cic.metasenv * (* new metasenv *) + Cic.substitution * Cic.term* CicUniv.universe_graph) list * (* disambiguated term *) bool @@ -886,6 +993,7 @@ sig CicNotationPt.term CicNotationPt.obj disambiguator_input -> ((DisambiguateTypes.domain_item * DisambiguateTypes.codomain_item) list * Cic.metasenv * (* new metasenv *) + Cic.substitution * Cic.obj * CicUniv.universe_graph) list * (* disambiguated obj *) bool @@ -929,19 +1037,16 @@ module Make (C: Callbacks) = let refine_profiler = HExtlib.profile "disambiguate_thing.refine_thing" - let disambiguate_thing ~dbd ~context ~metasenv - ?(initial_ugraph = CicUniv.empty_ugraph) ~aliases ~universe + let disambiguate_thing ~dbd ~context ~metasenv ~subst + ~initial_ugraph:base_univ ~hint + ~aliases ~universe ~uri ~pp_thing ~domain_of_thing ~interpretate_thing ~refine_thing + ~localization_tbl (thing_txt,thing_txt_prefix_len,thing) = debug_print (lazy "DISAMBIGUATE INPUT"); - let disambiguate_context = (* cic context -> disambiguate context *) - List.map - (function None -> Cic.Anonymous | Some (name, _) -> name) - context - in debug_print (lazy ("TERM IS: " ^ (pp_thing thing))); - let thing_dom = domain_of_thing ~context:disambiguate_context thing in + let thing_dom = domain_of_thing ~context thing in debug_print (lazy (sprintf "DISAMBIGUATION DOMAIN: %s"(string_of_domain thing_dom))); (* @@ -1027,36 +1132,39 @@ let refine_profiler = HExtlib.profile "disambiguate_thing.refine_thing" aux (aux env l) tl in let filled_env = aux aliases todo_dom in try - let localization_tbl = Cic.CicHash.create 503 in let cic_thing = - interpretate_thing ~context:disambiguate_context ~env:filled_env + interpretate_thing ~context ~env:filled_env ~uri ~is_path:false thing ~localization_tbl in + let cic_thing = (fst hint) metasenv cic_thing in let foo () = - let k,ugraph1 = - refine_thing metasenv context uri cic_thing ugraph ~localization_tbl + let k = + refine_thing metasenv subst + context uri cic_thing ugraph ~localization_tbl in - (k , ugraph1 ) + let k = (snd hint) k in + k in refine_profiler.HExtlib.profile foo () with - | Try_again msg -> Uncertain (None,msg), ugraph - | Invalid_choice (loc,msg) -> Ko (loc,msg), ugraph + | Try_again msg -> Uncertain (lazy (Stdpp.dummy_loc,Lazy.force msg)) + | Invalid_choice (None,msg) -> Ko(lazy (Stdpp.dummy_loc,Lazy.force msg)) + | Invalid_choice (Some loc,msg) -> Ko (lazy (loc,Lazy.force msg)) in (* (4) build all possible interpretations *) let (@@) (l1,l2,l3) (l1',l2',l3') = l1@l1', l2@l2', l3@l3' in (* aux returns triples Ok/Uncertain/Ko *) (* rem_dom is the concatenation of all the remainin domains *) - let rec aux aliases diff lookup_in_todo_dom todo_dom rem_dom base_univ = + let rec aux aliases diff lookup_in_todo_dom todo_dom rem_dom = debug_print (lazy ("ZZZ: " ^ string_of_domain todo_dom)); match todo_dom with | [] -> assert (lookup_in_todo_dom = None); (match test_env aliases rem_dom base_univ with - | Ok (thing, metasenv),new_univ -> - [ aliases, diff, metasenv, thing, new_univ ], [], [] - | Ko (loc,msg),_ -> [],[],[aliases,diff,loc,msg,true] - | Uncertain (loc,msg),new_univ -> - [],[aliases,diff,loc,msg,new_univ],[]) + | Ok (thing, metasenv,subst,new_univ) -> + [ aliases, diff, metasenv, subst, thing, new_univ ], [], [] + | Ko loc_msg -> [],[],[aliases,diff,loc_msg,true] + | Uncertain loc_msg -> + [],[aliases,diff,loc_msg],[]) | Node (locs,item,inner_dom) :: remaining_dom -> debug_print (lazy (sprintf "CHOOSED ITEM: %s" (string_of_domain_item item))); @@ -1067,8 +1175,9 @@ in refine_profiler.HExtlib.profile foo () match choices with [] -> [], [], - [aliases, diff, Some (List.hd locs), - lazy ("No choices for " ^ string_of_domain_item item), + [aliases, diff, + (lazy (List.hd locs, + "No choices for " ^ string_of_domain_item item)), true] (* | [codomain_item] -> @@ -1108,81 +1217,82 @@ in refine_profiler.HExtlib.profile foo () | _::_ -> let mark_not_significant failures = List.map - (fun (env, diff, loc, msg, _b) -> - env, diff, loc, msg, false) + (fun (env, diff, loc_msg, _b) -> + env, diff, loc_msg, false) failures in let classify_errors ((ok_l,uncertain_l,error_l) as outcome) = if ok_l <> [] || uncertain_l <> [] then ok_l,uncertain_l,mark_not_significant error_l else outcome in - let rec filter univ = function + let rec filter = function | [] -> [],[],[] | codomain_item :: tl -> debug_print(lazy (sprintf "%s CHOSEN" (fst codomain_item))); let new_env = Environment.add item codomain_item aliases in let new_diff = (item,codomain_item)::diff in (match - test_env new_env (inner_dom@remaining_dom@rem_dom) univ + test_env new_env + (inner_dom@remaining_dom@rem_dom) base_univ with - | Ok (thing, metasenv),new_univ -> + | Ok (thing, metasenv,subst,new_univ) -> let res = (match inner_dom with | [] -> - [new_env,new_diff,metasenv,thing,new_univ], [], [] + [new_env,new_diff,metasenv,subst,thing,new_univ], + [], [] | _ -> aux new_env new_diff None inner_dom - (remaining_dom@rem_dom) new_univ + (remaining_dom@rem_dom) ) in - res @@ filter univ tl - | Uncertain (loc,msg),new_univ -> + res @@ filter tl + | Uncertain loc_msg -> let res = (match inner_dom with - | [] -> [],[new_env,new_diff,loc,msg,new_univ],[] + | [] -> [],[new_env,new_diff,loc_msg],[] | _ -> aux new_env new_diff None inner_dom - (remaining_dom@rem_dom) new_univ + (remaining_dom@rem_dom) ) in - res @@ filter univ tl - | Ko (loc,msg),_ -> - let res = [],[],[new_env,new_diff,loc,msg,true] in - res @@ filter univ tl) + res @@ filter tl + | Ko loc_msg -> + let res = [],[],[new_env,new_diff,loc_msg,true] in + res @@ filter tl) in let ok_l,uncertain_l,error_l = - classify_errors (filter base_univ choices) + classify_errors (filter choices) in let res_after_ok_l = List.fold_right - (fun (env,diff,_,_,univ) res -> - aux env diff None remaining_dom rem_dom univ @@ res + (fun (env,diff,_,_,_,_) res -> + aux env diff None remaining_dom rem_dom @@ res ) ok_l ([],[],error_l) in List.fold_right - (fun (env,diff,_,_,univ) res -> - aux env diff None remaining_dom rem_dom univ @@ res + (fun (env,diff,_) res -> + aux env diff None remaining_dom rem_dom @@ res ) uncertain_l res_after_ok_l in - let aux' aliases diff lookup_in_todo_dom todo_dom base_univ = + let aux' aliases diff lookup_in_todo_dom todo_dom = match test_env aliases todo_dom base_univ with - | Ok _,_ - | Uncertain _,_ -> - aux aliases diff lookup_in_todo_dom todo_dom [] base_univ - | Ko (loc,msg),_ -> [],[],[aliases,diff,loc,msg,true] in - let base_univ = initial_ugraph in + | Ok _ + | Uncertain _ -> + aux aliases diff lookup_in_todo_dom todo_dom [] + | Ko (loc_msg) -> [],[],[aliases,diff,loc_msg,true] in try let res = - match aux' aliases [] None todo_dom base_univ with + match aux' aliases [] None todo_dom with | [],uncertain,errors -> let errors = List.map - (fun (env,diff,loc,msg,_) -> (env,diff,loc,msg,true) + (fun (env,diff,loc_msg) -> (env,diff,loc_msg,true) ) uncertain @ errors in let errors = List.map - (fun (env,diff,loc,msg,significant) -> + (fun (env,diff,loc_msg,significant) -> let env' = filter_map_domain (fun locs domain_item -> @@ -1195,19 +1305,19 @@ in refine_profiler.HExtlib.profile foo () Not_found -> None) thing_dom in - env',diff,loc,msg,significant + env',diff,loc_msg,significant ) errors in raise (NoWellTypedInterpretation (0,errors)) - | [_,diff,metasenv,t,ugraph],_,_ -> + | [_,diff,metasenv,subst,t,ugraph],_,_ -> debug_print (lazy "SINGLE INTERPRETATION"); - [diff,metasenv,t,ugraph], false + [diff,metasenv,subst,t,ugraph], false | l,_,_ -> debug_print (lazy (sprintf "MANY INTERPRETATIONS (%d)" (List.length l))); let choices = List.map - (fun (env, _, _, _, _) -> + (fun (env, _, _, _, _, _) -> map_domain (fun locs domain_item -> let description = @@ -1221,7 +1331,8 @@ in refine_profiler.HExtlib.profile foo () C.interactive_interpretation_choice thing_txt thing_txt_prefix_len choices in - (List.map (fun n->let _,d,m,t,u= List.nth l n in d,m,t,u) choosed), + (List.map (fun n->let _,d,m,s,t,u= List.nth l n in d,m,s,t,u) + choosed), true in res @@ -1229,18 +1340,37 @@ in refine_profiler.HExtlib.profile foo () CicEnvironment.CircularDependency s -> failwith "Disambiguate: circular dependency" - let disambiguate_term ?(fresh_instances=false) ~dbd ~context ~metasenv - ?(initial_ugraph = CicUniv.empty_ugraph) ~aliases ~universe + let disambiguate_term ?(fresh_instances=false) ~dbd ~context ~metasenv + ~subst ?goal + ?(initial_ugraph = CicUniv.oblivion_ugraph) ~aliases ~universe (text,prefix_len,term) = let term = if fresh_instances then CicNotationUtil.freshen_term term else term in - disambiguate_thing ~dbd ~context ~metasenv ~initial_ugraph ~aliases + let hint = match goal with + | None -> (fun _ x -> x), fun k -> k + | Some i -> + (fun metasenv t -> + let _,c,ty = CicUtil.lookup_meta i metasenv in + assert(c=context); + Cic.Cast(t,ty)), + function + | Ok (t,m,s,ug) -> + (match t with + | Cic.Cast(t,_) -> Ok (t,m,s,ug) + | _ -> assert false) + | k -> k + in + let localization_tbl = Cic.CicHash.create 503 in + disambiguate_thing ~dbd ~context ~metasenv ~subst + ~initial_ugraph ~aliases ~universe ~uri:None ~pp_thing:CicNotationPp.pp_term ~domain_of_thing:domain_of_term ~interpretate_thing:(interpretate_term (?create_dummy_ids:None)) ~refine_thing:refine_term (text,prefix_len,term) + ~localization_tbl + ~hint let disambiguate_obj ?(fresh_instances=false) ~dbd ~aliases ~universe ~uri (text,prefix_len,obj) @@ -1248,9 +1378,20 @@ in refine_profiler.HExtlib.profile foo () let obj = if fresh_instances then CicNotationUtil.freshen_obj obj else obj in - disambiguate_thing ~dbd ~context:[] ~metasenv:[] ~aliases ~universe ~uri + let hint = + (fun _ x -> x), + fun k -> k + in + let localization_tbl = Cic.CicHash.create 503 in + disambiguate_thing ~dbd ~context:[] ~metasenv:[] ~subst:[] + ~aliases ~universe ~uri ~pp_thing:(CicNotationPp.pp_obj CicNotationPp.pp_term) ~domain_of_thing:domain_of_obj + ~initial_ugraph:CicUniv.empty_ugraph ~interpretate_thing:interpretate_obj ~refine_thing:refine_obj + ~localization_tbl + ~hint (text,prefix_len,obj) + end +