X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_unification%2FcicRefine.ml;h=a9593c67fb617782815a6631fcc3cfa18c9b5f06;hb=acf29bdbdcdc6ad8c2d9d27e8a47500981b605cd;hp=eda04d36e33dcd68e54c5eefffee5e8b0ce2f355;hpb=3c0cdcf6d775bfd19ed68f953d13773d2fb44772;p=helm.git diff --git a/helm/ocaml/cic_unification/cicRefine.ml b/helm/ocaml/cic_unification/cicRefine.ml index eda04d36e..a9593c67f 100644 --- a/helm/ocaml/cic_unification/cicRefine.ml +++ b/helm/ocaml/cic_unification/cicRefine.ml @@ -388,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) = @@ -423,7 +434,7 @@ and type_of_aux' metasenv context t ugraph = (match outtype with | C.Meta (n,l) -> - (let candidate,ugraph5,metasenv = + (let candidate,ugraph5,metasenv,subst = let exp_name_subst, metasenv = let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri @@ -441,7 +452,22 @@ and type_of_aux' metasenv context t ugraph = (uri, Cic.Meta(new_meta,irl))::acc, metasenv' ) uris ([],metasenv) in - let ty = Cic.MutInd(uri, i, exp_name_subst) 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 @@ -449,7 +475,16 @@ and type_of_aux' metasenv context t ugraph = match outtypeinstances with | [] -> let extended_context = - Some (fresh_name,Cic.Decl ty)::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 @@ -458,57 +493,74 @@ and type_of_aux' metasenv context t ugraph = 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 = - Cic.Lambda(fresh_name, ty, Cic.Meta (new_meta,irl)) + add_lambdas (Cic.Meta (new_meta,irl)) + arity_instantiated_with_left_args in - (Some candidate),ugraph4,metasenv + (Some candidate),ugraph4,metasenv,subst | (constructor_args_no,_,instance,_)::tl -> try - let instance' = - CicSubstitution.delift constructor_args_no - (CicMetaSubst.apply_subst subst instance) + let instance',subst,metasenv = + CicMetaSubst.delift_rels subst metasenv + constructor_args_no instance in - let candidate,ugraph,metasenv = + let candidate,ugraph,metasenv,subst = List.fold_left ( - fun (candidate_oty,ugraph,metasenv) + fun (candidate_oty,ugraph,metasenv,subst) (constructor_args_no,_,instance,_) -> match candidate_oty with - | None -> None,ugraph,metasenv + | None -> None,ugraph,metasenv,subst | Some ty -> try - let instance' = - CicSubstitution.delift - constructor_args_no - (CicMetaSubst.apply_subst subst instance) + let instance',subst,metasenv = + CicMetaSubst.delift_rels subst metasenv + constructor_args_no 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,metasenv - else - None,ugraph,metasenv - with Failure s -> None,ugraph,metasenv - ) (Some instance',ugraph4,metasenv) tl + 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 + | None -> None, ugraph,metasenv,subst | Some t -> - Some (Cic.Lambda (fresh_name, ty, - CicSubstitution.lift 1 t)),ugraph,metasenv - with Failure s -> - None,ugraph4,metasenv + 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'), - (Cic.Appl [outtype; term']),s,m,u) + (Cic.Appl (outtype::right_args@[term'])), + subst,metasenv,ugraph) | _ -> (* easy case *) let _,_, subst, metasenv,ugraph5 = type_of_aux subst metasenv context @@ -833,9 +885,9 @@ and type_of_aux' metasenv context t ugraph = hete,subst,metasenv,ugraph1 with exn -> (* we search a coercion from hety to s *) - let coer = None (* CoercGraph.look_for_coercion + let coer = CoercGraph.look_for_coercion (CicMetaSubst.apply_subst subst hety) - (CicMetaSubst.apply_subst subst s) *) + (CicMetaSubst.apply_subst subst s) in match coer with | None -> raise exn