X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_unification%2FcicRefine.ml;h=e64499b3b94a819723a603fe803efab7fc067a91;hb=17cc9a1c6353a5a57562434e9938fb54ca78b9c6;hp=c5f775253a004bce33c6ea393fb5f3877dfa52d6;hpb=c80afcec268c6b6037c039f00b97274483632843;p=helm.git diff --git a/helm/ocaml/cic_unification/cicRefine.ml b/helm/ocaml/cic_unification/cicRefine.ml index c5f775253..e64499b3b 100644 --- a/helm/ocaml/cic_unification/cicRefine.ml +++ b/helm/ocaml/cic_unification/cicRefine.ml @@ -29,7 +29,7 @@ exception RefineFailure of string;; exception Uncertain of string;; exception AssertFailure of string;; -let debug_print = prerr_endline +let debug_print = fun _ -> () let fo_unif_subst subst context metasenv t1 t2 ugraph = try @@ -46,26 +46,6 @@ let rec split l n = | (_,_) -> raise (AssertFailure "split: list too short") ;; -let look_for_coercion src tgt = - None - (* - if (src = (CicUtil.term_of_uri "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)")) && - (tgt = (CicUtil.term_of_uri "cic:/Coq/Reals/Rdefinitions/R.con")) - then - begin - prerr_endline "TROVATA coercion"; - Some (CicUtil.term_of_uri "cic:/Coq/Reals/Raxioms/INR.con") - end - else - begin - prerr_endline (sprintf "NON TROVATA la coercion %s %s" (CicPp.ppterm src) - (CicPp.ppterm tgt)); - None - end - *) -;; - - let rec type_of_constant uri ugraph = let module C = Cic in let module R = CicReduction in @@ -256,7 +236,7 @@ and type_of_aux' metasenv context t ugraph = (try let subst''',metasenv''',ugraph3 = fo_unif_subst subst'' context metasenv'' - inferredty ty' ugraph2 + inferredty ty ugraph2 in C.Cast (te',ty'),ty',subst''',metasenv''',ugraph3 with @@ -408,6 +388,17 @@ and type_of_aux' metasenv context t ugraph = fo_unif_subst subst context metasenv expected_type' actual_type ugraph2 in + let rec instantiate_prod t = + function + [] -> t + | he::tl -> + match CicReduction.whd ~subst context t with + C.Prod (_,_,t') -> + instantiate_prod (CicSubstitution.subst he t') tl + | _ -> assert false + in + let arity_instantiated_with_left_args = + instantiate_prod arity left_args in (* TODO: check if the sort elimination * is allowed: [(I q1 ... qr)|B] *) let (pl',_,outtypeinstances,subst,metasenv,ugraph4) = @@ -443,48 +434,134 @@ and type_of_aux' metasenv context t ugraph = (match outtype with | C.Meta (n,l) -> - (let candidate,ugraph5 = + (let candidate,ugraph5,metasenv,subst = + let exp_name_subst, metasenv = + let o,_ = + CicEnvironment.get_obj CicUniv.empty_ugraph uri + in + let uris = CicUtil.params_of_obj o in + List.fold_right ( + fun uri (acc,metasenv) -> + let metasenv',new_meta = + CicMkImplicit.mk_implicit metasenv subst context + in + let irl = + CicMkImplicit.identity_relocation_list_for_metavariable + context + in + (uri, Cic.Meta(new_meta,irl))::acc, metasenv' + ) uris ([],metasenv) + in + let ty = + match left_args,right_args with + [],[] -> Cic.MutInd(uri, i, exp_name_subst) + | _,_ -> + let rec mk_right_args = + function + 0 -> [] + | n -> (Cic.Rel n)::(mk_right_args (n - 1)) + in + let right_args_no = List.length right_args in + let lifted_left_args = + List.map (CicSubstitution.lift right_args_no) left_args + in + Cic.Appl (Cic.MutInd(uri,i,exp_name_subst):: + (lifted_left_args @ mk_right_args right_args_no)) + in + let fresh_name = + FreshNamesGenerator.mk_fresh_name ~subst metasenv + context Cic.Anonymous ~typ:ty + in match outtypeinstances with - | [] -> raise (Uncertain "Inference of annotation for empty inductive types not implemented") + | [] -> + let extended_context = + let rec add_right_args = + function + Cic.Prod (name,ty,t) -> + Some (name,Cic.Decl ty)::(add_right_args t) + | _ -> [] + in + (Some (fresh_name,Cic.Decl ty)):: + (List.rev + (add_right_args arity_instantiated_with_left_args))@ + context + in + let metasenv,new_meta = + CicMkImplicit.mk_implicit metasenv subst extended_context + in + let irl = + CicMkImplicit.identity_relocation_list_for_metavariable + extended_context + in + let rec add_lambdas b = + function + Cic.Prod (name,ty,t) -> + Cic.Lambda (name,ty,(add_lambdas b t)) + | _ -> Cic.Lambda (fresh_name, ty, b) + in + let candidate = + add_lambdas (Cic.Meta (new_meta,irl)) + arity_instantiated_with_left_args + in + (Some candidate),ugraph4,metasenv,subst | (constructor_args_no,_,instance,_)::tl -> try let instance' = - CicSubstitution.delift constructor_args_no + CicMetaSubst.delift_rels constructor_args_no (CicMetaSubst.apply_subst subst instance) in + let candidate,ugraph,metasenv,subst = List.fold_left ( - fun (candidate_oty,ugraph) + fun (candidate_oty,ugraph,metasenv,subst) (constructor_args_no,_,instance,_) -> match candidate_oty with - | None -> None,ugraph + | None -> None,ugraph,metasenv,subst | Some ty -> try let instance' = - CicSubstitution.delift + CicMetaSubst.delift_rels constructor_args_no (CicMetaSubst.apply_subst subst instance) in - let b,ugraph1 = - CicReduction.are_convertible context - instance' ty ugraph + let subst,metasenv,ugraph = + fo_unif_subst subst context metasenv + instance' ty ugraph in - if b then - candidate_oty,ugraph1 - else - None,ugraph - with Failure s -> None,ugraph - ) (Some instance',ugraph4) tl - with Failure s -> - None,ugraph4 + candidate_oty,ugraph,metasenv,subst + with + CicMetaSubst.DeliftingARelWouldCaptureAFreeVariable + | CicUnification.UnificationFailure _ + | CicUnification.Uncertain _ -> + None,ugraph,metasenv,subst + ) (Some instance',ugraph4,metasenv,subst) tl + in + match candidate with + | None -> None, ugraph,metasenv,subst + | Some t -> + let rec add_lambdas n b = + function + Cic.Prod (name,ty,t) -> + Cic.Lambda (name,ty,(add_lambdas (n + 1) b t)) + | _ -> + Cic.Lambda (fresh_name, ty, + CicSubstitution.lift (n + 1) t) + in + Some + (add_lambdas 0 t arity_instantiated_with_left_args), + ugraph,metasenv,subst + with CicMetaSubst.DeliftingARelWouldCaptureAFreeVariable -> + None,ugraph4,metasenv,subst in match candidate with | None -> raise (Uncertain "can't solve an higher order unification problem") | Some candidate -> - let s,m,u = + let subst,metasenv,ugraph = fo_unif_subst subst context metasenv candidate outtype ugraph5 in - C.MutCase (uri, i, outtype, term', pl'),candidate,s,m,u) + C.MutCase (uri, i, outtype, term', pl'), + (Cic.Appl (outtype::right_args@[term'])), + subst,metasenv,ugraph) | _ -> (* easy case *) let _,_, subst, metasenv,ugraph5 = type_of_aux subst metasenv context @@ -787,7 +864,7 @@ and type_of_aux' metasenv context t ugraph = try fo_unif_subst subst context metasenv hetype hetype' ugraph with exn -> - prerr_endline (Printf.sprintf "hetype=%s\nhetype'=%s\nmetasenv=%s\nsubst=%s" + debug_print (Printf.sprintf "hetype=%s\nhetype'=%s\nmetasenv=%s\nsubst=%s" (CicPp.ppterm hetype) (CicPp.ppterm hetype') (CicMetaSubst.ppmetasenv metasenv []) @@ -809,7 +886,7 @@ and type_of_aux' metasenv context t ugraph = hete,subst,metasenv,ugraph1 with exn -> (* we search a coercion from hety to s *) - let coer = look_for_coercion + let coer = CoercGraph.look_for_coercion (CicMetaSubst.apply_subst subst hety) (CicMetaSubst.apply_subst subst s) in @@ -880,6 +957,13 @@ and type_of_aux' metasenv context t ugraph = (cleaned_t,cleaned_ty,cleaned_metasenv,ugraph1) ;; +let type_of_aux' metasenv context term ugraph = + try + type_of_aux' metasenv context term ugraph + with + CicUniv.UniverseInconsistency msg -> raise (RefineFailure msg) + + (* DEBUGGING ONLY let type_of_aux' metasenv context term = try