X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicRefiner.ml;h=56ec069d2c77bb7d30eff3773073908bdc01b6ff;hb=8049c166a37789d7a1b1ca1c3a1174712bbf87ba;hp=a227e918e1d467d40809f6f1a2a2a116cd6a4d65;hpb=0369aa83a42ed4730ed1946b02365760817f6ea2;p=helm.git diff --git a/helm/software/components/ng_refiner/nCicRefiner.ml b/helm/software/components/ng_refiner/nCicRefiner.ml index a227e918e..56ec069d2 100644 --- a/helm/software/components/ng_refiner/nCicRefiner.ml +++ b/helm/software/components/ng_refiner/nCicRefiner.ml @@ -100,23 +100,28 @@ let rec typeof rdb ?(localise=fun _ -> Stdpp.dummy_loc) metasenv subst context term expty = - let force_ty skip_lambda metasenv subst context orig t infty expty = + let force_ty skip_lambda skip_appl metasenv subst context orig t infty expty = (*D*)inside 'F'; try let rc = match expty with | Some expty -> (match t with | C.Implicit _ -> assert false | C.Lambda _ when skip_lambda -> metasenv, subst, t, expty + | C.Appl _ when skip_appl -> metasenv, subst, t, expty | _ -> - pp (lazy ( + pp (lazy ("forcing infty=expty: "^ (NCicPp.ppterm ~metasenv ~subst ~context infty) ^ " === " ^ (NCicPp.ppterm ~metasenv ~subst:[] ~context expty))); try let metasenv, subst = + (*D*)inside 'U'; try let rc = NCicUnification.unify rdb metasenv subst context infty expty + (*D*)in outside(); rc with exc -> outside (); raise exc in metasenv, subst, t, expty - with exc -> + with + | NCicUnification.Uncertain _ + | NCicUnification.UnificationFailure _ as exc -> try_coercions rdb ~localise metasenv subst context t orig infty expty true exc) | None -> metasenv, subst, t, infty @@ -125,10 +130,9 @@ let rec typeof rdb let rec typeof_aux metasenv subst context expty = fun t as orig -> (*D*)inside 'R'; try let rc = - pp (lazy (NCicPp.ppterm ~metasenv ~subst ~context t)); - pp (lazy (if expty = None then "NONE" else "SOME")); - if (List.exists (fun (i,_) -> i=29) subst) then - pp (lazy (NCicPp.ppsubst ~metasenv subst)); + pp (lazy (NCicPp.ppterm ~metasenv ~subst ~context t ^ " ::exp:: " ^ + match expty with None -> "None" | Some e -> + NCicPp.ppterm ~metasenv ~subst ~context e)); let metasenv, subst, t, infty = match t with | C.Rel n -> @@ -201,7 +205,10 @@ let rec typeof rdb let (metasenv,subst), exp_ty_t = match exp_s with | Some exp_s -> - (try NCicUnification.unify rdb metasenv subst context s exp_s,exp_ty_t + (try + pp(lazy("Force source to: "^NCicPp.ppterm ~metasenv ~subst + ~context exp_s)); + NCicUnification.unify rdb metasenv subst context s exp_s,exp_ty_t with exc -> raise (wrap_exc (lazy (localise orig_s, Printf.sprintf "Source type %s was expected to be %s" (NCicPp.ppterm ~metasenv ~subst ~context s) (NCicPp.ppterm ~metasenv ~subst ~context @@ -213,7 +220,7 @@ let rec typeof rdb typeof_aux metasenv subst context_for_t exp_ty_t t in if force_after then - force_ty false metasenv subst context orig + force_ty false true metasenv subst context orig (C.Lambda(n,s,t)) (C.Prod (n,s,ty_t)) expty else metasenv, subst, C.Lambda(n,s,t), C.Prod (n,s,ty_t) @@ -226,19 +233,43 @@ let rec typeof rdb let metasenv, subst, t, _ = typeof_aux metasenv subst context (Some ty) t in let context1 = (n, C.Def (t,ty)) :: context in + let metasenv, subst, expty1 = + match expty with + | None -> metasenv, subst, None + | Some x -> + let m, s, x = + NCicUnification.delift_term_wrt_terms + rdb metasenv subst context x [t] + in + m, s, Some x + in let metasenv, subst, bo, bo_ty = - typeof_aux metasenv subst context1 None bo + typeof_aux metasenv subst context1 expty1 bo in let bo_ty = NCicSubstitution.subst ~avoid_beta_redexes:true t bo_ty in metasenv, subst, C.LetIn (n, ty, t, bo), bo_ty | C.Appl ((he as orig_he)::(_::_ as args)) -> let upto = match orig_he with C.Meta _ -> List.length args | _ -> 0 in - let metasenv, subst, he, ty_he = - typeof_aux metasenv subst context None he in - let metasenv, subst, t, ty = - eat_prods rdb ~localise metasenv subst context orig_he he ty_he args in - let t = if upto > 0 then NCicReduction.head_beta_reduce ~upto t else t in - metasenv, subst, t, ty + let hbr t = + if upto > 0 then NCicReduction.head_beta_reduce ~upto t else t + in + let refine_appl () = + let metasenv, subst, he, ty_he = + typeof_aux metasenv subst context None he in + let metasenv, subst, t, ty = + eat_prods rdb ~localise force_ty metasenv subst context expty t + orig_he he ty_he args in + metasenv, subst, hbr t, ty + in + if args = [C.Implicit `Vector] && expty <> None then + (* we try here to expand the vector a 0 implicits, but we use + * the expected type *) + try + let metasenv, subst, he, ty_he = + typeof_aux metasenv subst context expty he in + metasenv, subst, hbr he, ty_he + with Uncertain _ | RefineFailure _ -> refine_appl () + else refine_appl () | C.Appl _ -> raise (AssertFailure (lazy "Appl of length < 2")) | C.Match (Ref.Ref (_,Ref.Ind (_,tyno,_)) as r, outtype,(term as orig_term),pl) as orig -> @@ -315,7 +346,7 @@ let rec typeof rdb NCicTypeChecker.type_of_branch ~subst context leftno outtype cons ty_cons in pp (lazy ("TYPEOFBRANCH: " ^ - NCicPp.ppterm ~metasenv ~subst ~context p ^ " ::: " ^ + NCicPp.ppterm ~metasenv ~subst ~context p ^ " ::inf:: " ^ NCicPp.ppterm ~metasenv ~subst ~context ty_branch )); let metasenv, subst, p, _ = typeof_aux metasenv subst context (Some ty_branch) p in @@ -327,9 +358,9 @@ let rec typeof rdb metasenv, subst, C.Match (r, outtype, term, pl),resty | C.Match _ -> assert false in - pp (lazy (NCicPp.ppterm ~metasenv ~subst ~context t ^ " :: "^ + pp (lazy (NCicPp.ppterm ~metasenv ~subst ~context t ^ " ::inf:: "^ NCicPp.ppterm ~metasenv ~subst ~context infty )); - force_ty true metasenv subst context orig t infty expty + force_ty true true metasenv subst context orig t infty expty (*D*)in outside(); rc with exc -> outside (); raise exc in typeof_aux metasenv subst context expty term @@ -346,7 +377,7 @@ and try_coercions rdb (NCicPp.ppterm ~metasenv ~subst ~context t) (NCicPp.ppterm ~metasenv ~subst ~context infty) (NCicPp.ppterm ~metasenv ~subst ~context expty))) exc) - | (metasenv, newterm, newtype, meta)::tl -> + | (_,metasenv, newterm, newtype, meta)::tl -> try pp (lazy ( "UNIFICATION in CTX:\n"^ NCicPp.ppcontext ~metasenv ~subst context @@ -375,8 +406,12 @@ and try_coercions rdb | NCicUnification.UnificationFailure _ -> first exc tl | NCicUnification.Uncertain _ as exc -> first exc tl in + pp(lazy("try_coercion " ^ + NCicPp.ppterm ~metasenv ~subst ~context infty ^ " |---> " ^ + NCicPp.ppterm ~metasenv ~subst ~context expty)); first exc - (NCicCoercion.look_for_coercion rdb metasenv subst context infty expty) + (NCicCoercion.look_for_coercion + rdb metasenv subst context infty expty) and force_to_sort rdb metasenv subst context t orig_t localise ty = match NCicReduction.whd ~subst context ty with @@ -436,11 +471,35 @@ and guess_name subst ctx ty = with NCicUtils.Subst_not_found _ -> aux 'M') | _ -> aux 'H' -and eat_prods rdb ~localise metasenv subst context orig_he he ty_he args = +and eat_prods rdb ~localise force_ty metasenv subst context expty orig_t orig_he he ty_he args = (*D*)inside 'E'; try let rc = let rec aux metasenv subst args_so_far he ty_he = function - | [] ->metasenv, subst, NCicUntrusted.mk_appl he (List.rev args_so_far), ty_he - | NCic.Implicit `Vector::tl -> assert false + | [] -> + let res = NCicUntrusted.mk_appl he (List.rev args_so_far) in + pp(lazy("FORCE FINAL APPL: " ^ + NCicPp.ppterm ~metasenv ~subst ~context res ^ + " of type " ^ NCicPp.ppterm ~metasenv ~subst ~context ty_he + ^ " to type " ^ match expty with None -> "None" | Some x -> + NCicPp.ppterm ~metasenv ~subst ~context x)); + (* whatever the term is, we force the type. in case of ((Lambda..) ?...) + * the application may also be a lambda! *) + force_ty false false metasenv subst context orig_t res ty_he expty + | NCic.Implicit `Vector::tl -> + let has_some_more_pis x = + match NCicReduction.whd ~subst context x with + | NCic.Meta _ | NCic.Appl (NCic.Meta _::_) -> false + | _ -> true + in + (try + aux metasenv subst args_so_far he ty_he tl + with + | Uncertain _ + | RefineFailure _ as exc when has_some_more_pis ty_he -> + (try + aux metasenv subst args_so_far he ty_he + (NCic.Implicit `Term :: NCic.Implicit `Vector :: tl) + with + Uncertain msg | RefineFailure msg -> raise (wrap_exc msg exc))) | arg::tl -> match NCicReduction.whd ~subst context ty_he with | C.Prod (_,s,t) -> @@ -464,12 +523,14 @@ and eat_prods rdb ~localise metasenv subst context orig_he he ty_he args = let metasenv,subst, flex_prod, _ = typeof rdb ~localise metasenv subst context flex_prod None in +(* pp (lazy ( "UNIFICATION in CTX:\n"^ NCicPp.ppcontext ~metasenv ~subst context ^ "\nOF: " ^ NCicPp.ppterm ~metasenv ~subst ~context t ^ " === " ^ NCicPp.ppterm ~metasenv ~subst ~context flex_prod ^ "\n")); - let metasenv, subst = +*) + let metasenv, subst = try NCicUnification.unify rdb metasenv subst context t flex_prod with exc -> raise (wrap_exc (lazy (localise orig_he, Printf.sprintf ("The term %s has an inferred type %s, but is applied to the" ^^ @@ -477,7 +538,11 @@ and eat_prods rdb ~localise metasenv subst context orig_he he ty_he args = (NCicPp.ppterm ~metasenv ~subst ~context he) (NCicPp.ppterm ~metasenv ~subst ~context t) (NCicPp.ppterm ~metasenv ~subst ~context arg) - (NCicPp.ppterm ~metasenv ~subst ~context ty_arg))) exc) + (NCicPp.ppterm ~metasenv ~subst ~context ty_arg))) + (match exc with + | NCicUnification.UnificationFailure m -> + NCicUnification.Uncertain m + | x -> x)) (* XXX coerce to funclass *) in let meta = NCicSubstitution.subst ~avoid_beta_redexes:true arg meta in @@ -500,7 +565,7 @@ and eat_prods rdb ~localise metasenv subst context orig_he he ty_he args = "only %d arguments") (NCicPp.ppterm ~metasenv ~subst ~context he) (List.length args) (List.length args_so_far)))) in - aux metasenv subst [] newhead newheadty (arg :: tl) + aux metasenv subst [] newhead newheadty (arg :: tl) in (* We need to reverse the order of the new created metas since they are pushed on top of the metasenv in the wrong order *)