X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicUnification.ml;h=a3c980648f9b87128128a815f9c01a0e85dd1ecb;hb=61948e2e9b31460eb6a0bbd627c90a6549d65414;hp=bfa1388a98b965d0489b34aebbff4721b0e714df;hpb=8bc5bc0e8375a85736f6a5df317d129d5efa8de4;p=helm.git diff --git a/helm/software/components/ng_refiner/nCicUnification.ml b/helm/software/components/ng_refiner/nCicUnification.ml index bfa1388a9..a3c980648 100644 --- a/helm/software/components/ng_refiner/nCicUnification.ml +++ b/helm/software/components/ng_refiner/nCicUnification.ml @@ -78,23 +78,43 @@ let eta_reduce subst t = module C = NCic;; module Ref = NReference;; +let debug = false;; let indent = ref "";; -let inside c = indent := !indent ^ String.make 1 c;; -let outside () = indent := String.sub !indent 0 (String.length !indent -1);; +let pp = + if debug then + fun s -> prerr_endline (Printf.sprintf "%-20s" !indent ^ " " ^ Lazy.force s) + else + fun _ -> () +;; +let inside c = + indent := !indent ^ String.make 1 c; + if debug then prerr_endline ("{{{" ^ !indent ^ " ") +;; +let outside ok = + if debug then prerr_endline "}}}"; + if not ok then pp (lazy "exception raised!"); + try + indent := String.sub !indent 0 (String.length !indent -1) + with + Invalid_argument _ -> indent := "??"; () +;; -let pp s = - prerr_endline (Printf.sprintf "%-20s" !indent ^ " " ^ Lazy.force s) -;; +let ppcontext ~metasenv ~subst c = + "\nctx:\n"^ NCicPp.ppcontext ~metasenv ~subst c +;; +let ppmetasenv ~subst m = "\nmenv:\n" ^ NCicPp.ppmetasenv ~subst m;; -let pp _ = ();; +let ppcontext ~metasenv:_metasenv ~subst:_subst _context = "";; +let ppmetasenv ~subst:_subst _metasenv = "";; -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 ( @@ -115,24 +135,50 @@ let is_locked n subst = with NCicUtils.Subst_not_found _ -> false ;; +let rec mk_irl = + function + 0 -> [] + | n -> NCic.Rel n :: mk_irl (n-1) +;; -let rec lambda_intros metasenv subst context t args = +let rec lambda_intros rdb metasenv subst context t args = let tty = NCicTypeChecker.typeof ~metasenv ~subst context t in - let argsty = List.map (NCicTypeChecker.typeof ~metasenv ~subst context) args in - let rec mk_lambda context n = function - | [] -> + let argsty = + List.map + (fun arg -> arg, NCicTypeChecker.typeof ~metasenv ~subst context arg) args in + let context_of_args = context in + let rec mk_lambda metasenv subst context n processed_args = function + | [] -> let metasenv, _, bo, _ = NCicMetaSubst.mk_meta metasenv context (`WithType (NCicSubstitution.lift n tty)) in - metasenv, bo - | ty::tail -> + metasenv, subst, bo + | (arg,ty)::tail -> + pp(lazy("arg{ " ^ + NCicPp.ppterm ~metasenv ~subst ~context:context_of_args arg ^ ":" ^ + NCicPp.ppterm ~metasenv ~subst ~context:context_of_args ty)); + let metasenv, subst, telescopic_ty = + if processed_args = [] then metasenv, subst, ty else + let _ = pp(lazy("delift")) in + delift_type_wrt_terms rdb metasenv subst context_of_args ty + (List.rev processed_args) + in + pp(lazy("arg}")); let name = "HBeta"^string_of_int n in - let ty = NCicSubstitution.lift n ty in - let metasenv, bo = mk_lambda ((name,NCic.Decl ty)::context) (n+1) tail in - metasenv, NCic.Lambda (name, ty, bo) + let metasenv, subst, bo = + mk_lambda metasenv subst ((name,NCic.Decl telescopic_ty)::context) (n+1) + (arg::processed_args) tail + in + metasenv, subst, NCic.Lambda (name, telescopic_ty, bo) in - mk_lambda context 0 argsty + pp(lazy("LAMBDA_INTROS{ " ^ + NCicPp.ppterm ~metasenv ~subst ~context t ^ ":" ^ + NCicPp.ppterm ~metasenv ~subst ~context tty ^ " over " ^ + String.concat "," (List.map (NCicPp.ppterm ~metasenv ~subst ~context)args))); + let rc = mk_lambda metasenv subst context 0 [] argsty in + pp(lazy("LAMBDA_INTROS}")); + rc and instantiate rdb test_eq_only metasenv subst context n lc t swap = (*D*) inside 'I'; try let rc = @@ -146,25 +192,57 @@ and instantiate rdb test_eq_only metasenv subst context n lc t swap = let metasenv, subst, t = match ty with | NCic.Implicit (`Typeof _) -> - metasenv,subst, t + (let ty_t = + try + t (* + NCicTypeChecker.typeof ~subst ~metasenv context t*) + with + NCicTypeChecker.AssertFailure msg -> + let exc_to_be = + fail_exc metasenv subst context (NCic.Meta (n,lc)) t in + pp (lazy "fine typeof (fallimento)"); + let ft = fix_sorts swap exc_to_be t in + if ft == t then + (prerr_endline ( ("ILLTYPED: " ^ + NCicPp.ppterm ~metasenv ~subst ~context t + ^ "\nBECAUSE:" ^ Lazy.force msg ^ + ppcontext ~metasenv ~subst context ^ + ppmetasenv ~subst metasenv + )); + assert false) + else + (try + pp (lazy ("typeof: " ^ + NCicPp.ppterm ~metasenv ~subst ~context ft)); + NCicTypeChecker.typeof ~subst ~metasenv context ft + with NCicTypeChecker.AssertFailure _ -> + assert false) + | NCicTypeChecker.TypeCheckerFailure _ -> assert false + in + match NCicReduction.whd ~subst context ty_t with + NCic.Sort _ -> metasenv,subst, t + | NCic.Meta _ -> metasenv,subst,t (* CSC: TO BE IMPLEMENTED *) + | _ -> raise (Uncertain (lazy "Trying to instantiate a metavariable that represents a sort with a term"))) + (*CSC: TO BE IMPLEMENTED: UnificationFailure of string Lazy.t;; *) (* fix_sorts swap metasenv subst context (NCic.Meta(n,lc)) t *) | _ -> pp (lazy ( - "typeof: " ^ NCicPp.ppterm ~metasenv ~subst ~context t ^ "\nctx:\n"^ - NCicPp.ppcontext ~metasenv ~subst context ^ "\nmenv:\n"^ - NCicPp.ppmetasenv ~subst metasenv)); + "typeof: " ^ NCicPp.ppterm ~metasenv ~subst ~context t ^ + ppcontext ~metasenv ~subst context ^ + 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 - ^ "\nBECAUSE:" ^ Lazy.force msg ^ "\nCONTEXT:\n" ^ - NCicPp.ppcontext ~metasenv ~subst context ^ "\nMENV:\n" ^ - NCicPp.ppmetasenv ~subst metasenv + ^ "\nBECAUSE:" ^ Lazy.force msg ^ + ppcontext ~metasenv ~subst context ^ + ppmetasenv ~subst metasenv )); assert false) else @@ -176,6 +254,10 @@ and instantiate rdb test_eq_only metasenv subst context n lc t swap = assert false) | NCicTypeChecker.TypeCheckerFailure msg -> prerr_endline (Lazy.force msg); + prerr_endline ( + "typeof: " ^ NCicPp.ppterm ~metasenv ~subst ~context t ^ + ppcontext ~metasenv ~subst context ^ + ppmetasenv ~subst metasenv); pp msg; assert false in let lty = NCicSubstitution.subst_meta lc ty in @@ -189,7 +271,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 = "^ @@ -214,7 +301,7 @@ and instantiate rdb test_eq_only metasenv subst context n lc t swap = in pp (lazy(string_of_int n ^ " := 222 = "^ NCicPp.ppterm ~metasenv ~subst ~context:ctx t - ^ "\n" ^ NCicPp.ppmetasenv ~subst metasenv)); + ^ ppmetasenv ~subst metasenv)); (* Unifying the types may have already instantiated n. *) try let _, _,oldt,_ = NCicUtils.lookup_subst n subst in @@ -232,14 +319,14 @@ and instantiate rdb test_eq_only metasenv subst context n lc t swap = List.filter (fun (m,_) -> not (n = m)) metasenv in metasenv, subst - (*D*) in outside(); rc with exn -> outside (); raise exn + (*D*) in outside true; rc with exn -> outside false; raise exn and unify rdb test_eq_only metasenv subst context t1 t2 = (*D*) inside 'U'; try let rc = let fo_unif test_eq_only metasenv subst t1 t2 = (*D*) inside 'F'; try let rc = pp (lazy(" " ^ NCicPp.ppterm ~metasenv ~subst ~context t1 ^ " ==?== " ^ - NCicPp.ppterm ~metasenv ~subst ~context t2 ^ "\n" ^ NCicPp.ppmetasenv + NCicPp.ppterm ~metasenv ~subst ~context t2 ^ ppmetasenv ~subst metasenv)); if t1 === t2 then metasenv, subst @@ -305,17 +392,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) - -> - let metasenv, lambda_Mj = - lambda_intros metasenv subst context t1 args + | NCic.Appl (NCic.Meta (i,l)::args) -> + let metasenv, subst, lambda_Mj = + lambda_intros rdb metasenv subst context t1 args in 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 = @@ -324,6 +411,20 @@ and unify rdb test_eq_only metasenv subst context t1 t2 = let metasenv, subst = instantiate rdb test_eq_only metasenv subst context j lj t2 true in + (* We need to remove the out_scope_tags to avoid propagation of + them that triggers again the ad-hoc case *) + let subst = + List.map (fun (i,(tag,ctx,bo,ty)) -> + let tag = + match tag with + Some tag when + tag = NCicMetaSubst.in_scope_tag + || NCicMetaSubst.is_out_scope_tag tag -> None + | _ -> tag + in + i,(tag,ctx,bo,ty) + ) subst + in (try let name, ctx, term, ty = NCicUtils.lookup_subst i subst in let term = eta_reduce subst term in @@ -371,45 +472,41 @@ and unify rdb test_eq_only metasenv subst context t1 t2 = 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, lambda_Mj = - lambda_intros 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 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, lambda_Mj = - lambda_intros 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 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)) @@ -481,9 +578,10 @@ and unify rdb test_eq_only metasenv subst context t1 t2 = NCicUntrusted.metas_of_term subst context t2 = [] -> raise (fail_exc metasenv subst context t1 t2) | _ -> raise (uncert_exc metasenv subst context t1 t2) - (*D*) in outside(); rc with exn -> outside (); raise exn + (*D*) in outside true; rc with exn -> outside false; raise exn in let try_hints metasenv subst t1 t2 (* exc*) = + (*D*) inside 'H'; try let rc = (* prerr_endline ("\nProblema:\n" ^ NCicPp.ppterm ~metasenv ~subst ~context t1 ^ " =?= " ^ @@ -495,8 +593,7 @@ and unify rdb test_eq_only metasenv subst context t1 t2 = let rec cand_iter = function | [] -> None (* raise exc *) | (metasenv,(c1,c2),premises)::tl -> -(* - prerr_endline ("\nProvo il candidato:\n" ^ + pp (lazy ("\nProvo il candidato:\n" ^ String.concat "\n" (List.map (fun (a,b) -> @@ -504,9 +601,9 @@ and unify rdb test_eq_only metasenv subst context t1 t2 = NCicPp.ppterm ~metasenv ~subst ~context b) premises) ^ "\n-------------------------------------------\n"^ NCicPp.ppterm ~metasenv ~subst ~context c1 ^ " = " ^ - NCicPp.ppterm ~metasenv ~subst ~context c2); -*) + NCicPp.ppterm ~metasenv ~subst ~context c2)); try + (*D*) inside 'K'; try let rc = let metasenv,subst = fo_unif test_eq_only metasenv subst t1 c1 in let metasenv,subst = @@ -518,11 +615,13 @@ and unify rdb test_eq_only metasenv subst context t1 t2 = (metasenv, subst) premises in Some (metasenv, subst) + (*D*) in outside true; rc with exn -> outside false; raise exn with UnificationFailure _ | Uncertain _ -> cand_iter tl in cand_iter candidates + (*D*) in outside true; rc with exn -> outside false; raise exn in let height_of = function | NCic.Const (Ref.Ref (_,Ref.Def h)) @@ -567,8 +666,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 @@ -591,7 +690,7 @@ pp (lazy (string_of_bool norm1 ^ " ?? " ^ string_of_bool norm2)); ) (metasenv,subst) todo with UnificationFailure _ | Uncertain _ when not (norm1 && norm2) -> unif_machines metasenv subst (small_delta_step ~subst m1 m2) - (*D*) in outside(); rc with exn -> outside (); raise exn + (*D*) in outside true; rc with exn -> outside false; raise exn in try fo_unif test_eq_only metasenv subst t1 t2 with @@ -612,9 +711,29 @@ pp (lazy (string_of_bool norm1 ^ " ?? " ^ string_of_bool norm2)); with | UnificationFailure _ -> raise (UnificationFailure msg) | Uncertain _ -> raise exn - (*D*) in outside(); rc with exn -> outside (); raise exn + (*D*) in outside true; rc with exn -> outside false; raise exn + +and delift_type_wrt_terms rdb metasenv subst context t args = + let (metasenv, subst), t = + try + NCicMetaSubst.delift + ~unify:(fun m s c t1 t2 -> + let ind = !indent in + let res = + try Some (unify rdb false m s c t1 t2 ) + with UnificationFailure _ | Uncertain _ -> None + in + indent := ind; res) + metasenv subst context 0 (0,NCic.Ctx (args @ + List.rev (mk_irl (List.length context)))) t + with NCicMetaSubst.MetaSubstFailure _ -> (metasenv, subst), t + in + metasenv, subst, t ;; + let unify rdb ?(test_eq_only=false) = indent := ""; unify rdb test_eq_only;; + +let fix_sorts = fix_sorts true (UnificationFailure (lazy "no sup"));;