let _,_,t,_ = NCicUtils.lookup_subst i subst in
let t = NCicSubstitution.subst_meta lc t in
eat_lambdas ctx t
- with Not_found -> ctx, t)
+ with NCicUtils.Subst_not_found _ -> ctx, t)
| t -> ctx, t
in
let context_body = eat_lambdas [] t in
let time2 = Unix.gettimeofday () in
let time1 =
match !times with time1::tl -> times := tl; time1 | [] -> assert false in
- prerr_endline ("}}} " ^ string_of_float (time2 -. time1));
+ prerr_endline ("}}} " ^ !indent ^ " " ^ string_of_float (time2 -. time1));
(match exc_opt with
| Some e -> prerr_endline ("exception raised: " ^ Printexc.to_string e)
| None -> ());
if is_type attrs then
metasenv,subst,true
else
+ let _,cc,ty = NCicUtils.lookup_meta n metasenv in
+ let metasenv,subst,ty = sortfy exc metasenv subst cc ty in
let metasenv =
NCicUntrusted.replace_in_metasenv n
- (fun attrs,cc,ty -> NCicUntrusted.set_kind `IsType attrs, cc, ty)
+ (fun attrs,cc,_ -> NCicUntrusted.set_kind `IsType attrs, cc, ty)
metasenv
in
metasenv,subst,false
if is_type attrs then
metasenv,subst,true
else
+ let _,cc,_,ty = NCicUtils.lookup_subst n subst in
+ let metasenv,subst,ty = sortfy exc metasenv subst cc ty in
let subst =
NCicUntrusted.replace_in_subst n
- (fun attrs,cc,bo,ty->NCicUntrusted.set_kind `IsType attrs,cc,bo,ty)
+ (fun attrs,cc,bo,_->NCicUntrusted.set_kind `IsType attrs,cc,bo,ty)
subst
in
optimize_meta metasenv subst (NCicSubstitution.subst_meta lc bo))
~unify:(fun m s c t1 t2 ->
let ind = !indent in
let res =
- try Some (unify rdb test_eq_only m s c t1 t2 )
+ try Some (unify rdb test_eq_only m s c t1 t2 false)
with UnificationFailure _ | Uncertain _ -> None
in
indent := ind; res)
let oldt = NCicSubstitution.subst_meta lc oldt in
let t = NCicSubstitution.subst_meta lc t in
(* conjecture: always fail --> occur check *)
- unify rdb test_eq_only metasenv subst context t oldt
+ unify rdb test_eq_only metasenv subst context t oldt false
with NCicUtils.Subst_not_found _ ->
move_to_subst n (attrs,cc,t,ty) metasenv subst
in
ppterm ~metasenv ~subst ~context ty ^ "=<=" ^
ppterm ~metasenv ~subst ~context ty_t));
let metasenv, subst =
- unify rdb false metasenv subst context ty_t ty in
+ unify rdb false metasenv subst context ty_t ty false in
delift_to_subst test_eq_only n lc (attrs,cc,ty) t
context metasenv subst
| _ -> assert false)
| `IsType
| `IsTerm ->
- (match ty,t with
- NCic.Implicit (`Typeof _), _ ->
+ (match ty with
+ NCic.Implicit (`Typeof _) ->
let (metasenv, subst), ty_t =
try
NCicMetaSubst.delift
~unify:(fun m s c t1 t2 ->
let ind = !indent in
- let res = try Some (unify rdb test_eq_only m s c t1 t2 )
+ let res = try Some (unify rdb test_eq_only m s c t1 t2 false )
with UnificationFailure _ | Uncertain _ -> None
in
indent := ind; res)
in
delift_to_subst test_eq_only n lc (attrs,cc,ty_t) t context metasenv
subst
- | _, _ ->
+ | _ ->
let lty = NCicSubstitution.subst_meta lc ty in
pp (lazy ("On the types: " ^
ppterm ~metasenv ~subst ~context lty ^ "=<=" ^
ppterm ~metasenv ~subst ~context ty_t));
let metasenv, subst =
- unify rdb false metasenv subst context ty_t lty
+ unify rdb false metasenv subst context ty_t lty false
in
delift_to_subst test_eq_only n lc (attrs,cc,ty) t context metasenv
subst)
(*D*) in outside None; rc with exn -> outside (Some exn); raise exn
-and unify rdb test_eq_only metasenv subst context t1 t2 =
+and unify rdb test_eq_only metasenv subst context t1 t2 swap =
(*D*) inside 'U'; try let rc =
let fo_unif test_eq_only metasenv subst (norm1,t1) (norm2,t2) =
(*D*) inside 'F'; try let rc =
- pp (lazy(" " ^ ppterm ~metasenv ~subst ~context t1 ^ " ==?== " ^
+ pp (lazy(" " ^ ppterm ~metasenv ~subst ~context t1 ^
+ (if swap then " ==>?== "
+ else " ==<?==" ) ^
ppterm ~metasenv ~subst ~context t2 ^ ppmetasenv
~subst metasenv));
- pp (lazy(" " ^ ppterm ~metasenv ~subst:[] ~context t1 ^ " ==??== " ^
+ pp (lazy(" " ^ ppterm ~metasenv ~subst:[] ~context t1 ^
+ (if swap then " ==>??== "
+ else " ==<??==" ) ^
ppterm ~metasenv ~subst:[] ~context t2 ^ ppmetasenv
~subst metasenv));
if t1 === t2 then
| C.Appl (C.Appl _::_), _ | _, C.Appl (C.Appl _::_) ->
prerr_endline "Appl [Appl _;_] or Appl [] or Appl [_] invariant";
assert false
- | (C.Sort (C.Type a), C.Sort (C.Type b)) when not test_eq_only ->
+ | (C.Sort (C.Type a), C.Sort (C.Type b)) when not test_eq_only ->
+ let a, b = if swap then b,a else a,b in
if NCicEnvironment.universe_leq a b then metasenv, subst
else raise (UnificationFailure (mk_msg metasenv subst context t1 t2))
| (C.Sort (C.Type a), C.Sort (C.Type b)) ->
if NCicEnvironment.universe_eq a b then metasenv, subst
else raise (UnificationFailure (mk_msg metasenv subst context t1 t2))
- | (C.Sort C.Prop,C.Sort (C.Type _)) ->
+ | (C.Sort C.Prop,C.Sort (C.Type _)) when not swap ->
+ if (not test_eq_only) then metasenv, subst
+ else raise (UnificationFailure (mk_msg metasenv subst context t1 t2))
+ | (C.Sort (C.Type _), C.Sort C.Prop) when swap ->
if (not test_eq_only) then metasenv, subst
else raise (UnificationFailure (mk_msg metasenv subst context t1 t2))
| (C.Lambda (name1,s1,t1), C.Lambda(_,s2,t2))
| (C.Prod (name1,s1,t1), C.Prod(_,s2,t2)) ->
- let metasenv, subst = unify rdb true metasenv subst context s1 s2 in
- unify rdb test_eq_only metasenv subst ((name1, C.Decl s1)::context) t1 t2
+ let metasenv, subst = unify rdb true metasenv subst context s1 s2 swap in
+ unify rdb test_eq_only metasenv subst ((name1, C.Decl s1)::context) t1 t2 swap
| (C.LetIn (name1,ty1,s1,t1), C.LetIn(_,ty2,s2,t2)) ->
- let metasenv,subst=unify rdb test_eq_only metasenv subst context ty1 ty2 in
- let metasenv,subst=unify rdb test_eq_only metasenv subst context s1 s2 in
+ let metasenv,subst=unify rdb test_eq_only metasenv subst context ty1 ty2 swap in
+ let metasenv,subst=unify rdb test_eq_only metasenv subst context s1 s2 swap in
let context = (name1, C.Def (s1,ty1))::context in
- unify rdb test_eq_only metasenv subst context t1 t2
+ unify rdb test_eq_only metasenv subst context t1 t2 swap
| (C.Meta (n1,(s1,l1 as lc1)),C.Meta (n2,(s2,l2 as lc2))) when n1 = n2 ->
(try
(fun t1 t2 (metasenv, subst, to_restrict, i) ->
try
let metasenv, subst =
- unify rdb test_eq_only metasenv subst context
+ unify rdb (*test_eq_only*) true metasenv subst context
(NCicSubstitution.lift s1 t1) (NCicSubstitution.lift s2 t2)
+ swap
in
metasenv, subst, to_restrict, i-1
with UnificationFailure _ | Uncertain _ ->
let _,_,term,_ = NCicUtils.lookup_subst n1 subst in
let term1 = NCicSubstitution.subst_meta lc1 term in
let term2 = NCicSubstitution.subst_meta lc2 term in
- unify rdb test_eq_only metasenv subst context term1 term2
+ unify rdb test_eq_only metasenv subst context term1 term2 swap
with NCicUtils.Subst_not_found _-> raise (UnificationFailure msg))
| NCic.Appl (NCic.Meta (i,_)::_ as l1),
(try
List.fold_left2
(fun (metasenv, subst) t1 t2 ->
- unify rdb test_eq_only metasenv subst context t1 t2)
+ unify rdb (*test_eq_only*) true metasenv subst context t1
+ t2 swap)
(metasenv,subst) l1 l2
with Invalid_argument _ ->
raise (UnificationFailure (mk_msg metasenv subst context t1 t2)))
- | _, NCic.Meta (n, _) when is_locked n subst ->
+ | _, NCic.Meta (n, _) when is_locked n subst && not swap->
(let (metasenv, subst), i =
match NCicReduction.whd ~subst context t1 with
| NCic.Appl (NCic.Meta (i,l) as meta :: args) ->
(NCicTypeChecker.typeof ~metasenv ~subst context meta)
in
unify rdb test_eq_only metasenv subst context
- (C.Meta (i,l)) lambda_Mj,
+ (C.Meta (i,l)) lambda_Mj false,
i
| NCic.Meta (i,_) -> (metasenv, subst), i
| _ ->
let subst = List.filter (fun (j,_) -> j <> i) subst in
metasenv, ((i, (name, ctx, term, ty)) :: subst)
with Not_found -> assert false))
-
- | C.Meta (n,lc), t when List.mem_assoc n subst ->
- let _,_,term,_ = NCicUtils.lookup_subst n subst in
- let term = NCicSubstitution.subst_meta lc term in
- unify rdb test_eq_only metasenv subst context term t
+ | NCic.Meta (n, _), _ when is_locked n subst && swap ->
+ unify rdb test_eq_only metasenv subst context t2 t1 false
| t, C.Meta (n,lc) when List.mem_assoc n subst ->
let _,_,term,_ = NCicUtils.lookup_subst n subst in
let term = NCicSubstitution.subst_meta lc term in
- unify rdb test_eq_only metasenv subst context t term
-
- | NCic.Appl (NCic.Meta (i,l)::args), _ when List.mem_assoc i subst ->
- let _,_,term,_ = NCicUtils.lookup_subst i subst in
- let term = NCicSubstitution.subst_meta l term in
- unify rdb test_eq_only metasenv subst context
- (mk_appl ~upto:(List.length args) term args) t2
+ unify rdb test_eq_only metasenv subst context t term swap
+ | C.Meta (n,_), _ when List.mem_assoc n subst ->
+ unify rdb test_eq_only metasenv subst context t2 t1 (not swap)
| _, NCic.Appl (NCic.Meta (i,l)::args) when List.mem_assoc i subst ->
let _,_,term,_ = NCicUtils.lookup_subst i subst in
let term = NCicSubstitution.subst_meta l term in
unify rdb test_eq_only metasenv subst context t1
- (mk_appl ~upto:(List.length args) term args)
-
+ (mk_appl ~upto:(List.length args) term args) swap
+ | NCic.Appl (NCic.Meta (i,_)::_), _ when List.mem_assoc i subst ->
+ unify rdb test_eq_only metasenv subst context t2 t1 (not swap)
+
+ | C.Meta (n,_), C.Meta (m,lc') when
+ let _,cc1,_ = NCicUtils.lookup_meta n metasenv in
+ let _,cc2,_ = NCicUtils.lookup_meta m metasenv in
+ (n < m && cc1 = cc2) ||
+ let len1 = List.length cc1 in
+ let len2 = List.length cc2 in
+ len2 < len1 && cc2 = fst (HExtlib.split_nth len2 cc1) ->
+ instantiate rdb test_eq_only metasenv subst context m lc'
+ (NCicReduction.head_beta_reduce ~subst t1) (not swap)
| C.Meta (n,lc), t ->
instantiate rdb test_eq_only metasenv subst context n lc
- (NCicReduction.head_beta_reduce ~subst t) false
-
+ (NCicReduction.head_beta_reduce ~subst t) swap
| t, C.Meta (n,lc) ->
instantiate rdb test_eq_only metasenv subst context n lc
- (NCicReduction.head_beta_reduce ~subst t) true
+ (NCicReduction.head_beta_reduce ~subst t) (not swap)
| NCic.Appl (NCic.Meta (i,l) as meta :: args), _ ->
let metasenv, lambda_Mj =
(NCicTypeChecker.typeof ~metasenv ~subst context meta)
in
let metasenv, subst =
- try
- unify rdb test_eq_only metasenv subst context
- (C.Meta (i,l)) lambda_Mj
- with UnificationFailure msg | Uncertain msg when not norm2->
- (* failure: let's try again argument vs argument *)
- raise (KeepReducing msg)
+ unify rdb test_eq_only metasenv subst context
+ (C.Meta (i,l)) lambda_Mj swap
in
let metasenv, subst =
- unify rdb test_eq_only metasenv subst context t1 t2
+ unify rdb test_eq_only metasenv subst context t1 t2 swap
in
(try
let name, ctx, term, ty = NCicUtils.lookup_subst i subst 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) as meta :: args) ->
- let metasenv, lambda_Mj =
- lambda_intros rdb metasenv subst context (List.length args)
- (NCicTypeChecker.typeof ~metasenv ~subst context meta)
- in
- let metasenv, subst =
- try
- unify rdb test_eq_only metasenv subst context
- lambda_Mj (C.Meta (i,l))
- with UnificationFailure msg | Uncertain msg when not norm1 ->
- (* failure: let's try again argument vs argument *)
- raise (KeepReducing msg)
- 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 (_,_) :: _) ->
+ unify rdb test_eq_only metasenv subst context t2 t1 (not swap)
(* 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))
match relevance with b::tl -> b,tl | _ -> true, [] in
let metasenv, subst =
try unify rdb test_eq_only metasenv subst context t1 t2
+ swap
with UnificationFailure _ | Uncertain _ when not b ->
metasenv, subst
in
with
Invalid_argument _ ->
raise (Uncertain (mk_msg metasenv subst context t1 t2))
- | UnificationFailure _ | Uncertain _ when not (norm1 && norm2) ->
- raise (KeepReducing (mk_msg metasenv subst context t1 t2))
| KeepReducing _ | KeepReducingThis _ -> assert false
in
metasenv, subst
| (C.Match (Ref.Ref (_,Ref.Ind (_,tyno,_)) as ref1,outtype1,term1,pl1),
- C.Match (ref2,outtype2,term2,pl2)) ->
+ C.Match (ref2,outtype2,term2,pl2)) when Ref.eq ref1 ref2 ->
let _,_,itl,_,_ = NCicEnvironment.get_checked_indtys ref1 in
let _,_,ty,_ = List.nth itl tyno in
let rec remove_prods ~subst context ty =
| C.Sort C.Prop -> true
| _ -> false
in
- if not (Ref.eq ref1 ref2) then
+ (* if not (Ref.eq ref1 ref2) then
raise (Uncertain (mk_msg metasenv subst context t1 t2))
- else
+ else*)
let metasenv, subst =
- unify rdb test_eq_only metasenv subst context outtype1 outtype2 in
+ unify rdb test_eq_only metasenv subst context outtype1 outtype2 swap in
let metasenv, subst =
- try unify rdb test_eq_only metasenv subst context term1 term2
+ try unify rdb test_eq_only metasenv subst context term1 term2 swap
with UnificationFailure _ | Uncertain _ when is_prop ->
metasenv, subst
in
(try
List.fold_left2
- (fun (metasenv,subst) ->
- unify rdb test_eq_only metasenv subst context)
+ (fun (metasenv,subst) t1 t2 ->
+ unify rdb test_eq_only metasenv subst context t1 t2 swap)
(metasenv, subst) pl1 pl2
with Invalid_argument _ -> assert false)
| (C.Implicit _, _) | (_, C.Implicit _) -> assert false
| _ -> raise (KeepReducing (mk_msg metasenv subst context t1 t2))
(*D*) in outside None; rc with exn -> outside (Some exn); raise exn
in
+ let fo_unif test_eq_only metasenv subst (norm1,t1 as nt1) (norm2,t2 as nt2)=
+ try fo_unif test_eq_only metasenv subst nt1 nt2
+ with
+ UnificationFailure _ | Uncertain _ when not norm1 || not norm2 ->
+ raise (KeepReducing (mk_msg metasenv subst context t1 t2))
+ in
let try_hints metasenv subst (_,t1 as mt1) (_,t2 as mt2) (* exc*) =
+ if NCicUntrusted.metas_of_term subst context t1 = [] &&
+ NCicUntrusted.metas_of_term subst context t2 = []
+ then None
+ else begin
(*D*) inside 'H'; try let rc =
pp(lazy ("\nProblema:\n" ^
ppterm ~metasenv ~subst ~context t1 ^ " =?= " ^
let metasenv,subst =
List.fold_left
(fun (metasenv, subst) (x,y) ->
- unify rdb test_eq_only metasenv subst context x y)
- (metasenv, subst) premises
+ unify rdb test_eq_only metasenv subst context x y false)
+ (metasenv, subst) (List.rev premises)
in
pp(lazy("FUNZIONA!"));
Some (metasenv, subst)
in
cand_iter candidates
(*D*) in outside None; rc with exn -> outside (Some exn); raise exn
+ end
in
let put_in_whd m1 m2 =
NCicReduction.reduce_machine ~delta:max_int ~subst context m1,
| Uncertain _ as exn -> raise exn
| _ -> assert false
in
+ let fo_unif_heads_and_cont_or_unwind_and_hints
+ test_eq_only metasenv subst m1 m2 cont hm1 hm2
+ =
+ let ms, continuation =
+ (* calling the continuation inside the outermost try is an option
+ and makes unification stronger, but looks not frequent to me
+ that heads unify but not the arguments and that an hints can fix
+ that *)
+ try fo_unif test_eq_only metasenv subst m1 m2, cont
+ with
+ | UnificationFailure _
+ | KeepReducing _ | Uncertain _ as exn ->
+ let (t1,norm1),(t2,norm2) = hm1, hm2 in
+ match
+ try_hints metasenv subst
+ (norm1,NCicReduction.unwind t1) (norm2,NCicReduction.unwind t2)
+ with
+ | Some x -> x, fun x -> x
+ | None ->
+ match exn with
+ | KeepReducing msg -> raise (KeepReducingThis (msg,hm1,hm2))
+ | UnificationFailure _ | Uncertain _ as exn -> raise exn
+ | _ -> assert false
+ in
+ continuation ms
+ in
let height_of = function
| NCic.Const (Ref.Ref (_,Ref.Def h))
| NCic.Const (Ref.Ref (_,Ref.Fix (_,_,h)))
match t1 with
| C.Const r -> NCicEnvironment.get_relevance r
| _ -> [] *) in
- let unif_from_stack t1 t2 b metasenv subst =
+ let unif_from_stack (metasenv, subst) (t1, t2, b) =
try
let t1 = NCicReduction.from_stack ~delta:max_int t1 in
let t2 = NCicReduction.from_stack ~delta:max_int t2 in
NCicReduction.unwind (k2,e2,t2,List.rev l2),
todo
in
- let hh1,hh2,todo=check_stack (List.rev s1) (List.rev s2) relevance [] in
+ let check_stack l1 l2 r =
+ match t1, t2 with
+ | NCic.Meta _, _ | _, NCic.Meta _ ->
+ (NCicReduction.unwind (k1,e1,t1,s1)),
+ (NCicReduction.unwind (k2,e2,t2,s2)),[]
+ | _ -> check_stack l1 l2 r []
+ in
+ let hh1,hh2,todo = check_stack (List.rev s1) (List.rev s2) relevance in
try
- let metasenv,subst =
- fo_unif_w_hints test_eq_only metasenv subst (norm1,hh1) (norm2,hh2) in
- List.fold_left
- (fun (metasenv,subst) (x1,x2,r) ->
- unif_from_stack x1 x2 r metasenv subst
- ) (metasenv,subst) todo
+ fo_unif_heads_and_cont_or_unwind_and_hints
+ test_eq_only metasenv subst (norm1,hh1) (norm2,hh2)
+ (fun ms -> List.fold_left unif_from_stack ms todo)
+ m1 m2
with
| KeepReducing _ -> assert false
| KeepReducingThis _ ->
~unify:(fun m s c t1 t2 ->
let ind = !indent in
let res =
- try Some (unify rdb false m s c t1 t2 )
+ try Some (unify rdb false m s c t1 t2 false)
with UnificationFailure _ | Uncertain _ -> None
in
indent := ind; res)
;;
-let unify rdb ?(test_eq_only=false) =
+let unify rdb ?(test_eq_only=false) ?(swap=false) metasenv subst context t1 t2=
indent := "";
- unify rdb test_eq_only;;
+ unify rdb test_eq_only metasenv subst context t1 t2 swap;;
let fix_sorts m s =
fix m s true false (UnificationFailure (lazy "no sup"))
projects / helm.git / blobdiff