X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicUnification.ml;h=2f6332d51d748ad0c90ecf71c81c5219ccd79cec;hb=d6ba7f4b8fbd98f2f1c848857022ef5fba80db53;hp=71203b3a5dccdf2b3c5207677f2df501c6eb4084;hpb=fed8f1a2c4d10e8b6411ae471d0f85636d2f13a9;p=helm.git diff --git a/helm/software/components/ng_refiner/nCicUnification.ml b/helm/software/components/ng_refiner/nCicUnification.ml index 71203b3a5..2f6332d51 100644 --- a/helm/software/components/ng_refiner/nCicUnification.ml +++ b/helm/software/components/ng_refiner/nCicUnification.ml @@ -96,21 +96,22 @@ let pp s = prerr_endline (Printf.sprintf "%-20s" !indent ^ " " ^ Lazy.force s) ;; +let pp _ = ();; + let ppcontext = NCicPp.ppcontext;; let ppmetasenv = NCicPp.ppmetasenv;; let ppcontext ~metasenv:_metasenv ~subst:_subst _context = "...";; let ppmetasenv ~subst:_subst _metasenv = "...";; -let pp _ = ();; - -let fix_sorts swap metasenv subst context meta t = +let fix_sorts swap exc t = let rec aux () = function | NCic.Sort (NCic.Type u) as orig -> if swap then match NCicEnvironment.sup u with - | None -> prerr_endline "no sup for" ; - raise (fail_exc metasenv subst context meta t) + | None -> + prerr_endline ("no sup for " ^ NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] orig) ; + raise exc | Some u1 -> if u = u1 then orig else NCic.Sort (NCic.Type u1) else NCic.Sort (NCic.Type ( @@ -143,7 +144,6 @@ let rec lambda_intros rdb metasenv subst context t args = List.map (fun arg -> arg, NCicTypeChecker.typeof ~metasenv ~subst context arg) args in let context_of_args = context in - let mk_appl = function [] -> assert false | [t] -> t | l -> NCic.Appl l in let rec mk_lambda metasenv subst context n processed_args = function | [] -> let metasenv, _, bo, _ = @@ -152,23 +152,11 @@ let rec lambda_intros rdb metasenv subst context t args = in metasenv, subst, bo | (arg,ty)::tail -> + let metasenv, subst, telescopic_ty = + delift_term_wrt_terms rdb metasenv subst context_of_args ty + (List.rev processed_args) + in let name = "HBeta"^string_of_int n in - let metasenv,_,instance,_ = - NCicMetaSubst.mk_meta metasenv context_of_args `Term in - let meta_applied = mk_appl (instance::List.rev processed_args) in -let metasenv,subst,_,_ = - !refiner_typeof ((rdb :> NRstatus.status)#set_coerc_db NCicCoercion.empty_db) metasenv subst context_of_args meta_applied None -in -prerr_endline ("########################## LI1: " ^ NCicPp.ppterm ~metasenv ~subst ~context:context_of_args meta_applied ^ " vs " ^ NCicPp.ppterm ~metasenv ~subst ~context:context_of_args ty); -prerr_endline (NCicPp.ppcontext ~metasenv ~subst context_of_args); -prerr_endline (NCicPp.ppmetasenv metasenv ~subst); - let metasenv,subst = - unify rdb true metasenv subst context_of_args meta_applied ty in -prerr_endline "UNIFY FINITA"; - let telescopic_ty = NCicSubstitution.lift n instance in - let telescopic_ty = - mk_appl (telescopic_ty :: mk_irl (List.length processed_args)) in -prerr_endline ("########################## LI: " ^ NCicPp.ppterm ~metasenv ~subst ~context telescopic_ty); let metasenv, subst, bo = mk_lambda metasenv subst ((name,NCic.Decl telescopic_ty)::context) (n+1) (arg::processed_args) tail @@ -196,12 +184,13 @@ and instantiate rdb test_eq_only metasenv subst context n lc t swap = "typeof: " ^ NCicPp.ppterm ~metasenv ~subst ~context t ^ "\nctx:\n"^ ppcontext ~metasenv ~subst context ^ "\nmenv:\n"^ ppmetasenv ~subst metasenv)); + let exc_to_be = fail_exc metasenv subst context (NCic.Meta (n,lc)) t in let t, ty_t = try t, NCicTypeChecker.typeof ~subst ~metasenv context t with | NCicTypeChecker.AssertFailure msg -> (pp (lazy "fine typeof (fallimento)"); - let ft=fix_sorts swap metasenv subst context (NCic.Meta (n,lc)) t in + let ft = fix_sorts swap exc_to_be t in if ft == t then (prerr_endline ( ("ILLTYPED: " ^ NCicPp.ppterm ~metasenv ~subst ~context t @@ -232,7 +221,12 @@ and instantiate rdb test_eq_only metasenv subst context n lc t swap = NCicPp.ppterm ~metasenv ~subst ~context lty ^ " === " ^ NCicPp.ppterm ~metasenv ~subst ~context ty_t)); let metasenv,subst = - unify test_eq_only metasenv subst context lty ty_t in + try + unify test_eq_only metasenv subst context lty ty_t + with NCicEnvironment.BadConstraint _ as exc -> + let ty_t = fix_sorts swap exc_to_be ty_t in + try unify test_eq_only metasenv subst context lty ty_t + with _ -> raise exc in metasenv, subst, t in pp (lazy(string_of_int n ^ " := 111 = "^ @@ -348,18 +342,17 @@ and unify rdb test_eq_only metasenv subst context t1 t2 = | _, NCic.Meta (n, _) when is_locked n subst -> (let (metasenv, subst), i = match NCicReduction.whd ~subst context t1 with - | NCic.Appl (NCic.Meta (i,l)::args) when - not (NCicMetaSubst.flexible subst args) - -> + | NCic.Appl (NCic.Meta (i,l)::args) -> let metasenv, subst, lambda_Mj = lambda_intros rdb metasenv subst context t1 args in -prerr_endline ("XXXXXXXXX " ^ NCicPp.ppterm ~metasenv ~subst ~context lambda_Mj); unify rdb test_eq_only metasenv subst context (C.Meta (i,l)) lambda_Mj, i | NCic.Meta (i,_) -> (metasenv, subst), i - | _ -> assert false + | _ -> + raise (UnificationFailure (lazy "Locked term vs non + flexible term; probably not saturated enough yet!")) in let t1 = NCicReduction.whd ~subst context t1 in let j, lj = @@ -429,45 +422,41 @@ prerr_endline ("XXXXXXXXX " ^ NCicPp.ppterm ~metasenv ~subst ~context lambda_Mj) with Invalid_argument _ -> raise (fail_exc metasenv subst context t1 t2)) - | NCic.Appl (NCic.Meta (i,l)::args), _ when - not (NCicMetaSubst.flexible subst args) -> - (* we verify that none of the args is a Meta, - since beta expanding w.r.t a metavariable makes no sense *) - let metasenv, subst, lambda_Mj = - lambda_intros rdb metasenv subst context t1 args - in - let metasenv, subst = - unify rdb test_eq_only metasenv subst context - (C.Meta (i,l)) lambda_Mj - in - let metasenv, subst = - unify rdb test_eq_only metasenv subst context t1 t2 - in - (try - let name, ctx, term, ty = NCicUtils.lookup_subst i subst in - let term = eta_reduce subst term in - let subst = List.filter (fun (j,_) -> j <> i) subst in - metasenv, ((i, (name, ctx, term, ty)) :: subst) - with Not_found -> assert false) - - | _, NCic.Appl (NCic.Meta (i,l)::args) when - not(NCicMetaSubst.flexible subst args) -> - let metasenv, subst, lambda_Mj = - lambda_intros rdb metasenv subst context t2 args - in - let metasenv, subst = - unify rdb test_eq_only metasenv subst context - lambda_Mj (C.Meta (i,l)) - in - let metasenv, subst = - unify rdb test_eq_only metasenv subst context t1 t2 - in - (try - let name, ctx, term, ty = NCicUtils.lookup_subst i subst in - let term = eta_reduce subst term in - let subst = List.filter (fun (j,_) -> j <> i) subst in - metasenv, ((i, (name, ctx, term, ty)) :: subst) - with Not_found -> assert false) + | NCic.Appl (NCic.Meta (i,l)::args), _ -> + let metasenv, subst, lambda_Mj = + lambda_intros rdb metasenv subst context t1 args + in + let metasenv, subst = + unify rdb test_eq_only metasenv subst context + (C.Meta (i,l)) lambda_Mj + in + let metasenv, subst = + unify rdb test_eq_only metasenv subst context t1 t2 + in + (try + let name, ctx, term, ty = NCicUtils.lookup_subst i subst in + let term = eta_reduce subst term in + let subst = List.filter (fun (j,_) -> j <> i) subst in + metasenv, ((i, (name, ctx, term, ty)) :: subst) + with Not_found -> assert false) + + | _, NCic.Appl (NCic.Meta (i,l)::args) -> + let metasenv, subst, lambda_Mj = + lambda_intros rdb metasenv subst context t2 args + in + let metasenv, subst = + unify rdb test_eq_only metasenv subst context + lambda_Mj (C.Meta (i,l)) + in + let metasenv, subst = + unify rdb test_eq_only metasenv subst context t1 t2 + in + (try + let name, ctx, term, ty = NCicUtils.lookup_subst i subst in + let term = eta_reduce subst term in + let subst = List.filter (fun (j,_) -> j <> i) subst in + metasenv, ((i, (name, ctx, term, ty)) :: subst) + with Not_found -> assert false) (* processing this case here we avoid a useless small delta step *) | (C.Appl ((C.Const r1) as _hd1::tl1), C.Appl (C.Const r2::tl2)) @@ -625,8 +614,8 @@ pp (lazy (string_of_bool norm1 ^ " ?? " ^ string_of_bool norm2)); | _ -> [] *) in let unif_from_stack t1 t2 b metasenv subst = try - let t1 = NCicReduction.from_stack t1 in - let t2 = NCicReduction.from_stack t2 in + let t1 = NCicReduction.from_stack ~delta:max_int t1 in + let t2 = NCicReduction.from_stack ~delta:max_int t2 in unif_machines metasenv subst (put_in_whd t1 t2) with UnificationFailure _ | Uncertain _ when not b -> metasenv, subst @@ -671,8 +660,25 @@ pp (lazy (string_of_bool norm1 ^ " ?? " ^ string_of_bool norm2)); | UnificationFailure _ -> raise (UnificationFailure msg) | Uncertain _ -> raise exn (*D*) in outside(); rc with exn -> outside (); raise exn + +and delift_term_wrt_terms rdb metasenv subst context t args = + let metasenv, _, instance, _ = + NCicMetaSubst.mk_meta metasenv context `Term in + let meta_applied = NCicUntrusted.mk_appl instance args in + let metasenv,subst,meta_applied,_ = + !refiner_typeof ((rdb:> NRstatus.status)#set_coerc_db NCicCoercion.empty_db) + metasenv subst context meta_applied None + in + let metasenv, subst = + unify rdb true metasenv subst context meta_applied t in + let t = NCicSubstitution.lift (List.length args) instance in + let t = NCicUntrusted.mk_appl t (mk_irl (List.length args)) in + metasenv, subst, t ;; + let unify rdb ?(test_eq_only=false) = indent := ""; unify rdb test_eq_only;; + +let fix_sorts = fix_sorts false (UnificationFailure (lazy "no sup"));;