prerr_endline (Printf.sprintf "%-20s" !indent ^ " " ^ Lazy.force s)
;;
-(* let pp _ = ();; *)
+let pp _ = ();;
let fix_sorts swap metasenv subst context meta t =
let rec aux () = function
in
mk_lambda context 0 argsty
-and instantiate hdb test_eq_only metasenv subst context n lc t swap =
+and instantiate rdb test_eq_only metasenv subst context n lc t swap =
(*D*) inside 'I'; try let rc =
pp (lazy(string_of_int n ^ " :=?= "^
NCicPp.ppterm ~metasenv ~subst ~context t));
let unify test_eq_only m s c t1 t2 =
- if swap then unify hdb test_eq_only m s c t2 t1
- else unify hdb test_eq_only m s c t1 t2
+ if swap then unify rdb test_eq_only m s c t2 t1
+ else unify rdb test_eq_only m s c t1 t2
in
let name, ctx, ty = NCicUtils.lookup_meta n metasenv in
let metasenv, subst, t =
metasenv, subst
(*D*) in outside(); rc with exn -> outside (); raise exn
-and unify hdb test_eq_only metasenv subst context t1 t2 =
+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 =
| (C.Lambda (name1,s1,t1), C.Lambda(_,s2,t2))
| (C.Prod (name1,s1,t1), C.Prod(_,s2,t2)) ->
- let metasenv, subst = unify hdb true metasenv subst context s1 s2 in
- unify hdb test_eq_only metasenv subst ((name1, C.Decl s1)::context) t1 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
| (C.LetIn (name1,ty1,s1,t1), C.LetIn(_,ty2,s2,t2)) ->
- let metasenv,subst=unify hdb test_eq_only metasenv subst context ty1 ty2 in
- let metasenv,subst=unify hdb test_eq_only metasenv subst context s1 s2 in
+ 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 context = (name1, C.Def (s1,ty1))::context in
- unify hdb test_eq_only metasenv subst context t1 t2
+ unify rdb test_eq_only metasenv subst context t1 t2
| (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 hdb test_eq_only metasenv subst context
+ unify rdb test_eq_only metasenv subst context
(NCicSubstitution.lift s1 t1) (NCicSubstitution.lift s2 t2)
in
metasenv, subst, to_restrict, i-1
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 hdb test_eq_only metasenv subst context term1 term2
+ unify rdb test_eq_only metasenv subst context term1 term2
with NCicUtils.Subst_not_found _-> raise (UnificationFailure msg))
| _, NCic.Meta (n, _) when is_locked n subst ->
let metasenv, lambda_Mj =
lambda_intros metasenv subst context t1 args
in
- unify hdb test_eq_only metasenv subst context
+ unify rdb test_eq_only metasenv subst context
(C.Meta (i,l)) lambda_Mj,
i
| NCic.Meta (i,_) -> (metasenv, subst), i
match t1 with NCic.Meta (j,l) -> j, l | _ -> assert false
in
let metasenv, subst =
- instantiate hdb test_eq_only metasenv subst context j lj t2 true
+ instantiate rdb test_eq_only metasenv subst context j lj t2 true
in
(try
let name, ctx, term, ty = NCicUtils.lookup_subst i subst in
(try
let _,_,term,_ = NCicUtils.lookup_subst n subst in
let term = NCicSubstitution.subst_meta lc term in
- unify hdb test_eq_only metasenv subst context term t
+ unify rdb test_eq_only metasenv subst context term t
with NCicUtils.Subst_not_found _->
- instantiate hdb test_eq_only metasenv subst context n lc
+ instantiate rdb test_eq_only metasenv subst context n lc
(NCicReduction.head_beta_reduce ~subst t) false)
| t, C.Meta (n,lc) ->
(try
let _,_,term,_ = NCicUtils.lookup_subst n subst in
let term = NCicSubstitution.subst_meta lc term in
- unify hdb test_eq_only metasenv subst context t term
+ unify rdb test_eq_only metasenv subst context t term
with NCicUtils.Subst_not_found _->
- instantiate hdb test_eq_only metasenv subst context n lc
+ instantiate rdb test_eq_only metasenv subst context n lc
(NCicReduction.head_beta_reduce ~subst t) true)
| 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 hdb test_eq_only metasenv subst context
+ unify rdb test_eq_only metasenv subst context
(mk_appl ~upto:(List.length args) term args) t2
| _, 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 hdb test_eq_only metasenv subst context t1
+ unify rdb test_eq_only metasenv subst context t1
(mk_appl ~upto:(List.length args) term args)
| NCic.Appl (NCic.Meta (i,_)::_ as l1),
(try
List.fold_left2
(fun (metasenv, subst) t1 t2 ->
- unify hdb test_eq_only metasenv subst context t1 t2)
+ unify rdb test_eq_only metasenv subst context t1 t2)
(metasenv,subst) l1 l2
with Invalid_argument _ ->
raise (fail_exc metasenv subst context t1 t2))
lambda_intros metasenv subst context t1 args
in
let metasenv, subst =
- unify hdb test_eq_only metasenv subst context
+ unify rdb test_eq_only metasenv subst context
(C.Meta (i,l)) lambda_Mj
in
let metasenv, subst =
- unify hdb test_eq_only metasenv subst context t1 t2
+ unify rdb test_eq_only metasenv subst context t1 t2
in
(try
let name, ctx, term, ty = NCicUtils.lookup_subst i subst in
lambda_intros metasenv subst context t2 args
in
let metasenv, subst =
- unify hdb test_eq_only metasenv subst context
+ unify rdb test_eq_only metasenv subst context
lambda_Mj (C.Meta (i,l))
in
let metasenv, subst =
- unify hdb test_eq_only metasenv subst context t1 t2
+ unify rdb test_eq_only metasenv subst context t1 t2
in
(try
let name, ctx, term, ty = NCicUtils.lookup_subst i subst in
let relevance = NCicEnvironment.get_relevance r1 in
let relevance = match r1 with
| Ref.Ref (_,Ref.Con (_,_,lno)) ->
- let _,relevance = HExtlib.split_nth lno relevance in
+ let relevance =
+ try snd (HExtlib.split_nth lno relevance)
+ with Failure _ -> []
+ in
HExtlib.mk_list false lno @ relevance
| _ -> relevance
in
let b, relevance =
match relevance with b::tl -> b,tl | _ -> true, [] in
let metasenv, subst =
- try unify hdb test_eq_only metasenv subst context t1 t2
+ try unify rdb test_eq_only metasenv subst context t1 t2
with UnificationFailure _ | Uncertain _ when not b ->
metasenv, subst
in
raise (uncert_exc metasenv subst context t1 t2)
else
let metasenv, subst =
- unify hdb test_eq_only metasenv subst context outtype1 outtype2 in
+ unify rdb test_eq_only metasenv subst context outtype1 outtype2 in
let metasenv, subst =
- try unify hdb test_eq_only metasenv subst context term1 term2
+ try unify rdb test_eq_only metasenv subst context term1 term2
with UnificationFailure _ | Uncertain _ when is_prop ->
metasenv, subst
in
(try
List.fold_left2
(fun (metasenv,subst) ->
- unify hdb test_eq_only metasenv subst context)
+ unify rdb test_eq_only metasenv subst context)
(metasenv, subst) pl1 pl2
with Invalid_argument _ ->
raise (uncert_exc metasenv subst context t1 t2))
NCicPp.ppterm ~metasenv ~subst ~context t2);
*)
let candidates =
- NCicUnifHint.look_for_hint hdb metasenv subst context t1 t2
+ NCicUnifHint.look_for_hint rdb metasenv subst context t1 t2
in
let rec cand_iter = function
| [] -> None (* raise exc *)
let metasenv,subst =
List.fold_left
(fun (metasenv, subst) (x,y) ->
- unify hdb test_eq_only metasenv subst context x y)
+ unify rdb test_eq_only metasenv subst context x y)
(metasenv, subst) premises
in
Some (metasenv, subst)
(*D*) in outside(); rc with exn -> outside (); raise exn
;;
-let unify hdb =
+let unify rdb ?(test_eq_only=false) =
indent := "";
- unify hdb false;;
-
-
+ unify rdb test_eq_only;;