if k = 0 then t
else
NCicSubstitution.psubst ~avoid_beta_redexes:true
- true 0 (RS.from_env_for_unwind ~unwind) e t
+ (RS.from_env_for_unwind ~unwind) e t
in
if s = [] then t
else NCic.Appl(t::(RS.from_stack_list_for_unwind ~unwind s))
in
aux (k, e, he, tl' @ s)
| (_, _, NCic.Const
- (NReference.Ref (height,_,NReference.Def) as refer), s) as config ->
- if delta > height then config else
+ (NReference.Ref (_,NReference.Def height) as refer), s) as config ->
+ if delta >= height then config else
let _,_,body,_,_,_ = NCicEnvironment.get_checked_def refer in
aux (0, [], body, s)
+ | (_, _, NCic.Const (NReference.Ref (_,
+ (NReference.Decl|NReference.Ind _|NReference.Con _|NReference.CoFix _))), _) as config -> config
| (_, _, NCic.Const (NReference.Ref
- (height,_,NReference.Fix (fixno,recindex)) as refer),s) as config ->
- if delta > height then config else
+ (_,NReference.Fix (fixno,recindex,height)) as refer),s) as config ->
+ if delta >= height then config else
(match
try Some (RS.from_stack (List.nth s recindex))
with Failure _ -> None
| Some recparam ->
let fixes,_,_ = NCicEnvironment.get_checked_fixes_or_cofixes refer in
match reduce ~delta:0 ~subst context recparam with
- | (_,_,NCic.Const (NReference.Ref (_,_,NReference.Con _)), _) as c ->
+ | (_,_,NCic.Const (NReference.Ref (_,NReference.Con _)), _) as c ->
let new_s =
replace recindex s (RS.compute_to_stack ~reduce:aux ~unwind c)
in
let _,_,_,_,body = List.nth fixes fixno in
aux (0, [], body, new_s)
| _ -> config)
- | (_, _, NCic.Const _, _) as config -> config
| (k, e, NCic.Match (_,_,term,pl),s) as config ->
let decofix = function
- | (_,_,NCic.Const(NReference.Ref(_,_,NReference.CoFix c)as refer),s)->
+ | (_,_,NCic.Const(NReference.Ref(_,NReference.CoFix c)as refer),s)->
let cofixes,_,_ = NCicEnvironment.get_checked_fixes_or_cofixes refer in
let _,_,_,_,body = List.nth cofixes c in
reduce ~delta:0 ~subst context (0,[],body,s)
| config -> config
in
(match decofix (reduce ~delta:0 ~subst context (k,e,term,[])) with
- | (_, _, NCic.Const (NReference.Ref (_,_,NReference.Con (_,j))),[]) ->
+ | (_, _, NCic.Const (NReference.Ref (_,NReference.Con (_,j))),[]) ->
aux (k, e, List.nth pl (j-1), s)
| (_, _, NCic.Const
- (NReference.Ref (_,_,NReference.Con (_,j)) as refer), s') ->
+ (NReference.Ref (_,NReference.Con (_,j)) as refer), s') ->
let leftno = NCicEnvironment.get_indty_leftno refer in
let _,params = HExtlib.split_nth leftno s' in
aux (k, e, List.nth pl (j-1), params@s)
module C = NCic
(* t1, t2 must be well-typed *)
-let are_convertible whd ?(subst=[]) ?(metasenv=[]) =
- let rec aux test_equality_only context t1 t2 =
- let rec aux2 test_equality_only t1 t2 =
+let are_convertible whd ?(subst=[]) =
+ let rec aux test_eq_only context t1 t2 =
+ let rec alpha_eq test_eq_only t1 t2 =
if t1 === t2 then
true
else
match (t1,t2) with
- | (C.Sort (C.Type a), C.Sort (C.Type b)) -> a <= b
- | (C.Sort s1,C.Sort (C.Type _)) -> (not test_equality_only)
+ | (C.Sort (C.Type a), C.Sort (C.Type b)) when not test_eq_only -> a <= b
+ | (C.Sort s1,C.Sort (C.Type _)) -> (not test_eq_only)
| (C.Sort s1, C.Sort s2) -> s1 = s2
| (C.Prod (name1,s1,t1), C.Prod(_,s2,t2)) ->
aux true context s1 s2 &&
- aux test_equality_only ((name1, C.Decl s1)::context) t1 t2
+ aux test_eq_only ((name1, C.Decl s1)::context) t1 t2
| (C.Lambda (name1,s1,t1), C.Lambda(_,s2,t2)) ->
aux true context s1 s2 &&
- aux true ((name1, C.Decl s1)::context) t1 t2
+ aux test_eq_only ((name1, C.Decl s1)::context) t1 t2
| (C.LetIn (name1,ty1,s1,t1), C.LetIn(_,ty2,s2,t2)) ->
- aux test_equality_only context ty1 ty2 &&
- aux test_equality_only context s1 s2 &&
- aux test_equality_only ((name1, C.Def (s1,ty1))::context) t1 t2
+ aux test_eq_only context ty1 ty2 &&
+ aux test_eq_only context s1 s2 &&
+ aux test_eq_only ((name1, C.Def (s1,ty1))::context) t1 t2
| (C.Meta (n1,(s1, C.Irl i1)), C.Meta (n2,(s2, C.Irl i2)))
when n1 = n2 && s1 = s2 -> true
- | (C.Meta (n1,(s1, l1)), C.Meta (n2,(s2, l2))) when n1 = n2 ->
+ | (C.Meta (n1,(s1, l1)), C.Meta (n2,(s2, l2))) when n1 = n2 &&
let l1 = NCicUtils.expand_local_context l1 in
let l2 = NCicUtils.expand_local_context l2 in
(try List.for_all2
- (fun t1 t2 -> aux test_equality_only context
+ (fun t1 t2 -> aux test_eq_only context
(NCicSubstitution.lift s1 t1)
(NCicSubstitution.lift s2 t2))
l1 l2
- with Invalid_argument _ -> false)
+ with Invalid_argument _ -> assert false) -> true
| C.Meta (n1,l1), _ ->
(try
let _,_,term,_ = NCicUtils.lookup_subst n1 subst in
let term = NCicSubstitution.subst_meta l1 term in
- aux test_equality_only context term t2
+ aux test_eq_only context term t2
with NCicUtils.Subst_not_found _ -> false)
| _, C.Meta (n2,l2) ->
(try
let _,_,term,_ = NCicUtils.lookup_subst n2 subst in
let term = NCicSubstitution.subst_meta l2 term in
- aux test_equality_only context t1 term
+ aux test_eq_only context t1 term
with NCicUtils.Subst_not_found _ -> false)
+ | (C.Appl (C.Const r1::tl1), C.Appl (C.Const r2::tl2)) ->
+ r1 = r2 &&
+ let relevance = NCicEnvironment.get_relevance r1 in
+ (try
+ HExtlib.list_forall_default3
+ (fun t1 t2 b -> not b || aux test_eq_only context t1 t2)
+ tl1 tl2 true relevance
+ with Invalid_argument _ -> false)
+
| (C.Appl l1, C.Appl l2) ->
- (try List.for_all2 (aux test_equality_only context) l1 l2
+ (try List.for_all2 (aux test_eq_only context) l1 l2
with Invalid_argument _ -> false)
| (C.Match (ref1,outtype1,term1,pl1),
C.Match (ref2,outtype2,term2,pl2)) ->
NReference.eq ref1 ref2 &&
- aux test_equality_only context outtype1 outtype2 &&
- aux test_equality_only context term1 term2 &&
- (try List.for_all2 (aux test_equality_only context) pl1 pl2
+ aux test_eq_only context outtype1 outtype2 &&
+ aux test_eq_only context term1 term2 &&
+ (try List.for_all2 (aux test_eq_only context) pl1 pl2
with Invalid_argument _ -> false)
| (C.Implicit _, _) | (_, C.Implicit _) -> assert false
| (_,_) -> false
in
- if aux2 test_equality_only t1 t2 then
+ if alpha_eq test_eq_only t1 t2 then
true
else
- let rec convert_machines = function
- | [] -> true
- | ((k1,env1,h1,s1),(k2,env2,h2,s2))::tl ->
- aux2 test_equality_only
- (R.unwind (k1,env1,h1,[])) (R.unwind (k2,env2,h2,[])) &&
- let problems =
- let red_stack =
- List.map
- (fun si-> R.reduce ~delta:0 ~subst context(RS.from_stack si))
- in
- try Some (List.combine (red_stack s1) (red_stack s2) @ tl)
- with Invalid_argument _ -> None
- in
- match problems with
- | None -> false
- | Some problems -> convert_machines problems
+ let height_of = function
+ | NCic.Const (NReference.Ref (_,NReference.Def h))
+ | NCic.Const (NReference.Ref (_,NReference.Fix (_,_,h)))
+ | NCic.Appl(NCic.Const(NReference.Ref(_,NReference.Def h))::_)
+ | NCic.Appl(NCic.Const(NReference.Ref(_,NReference.Fix (_,_,h)))::_) -> h
+ | _ -> 0
+ in
+ let small_delta_step (_,_,t1,_ as m1) (_,_,t2,_ as m2) =
+ let h1 = height_of t1 in
+ let h2 = height_of t2 in
+ let delta = if h1 = h2 then max 0 (h1 -1) else min h1 h2 in
+ R.reduce ~delta ~subst context m1,
+ R.reduce ~delta ~subst context m2,
+ delta
+ in
+ let rec convert_machines ((k1,e1,t1,s1 as m1),(k2,e2,t2,s2 as m2),delta) =
+ (alpha_eq test_eq_only
+ (R.unwind (k1,e1,t1,[])) (R.unwind (k2,e2,t2,[])) &&
+ let relevance =
+ match t1 with
+ C.Const r -> NCicEnvironment.get_relevance r
+ | _ -> [] in
+ try
+ HExtlib.list_forall_default3
+ (fun t1 t2 b ->
+ not b ||
+ let t1 = RS.from_stack t1 in
+ let t2 = RS.from_stack t2 in
+ convert_machines (small_delta_step t1 t2)) s1 s2 true relevance
+ with Invalid_argument _ -> false) ||
+ (delta > 0 &&
+ let delta = delta - 1 in
+ let red = R.reduce ~delta ~subst context in
+ convert_machines (red m1,red m2,delta))
in
- convert_machines
- [R.reduce ~delta:0 ~subst context (0,[],t1,[]),
- R.reduce ~delta:0 ~subst context (0,[],t2,[])]
+ convert_machines (small_delta_step (0,[],t1,[]) (0,[],t2,[]))
in
aux false
;;
| _, C.Lambda(_,_,bo), arg::tl ->
let bo = NCicSubstitution.subst arg bo in
head_beta_reduce ~delta ~upto:(upto - 1) bo tl
- | _, C.Const (NReference.Ref (height, _, NReference.Def) as re), _
+ | _, C.Const (NReference.Ref (_, NReference.Def height) as re), _
when delta <= height ->
let _, _, bo, _, _, _ = NCicEnvironment.get_checked_def re in
head_beta_reduce ~upto ~delta bo l
projects / helm.git / blobdiff