X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicReduction.ml;h=1815ceedfcf5c87e9d387068ffbfb039c76763ff;hb=1b70a1f66be53f76e475383e86d63c2b5c1fbcaa;hp=9e43d0e24e6ef4a596d0f127007b1980924e642a;hpb=55c3395a0151d9943702ed87342471f1b15f3802;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicReduction.ml b/helm/software/components/ng_kernel/nCicReduction.ml index 9e43d0e24..1815ceedf 100644 --- a/helm/software/components/ng_kernel/nCicReduction.ml +++ b/helm/software/components/ng_kernel/nCicReduction.ml @@ -11,47 +11,42 @@ (* $Id$ *) -(* TODO unify exceptions *) +module C = NCic +module Ref = NReference +module E = NCicEnvironment + +exception AssertFailure of string Lazy.t;; -module type Strategy = - sig +module type Strategy = sig type stack_term type env_term - type config = int * env_term list * NCic.term * stack_term list + type config = int * env_term list * C.term * stack_term list val to_env : - reduce: (config -> config) -> - unwind: (config -> NCic.term) -> - config -> env_term + reduce: (config -> config * bool) -> unwind: (config -> C.term) -> + config -> env_term val from_stack : stack_term -> config val from_stack_list_for_unwind : - unwind: (config -> NCic.term) -> - stack_term list -> NCic.term list + unwind: (config -> C.term) -> stack_term list -> C.term list val from_env : env_term -> config val from_env_for_unwind : - unwind: (config -> NCic.term) -> - env_term -> NCic.term + unwind: (config -> C.term) -> env_term -> C.term val stack_to_env : - reduce: (config -> config) -> - unwind: (config -> NCic.term) -> - stack_term -> env_term + reduce: (config -> config * bool) -> unwind: (config -> C.term) -> + stack_term -> env_term val compute_to_env : - reduce: (config -> config) -> - unwind: (config -> NCic.term) -> - int -> env_term list -> - NCic.term -> env_term + reduce: (config -> config * bool) -> unwind: (config -> C.term) -> + int -> env_term list -> C.term -> env_term val compute_to_stack : - reduce: (config -> config) -> - unwind: (config -> NCic.term) -> - config -> stack_term + reduce: (config -> config * bool) -> unwind: (config -> C.term) -> + config -> stack_term end ;; -module CallByValueByNameForUnwind' = - struct - type config = int * env_term list * NCic.term * stack_term list - and stack_term = config lazy_t * NCic.term lazy_t (* cbv, cbn *) - and env_term = config lazy_t * NCic.term lazy_t (* cbv, cbn *) - let to_env ~reduce ~unwind c = lazy (reduce c),lazy (unwind c) +module CallByValueByNameForUnwind' = struct + type config = int * env_term list * C.term * stack_term list + and stack_term = config lazy_t * C.term lazy_t (* cbv, cbn *) + and env_term = config lazy_t * C.term lazy_t (* cbv, cbn *) + let to_env ~reduce ~unwind c = lazy (fst (reduce c)),lazy (unwind c) let from_stack (c,_) = Lazy.force c let from_stack_list_for_unwind ~unwind:_ l = List.map (function (_,c) -> Lazy.force c) l @@ -59,292 +54,16 @@ module CallByValueByNameForUnwind' = let from_env_for_unwind ~unwind:_ (_,c) = Lazy.force c let stack_to_env ~reduce:_ ~unwind:_ config = config let compute_to_env ~reduce ~unwind k e t = - lazy (reduce (k,e,t,[])), lazy (unwind (k,e,t,[])) + lazy (fst (reduce (k,e,t,[]))), lazy (unwind (k,e,t,[])) let compute_to_stack ~reduce ~unwind config = - lazy (reduce config), lazy (unwind config) + lazy (fst (reduce config)), lazy (unwind config) end ;; - -(* {{{ module CallByValueByNameForUnwind = - struct - type config = int * env_term list * ens_term Cic.explicit_named_substitution * Cic.term * stack_term list - and stack_term = config - and env_term = config * config (* cbv, cbn *) - and ens_term = config * config (* cbv, cbn *) - - let to_env c = c,c - let to_ens c = c,c - let from_stack config = config - let from_stack_list_for_unwind ~unwind l = List.map unwind l - let from_env (c,_) = c - let from_ens (c,_) = c - let from_env_for_unwind ~unwind (_,c) = unwind c - let from_ens_for_unwind ~unwind (_,c) = unwind c - let stack_to_env ~reduce ~unwind config = reduce config, (0,[],[],unwind config,[]) - let compute_to_env ~reduce ~unwind k e ens t = (k,e,ens,t,[]), (k,e,ens,t,[]) - let compute_to_stack ~reduce ~unwind config = config - end -;; - - -(* Old Machine *) -module CallByNameStrategy = - struct - type stack_term = Cic.term - type env_term = Cic.term - type ens_term = Cic.term - type config = int * env_term list * ens_term Cic.explicit_named_substitution * Cic.term * stack_term list - let to_env v = v - let to_ens v = v - let from_stack ~unwind v = v - let from_stack_list ~unwind l = l - let from_env v = v - let from_ens v = v - let from_env_for_unwind ~unwind v = v - let from_ens_for_unwind ~unwind v = v - let stack_to_env ~reduce ~unwind v = v - let compute_to_stack ~reduce ~unwind k e ens t = unwind k e ens t - let compute_to_env ~reduce ~unwind k e ens t = unwind k e ens t - end -;; - -module CallByNameStrategy = - struct - type config = int * env_term list * ens_term Cic.explicit_named_substitution * Cic.term * stack_term list - and stack_term = config - and env_term = config - and ens_term = config - - let to_env c = c - let to_ens c = c - let from_stack config = config - let from_stack_list_for_unwind ~unwind l = List.map unwind l - let from_env c = c - let from_ens c = c - let from_env_for_unwind ~unwind c = unwind c - let from_ens_for_unwind ~unwind c = unwind c - let stack_to_env ~reduce ~unwind config = 0,[],[],unwind config,[] - let compute_to_env ~reduce ~unwind k e ens t = k,e,ens,t,[] - let compute_to_stack ~reduce ~unwind config = config - end -;; - -module CallByValueStrategy = - struct - type stack_term = Cic.term - type env_term = Cic.term - type ens_term = Cic.term - type config = int * env_term list * ens_term Cic.explicit_named_substitution * Cic.term * stack_term list - let to_env v = v - let to_ens v = v - let from_stack ~unwind v = v - let from_stack_list ~unwind l = l - let from_env v = v - let from_ens v = v - let from_env_for_unwind ~unwind v = v - let from_ens_for_unwind ~unwind v = v - let stack_to_env ~reduce ~unwind v = v - let compute_to_stack ~reduce ~unwind k e ens t = reduce (k,e,ens,t,[]) - let compute_to_env ~reduce ~unwind k e ens t = reduce (k,e,ens,t,[]) - end -;; - -module CallByValueStrategyByNameOnConstants = - struct - type stack_term = Cic.term - type env_term = Cic.term - type ens_term = Cic.term - type config = int * env_term list * ens_term Cic.explicit_named_substitution * Cic.term * stack_term list - let to_env v = v - let to_ens v = v - let from_stack ~unwind v = v - let from_stack_list ~unwind l = l - let from_env v = v - let from_ens v = v - let from_env_for_unwind ~unwind v = v - let from_ens_for_unwind ~unwind v = v - let stack_to_env ~reduce ~unwind v = v - let compute_to_stack ~reduce ~unwind k e ens = - function - Cic.Const _ as t -> unwind k e ens t - | t -> reduce (k,e,ens,t,[]) - let compute_to_env ~reduce ~unwind k e ens = - function - Cic.Const _ as t -> unwind k e ens t - | t -> reduce (k,e,ens,t,[]) - end -;; - -module LazyCallByValueStrategy = - struct - type stack_term = Cic.term lazy_t - type env_term = Cic.term lazy_t - type ens_term = Cic.term lazy_t - type config = int * env_term list * ens_term Cic.explicit_named_substitution * Cic.term * stack_term list - let to_env v = lazy v - let to_ens v = lazy v - let from_stack ~unwind v = Lazy.force v - let from_stack_list ~unwind l = List.map (from_stack ~unwind) l - let from_env v = Lazy.force v - let from_ens v = Lazy.force v - let from_env_for_unwind ~unwind v = Lazy.force v - let from_ens_for_unwind ~unwind v = Lazy.force v - let stack_to_env ~reduce ~unwind v = v - let compute_to_stack ~reduce ~unwind k e ens t = lazy (reduce (k,e,ens,t,[])) - let compute_to_env ~reduce ~unwind k e ens t = lazy (reduce (k,e,ens,t,[])) - end -;; - -module LazyCallByValueStrategyByNameOnConstants = - struct - type stack_term = Cic.term lazy_t - type env_term = Cic.term lazy_t - type ens_term = Cic.term lazy_t - type config = int * env_term list * ens_term Cic.explicit_named_substitution * Cic.term * stack_term list - let to_env v = lazy v - let to_ens v = lazy v - let from_stack ~unwind v = Lazy.force v - let from_stack_list ~unwind l = List.map (from_stack ~unwind) l - let from_env v = Lazy.force v - let from_ens v = Lazy.force v - let from_env_for_unwind ~unwind v = Lazy.force v - let from_ens_for_unwind ~unwind v = Lazy.force v - let stack_to_env ~reduce ~unwind v = v - let compute_to_stack ~reduce ~unwind k e ens t = - lazy ( - match t with - Cic.Const _ as t -> unwind k e ens t - | t -> reduce (k,e,ens,t,[])) - let compute_to_env ~reduce ~unwind k e ens t = - lazy ( - match t with - Cic.Const _ as t -> unwind k e ens t - | t -> reduce (k,e,ens,t,[])) - end -;; - -module LazyCallByNameStrategy = - struct - type stack_term = Cic.term lazy_t - type env_term = Cic.term lazy_t - type ens_term = Cic.term lazy_t - type config = int * env_term list * ens_term Cic.explicit_named_substitution * Cic.term * stack_term list - let to_env v = lazy v - let to_ens v = lazy v - let from_stack ~unwind v = Lazy.force v - let from_stack_list ~unwind l = List.map (from_stack ~unwind) l - let from_env v = Lazy.force v - let from_ens v = Lazy.force v - let from_env_for_unwind ~unwind v = Lazy.force v - let from_ens_for_unwind ~unwind v = Lazy.force v - let stack_to_env ~reduce ~unwind v = v - let compute_to_stack ~reduce ~unwind k e ens t = lazy (unwind k e ens t) - let compute_to_env ~reduce ~unwind k e ens t = lazy (unwind k e ens t) - end -;; - -module - LazyCallByValueByNameOnConstantsWhenFromStack_ByNameStrategyWhenFromEnvOrEns -= - struct - type stack_term = reduce:bool -> Cic.term - type env_term = reduce:bool -> Cic.term - type ens_term = reduce:bool -> Cic.term - type config = int * env_term list * ens_term Cic.explicit_named_substitution * Cic.term * stack_term list - let to_env v = - let value = lazy v in - fun ~reduce -> Lazy.force value - let to_ens v = - let value = lazy v in - fun ~reduce -> Lazy.force value - let from_stack ~unwind v = (v ~reduce:false) - let from_stack_list ~unwind l = List.map (from_stack ~unwind) l - let from_env v = (v ~reduce:true) - let from_ens v = (v ~reduce:true) - let from_env_for_unwind ~unwind v = (v ~reduce:true) - let from_ens_for_unwind ~unwind v = (v ~reduce:true) - let stack_to_env ~reduce ~unwind v = v - let compute_to_stack ~reduce ~unwind k e ens t = - let svalue = - lazy ( - match t with - Cic.Const _ as t -> unwind k e ens t - | t -> reduce (k,e,ens,t,[]) - ) in - let lvalue = - lazy (unwind k e ens t) - in - fun ~reduce -> - if reduce then Lazy.force svalue else Lazy.force lvalue - let compute_to_env ~reduce ~unwind k e ens t = - let svalue = - lazy ( - match t with - Cic.Const _ as t -> unwind k e ens t - | t -> reduce (k,e,ens,t,[]) - ) in - let lvalue = - lazy (unwind k e ens t) - in - fun ~reduce -> - if reduce then Lazy.force svalue else Lazy.force lvalue - end -;; - -module ClosuresOnStackByValueFromEnvOrEnsStrategy = - struct - type config = int * env_term list * ens_term Cic.explicit_named_substitution * Cic.term * stack_term list - and stack_term = config - and env_term = config - and ens_term = config - - let to_env config = config - let to_ens config = config - let from_stack config = config - let from_stack_list_for_unwind ~unwind l = List.map unwind l - let from_env v = v - let from_ens v = v - let from_env_for_unwind ~unwind config = unwind config - let from_ens_for_unwind ~unwind config = unwind config - let stack_to_env ~reduce ~unwind config = reduce config - let compute_to_env ~reduce ~unwind k e ens t = (k,e,ens,t,[]) - let compute_to_stack ~reduce ~unwind config = config - end -;; - -module ClosuresOnStackByValueFromEnvOrEnsByNameOnConstantsStrategy = - struct - type stack_term = - int * Cic.term list * Cic.term Cic.explicit_named_substitution * Cic.term - type env_term = Cic.term - type ens_term = Cic.term - type config = int * env_term list * ens_term Cic.explicit_named_substitution * Cic.term * stack_term list - let to_env v = v - let to_ens v = v - let from_stack ~unwind (k,e,ens,t) = unwind k e ens t - let from_stack_list ~unwind l = List.map (from_stack ~unwind) l - let from_env v = v - let from_ens v = v - let from_env_for_unwind ~unwind v = v - let from_ens_for_unwind ~unwind v = v - let stack_to_env ~reduce ~unwind (k,e,ens,t) = - match t with - Cic.Const _ as t -> unwind k e ens t - | t -> reduce (k,e,ens,t,[]) - let compute_to_env ~reduce ~unwind k e ens t = - unwind k e ens t - let compute_to_stack ~reduce ~unwind k e ens t = (k,e,ens,t) - end -;; - -}}} *) - -module Reduction(RS : Strategy) = - struct +module Reduction(RS : Strategy) = struct type env = RS.env_term list type stack = RS.stack_term list - type config = int * env * NCic.term * stack + type config = int * env * C.term * stack let rec unwind (k,e,t,s) = let t = @@ -354,7 +73,7 @@ module Reduction(RS : Strategy) = (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)) + else C.Appl(t::(RS.from_stack_list_for_unwind ~unwind s)) ;; let list_nth l n = try List.nth l n with Failure _ -> assert false;; @@ -365,154 +84,142 @@ module Reduction(RS : Strategy) = | _,_ -> assert false ;; - let rec reduce ~delta ?(subst = []) context : config -> config = + let rec reduce ~delta ?(subst = []) context : config -> config * bool = let rec aux = function - | k, e, NCic.Rel n, s when n <= k -> + | k, e, C.Rel n, s when n <= k -> let k',e',t',s' = RS.from_env (list_nth e (n-1)) in aux (k',e',t',s'@s) - | k, _, NCic.Rel n, s as config (* when n > k *) -> + | k, _, C.Rel n, s as config (* when n > k *) -> let x= try Some (List.nth context (n - 1 - k)) with Failure _ -> None in (match x with - | Some(_,NCic.Def(x,_)) -> aux (0,[],NCicSubstitution.lift (n - k) x,s) - | _ -> config) - | (k, e, NCic.Meta (n,l), s) as config -> + | Some(_,C.Def(x,_)) -> aux (0,[],NCicSubstitution.lift (n - k) x,s) + | _ -> config, true) + | (k, e, C.Meta (n,l), s) as config -> (try let _,_, term,_ = NCicUtils.lookup_subst n subst in aux (k, e, NCicSubstitution.subst_meta l term,s) - with NCicUtils.Subst_not_found _ -> config) - | (_, _, NCic.Sort _, _) as config -> config - | (_, _, NCic.Implicit _, _) -> assert false - | (_, _, NCic.Prod _, _) as config -> config - | (_, _, NCic.Lambda _, []) as config -> config - | (k, e, NCic.Lambda (_,_,t), p::s) -> + with NCicUtils.Subst_not_found _ -> config, true) + | (_, _, C.Implicit _, _) -> assert false + | (_, _, C.Sort _, _) + | (_, _, C.Prod _, _) + | (_, _, C.Lambda _, []) as config -> config, true + | (k, e, C.Lambda (_,_,t), p::s) -> aux (k+1, (RS.stack_to_env ~reduce:aux ~unwind p)::e, t,s) - | (k, e, NCic.LetIn (_,_,m,t), s) -> + | (k, e, C.LetIn (_,_,m,t), s) -> let m' = RS.compute_to_env ~reduce:aux ~unwind k e m in aux (k+1, m'::e, t, s) - | (_, _, NCic.Appl [], _) -> assert false - | (k, e, NCic.Appl (he::tl), s) -> + | (_, _, C.Appl ([]|[_]), _) -> assert false + | (k, e, C.Appl (he::tl), s) -> let tl' = List.map (fun t->RS.compute_to_stack ~reduce:aux ~unwind (k,e,t,[])) tl in aux (k, e, he, tl' @ s) - | (_, _, NCic.Const - (NReference.Ref (_,NReference.Def height) as refer), s) as config -> - if delta >= height then config else + | (_, _, C.Const + (Ref.Ref (_,Ref.Def height) as refer), s) as config -> + if delta >= height then + config, false + 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 - (_,NReference.Fix (fixno,recindex,height)) as refer),s) as config -> - if delta >= height then config else + | (_, _, C.Const (Ref.Ref (_, + (Ref.Decl|Ref.Ind _|Ref.Con _|Ref.CoFix _))), _) as config -> + config, true + | (_, _, (C.Const (Ref.Ref + (_,Ref.Fix (fixno,recindex,height)) as refer) as head),s) as config -> +(* if delta >= height then config else *) (match try Some (RS.from_stack (List.nth s recindex)) with Failure _ -> None with - | None -> config + | None -> config, true | 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 -> + | (_,_,C.Const (Ref.Ref (_,Ref.Con _)), _) as c, _ + when delta >= height -> + let new_s = + replace recindex s (RS.compute_to_stack ~reduce:aux ~unwind c) + in + (0, [], head, new_s), false + | (_,_,C.Const (Ref.Ref (_,Ref.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) - | (k, e, NCic.Match (_,_,term,pl),s) as config -> + | _ -> config, true) + | (k, e, C.Match (_,_,term,pl),s) as config -> let decofix = function - | (_,_,NCic.Const(NReference.Ref(_,NReference.CoFix c)as refer),s)-> - let cofixes,_,_ = NCicEnvironment.get_checked_fixes_or_cofixes refer in + | (_,_,C.Const(Ref.Ref(_,Ref.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) + let c,_ = reduce ~delta:0 ~subst context (0,[],body,s) in + c | config -> config in - (match decofix (reduce ~delta:0 ~subst context (k,e,term,[])) with - | (_, _, NCic.Const (NReference.Ref (_,NReference.Con (_,j))),[]) -> + let match_head = k,e,term,[] in + let reduced,_ = reduce ~delta:0 ~subst context match_head in + (match decofix reduced with + | (_, _, C.Const (Ref.Ref (_,Ref.Con (_,j,_))),[]) -> aux (k, e, List.nth pl (j-1), s) - | (_, _, NCic.Const - (NReference.Ref (_,NReference.Con (_,j)) as refer), s') -> - let leftno = NCicEnvironment.get_indty_leftno refer in - let _,params = HExtlib.split_nth leftno s' in + | (_, _, C.Const (Ref.Ref (_,Ref.Con (_,j,lno))), s')-> + let _,params = HExtlib.split_nth lno s' in aux (k, e, List.nth pl (j-1), params@s) - | _ -> config) + | _ -> config, true) in aux ;; - let whd ?(delta=0) ?(subst=[]) context t = - unwind (reduce ~delta ~subst context (0, [], t, [])) + let whd ?(delta=0) ~subst context t = + unwind (fst (reduce ~delta ~subst context (0, [], t, []))) ;; end ;; -(* {{{ ROTTO = rompe l'unificazione poiche' riduce gli argomenti di un'applicazione - senza ridurre la testa -module R = Reduction CallByNameStrategy;; OK 56.368s -module R = Reduction CallByValueStrategy;; ROTTO -module R = Reduction CallByValueStrategyByNameOnConstants;; ROTTO -module R = Reduction LazyCallByValueStrategy;; ROTTO -module R = Reduction LazyCallByValueStrategyByNameOnConstants;; ROTTO -module R = Reduction LazyCallByNameStrategy;; OK 0m56.398s -module R = Reduction - LazyCallByValueByNameOnConstantsWhenFromStack_ByNameStrategyWhenFromEnvOrEns;; - OK 59.058s -module R = Reduction ClosuresOnStackByValueFromEnvOrEnsStrategy;; OK 58.583s -module R = Reduction - ClosuresOnStackByValueFromEnvOrEnsByNameOnConstantsStrategy;; OK 58.094s -module R = Reduction(ClosuresOnStackByValueFromEnvOrEnsStrategy);; OK 58.127s -module R = Reduction(CallByValueByNameForUnwind);; -module R = Reduction(CallByNameStrategy);; -module R = Reduction(ClosuresOnStackByValueFromEnvOrEnsStrategy);;}}} *) module RS = CallByValueByNameForUnwind';; - module R = Reduction(RS);; -module U = UriManager;; let whd = R.whd -(* -let whd = - let profiler_whd = HExtlib.profile ~enable:profile "are_convertible.whd" in - fun ?(delta=true) ?(subst=[]) context t -> - profiler_whd.HExtlib.profile (whd ~delta ~subst context) t -*) - -(* mimic ocaml (<< 3.08) "=" behaviour. Tests physical equality first then - * fallbacks to structural equality *) let (===) x y = Pervasives.compare x y = 0 ;; -module C = NCic +let get_relevance = ref (fun ~metasenv:_ ~subst:_ _ _ -> assert false);; + +let set_get_relevance f = get_relevance := f;; (* t1, t2 must be well-typed *) -let are_convertible whd ?(subst=[]) = +let are_convertible ~metasenv ~subst = let rec aux test_eq_only context t1 t2 = - let rec alpha_eq test_eq_only t1 t2 = + let 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)) 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.Sort (C.Type a), C.Sort (C.Type b)) when not test_eq_only -> + NCicEnvironment.universe_leq a b + | (C.Sort (C.Type a), C.Sort (C.Type b)) -> + NCicEnvironment.universe_eq a b + | (C.Sort C.Prop,C.Sort (C.Type _)) -> (not test_eq_only) + | (C.Sort C.Prop, C.Sort C.Prop) -> true | (C.Prod (name1,s1,t1), C.Prod(_,s2,t2)) -> aux true context s1 s2 && 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 && + | (C.Lambda (name1,s1,t1), C.Lambda(_,_,t2)) -> + (* thanks to inversion of well typedness, the source + * of these lambdas must be already convertible *) aux test_eq_only ((name1, C.Decl s1)::context) t1 t2 | (C.LetIn (name1,ty1,s1,t1), C.LetIn(_,ty2,s2,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))) + | (C.Meta (n1,(s1, C.Irl _)), C.Meta (n2,(s2, C.Irl _))) 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 @@ -520,7 +227,12 @@ let are_convertible whd ?(subst=[]) = (NCicSubstitution.lift s1 t1) (NCicSubstitution.lift s2 t2)) l1 l2 - with Invalid_argument _ -> assert false) + with Invalid_argument "List.for_all2" -> + prerr_endline ("Meta " ^ string_of_int n1 ^ + " occurrs with local contexts of different lenght\n"^ + NCicPp.ppterm ~metasenv ~subst ~context t1 ^ " === " ^ + NCicPp.ppterm ~metasenv ~subst ~context t2); + assert false) -> true | C.Meta (n1,l1), _ -> (try @@ -534,28 +246,69 @@ let are_convertible whd ?(subst=[]) = let term = NCicSubstitution.subst_meta l2 term in 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 + + | (C.Appl ((C.Const r1) as hd1::tl1), C.Appl (C.Const r2::tl2)) + when (Ref.eq r1 r2 && + List.length (E.get_relevance r1) >= List.length tl1) -> + let relevance = E.get_relevance r1 in + let relevance = match r1 with + | Ref.Ref (_,Ref.Con (_,_,lno)) -> + let _,relevance = HExtlib.split_nth lno relevance in + HExtlib.mk_list false lno @ relevance + | _ -> relevance + in + (try + HExtlib.list_forall_default3_var + (fun t1 t2 b -> not b || aux true context t1 t2 ) + tl1 tl2 true relevance + with Invalid_argument _ -> false + | HExtlib.FailureAt fail -> + let relevance = + !get_relevance ~metasenv ~subst context hd1 tl1 in + let _,relevance = HExtlib.split_nth fail relevance in + let b,relevance = (match relevance with + | [] -> assert false + | b::tl -> b,tl) in + if (not b) then + let _,tl1 = HExtlib.split_nth (fail+1) tl1 in + let _,tl2 = HExtlib.split_nth (fail+1) tl2 in + try + HExtlib.list_forall_default3 + (fun t1 t2 b -> not b || aux true context t1 t2) + tl1 tl2 true relevance + with Invalid_argument _ -> false + else false) + + | (C.Appl (hd1::tl1), C.Appl (hd2::tl2)) -> + aux test_eq_only context hd1 hd2 && + let relevance = !get_relevance ~metasenv ~subst context hd1 tl1 in + (try HExtlib.list_forall_default3 - (fun t1 t2 b -> not b || aux test_eq_only context t1 t2) + (fun t1 t2 b -> not b || aux true context t1 t2) tl1 tl2 true relevance with Invalid_argument _ -> false) - | (C.Appl l1, C.Appl 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 && + | (C.Match (Ref.Ref (_,Ref.Ind (_,tyno,_)) as ref1,outtype1,term1,pl1), + C.Match (ref2,outtype2,term2,pl2)) -> + let _,_,itl,_,_ = E.get_checked_indtys ref1 in + let _,_,ty,_ = List.nth itl tyno in + let rec remove_prods ~subst context ty = + let ty = whd ~subst context ty in + match ty with + | C.Sort _ -> ty + | C.Prod (name,so,ta) -> remove_prods ~subst ((name,(C.Decl so))::context) ta + | _ -> assert false + in + let is_prop = + match remove_prods ~subst [] ty with + | C.Sort C.Prop -> true + | _ -> false + in + Ref.eq ref1 ref2 && aux test_eq_only context outtype1 outtype2 && - aux test_eq_only context term1 term2 && + (is_prop || 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 @@ -563,21 +316,34 @@ let are_convertible whd ?(subst=[]) = true else 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 + | C.Const (Ref.Ref (_,Ref.Def h)) + | C.Const (Ref.Ref (_,Ref.Fix (_,_,h))) + | C.Appl(C.Const(Ref.Ref(_,Ref.Def h))::_) + | C.Appl(C.Const(Ref.Ref(_,Ref.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 + let put_in_whd m1 m2 = + R.reduce ~delta:max_int ~subst context m1, + R.reduce ~delta:max_int ~subst context m2 in - let rec convert_machines ((k1,e1,t1,s1 as m1),(k2,e2,t2,s2 as m2),delta) = + let small_delta_step + ((_,_,t1,_ as m1), norm1 as x1) ((_,_,t2,_ as m2), norm2 as x2) + = + assert(not (norm1 && norm2)); + if norm1 then + x1, R.reduce ~delta:(height_of t2 -1) ~subst context m2 + else if norm2 then + R.reduce ~delta:(height_of t1 -1) ~subst context m1, x2 + else + 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 + in + let rec convert_machines test_eq_only + ((k1,e1,t1,s1),norm1 as m1),((k2,e2,t2,s2), norm2 as m2) + = (alpha_eq test_eq_only (R.unwind (k1,e1,t1,[])) (R.unwind (k2,e2,t2,[])) && let relevance = @@ -590,37 +356,64 @@ let are_convertible whd ?(subst=[]) = 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 + convert_machines true (put_in_whd 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)) + (not (norm1 && norm2) && convert_machines test_eq_only (small_delta_step m1 m2)) in - convert_machines (small_delta_step (0,[],t1,[]) (0,[],t2,[])) + convert_machines test_eq_only (put_in_whd (0,[],t1,[]) (0,[],t2,[])) in aux false ;; -let are_convertible = are_convertible whd - -let rec head_beta_reduce ?(delta=max_int) ?(upto=(-1)) t l = +let rec head_beta_reduce ~delta ~upto ~subst t l = match upto, t, l with | 0, C.Appl l1, _ -> C.Appl (l1 @ l) | 0, t, [] -> t | 0, t, _ -> C.Appl (t::l) - | _, C.Appl (hd::tl), _ -> head_beta_reduce ~delta ~upto hd (tl @ l) + | _, C.Meta (n,ctx), _ -> + (try + let _,_, term,_ = NCicUtils.lookup_subst n subst in + head_beta_reduce ~delta ~upto ~subst + (NCicSubstitution.subst_meta ctx term) l + with NCicUtils.Subst_not_found _ -> if l = [] then t else C.Appl (t::l)) + | _, C.Appl (hd::tl), _ -> head_beta_reduce ~delta ~upto ~subst hd (tl @ l) | _, 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 (_, NReference.Def height) as re), _ + head_beta_reduce ~delta ~upto:(upto - 1) ~subst bo tl + | _, C.Const (Ref.Ref (_, Ref.Def height) as re), _ when delta <= height -> let _, _, bo, _, _, _ = NCicEnvironment.get_checked_def re in - head_beta_reduce ~upto ~delta bo l + head_beta_reduce ~upto ~delta ~subst bo l | _, t, [] -> t | _, t, _ -> C.Appl (t::l) ;; -let head_beta_reduce ?delta ?upto t = head_beta_reduce ?delta ?upto t [];; +let head_beta_reduce ?(delta=max_int) ?(upto= -1) ?(subst=[]) t = + head_beta_reduce ~delta ~upto ~subst t [] +;; + +type stack_item = RS.stack_term +type environment_item = RS.env_term + +type machine = int * environment_item list * NCic.term * stack_item list + +let reduce_machine = R.reduce +let from_stack = RS.from_stack +let unwind = R.unwind + +let _ = + NCicUtils.set_head_beta_reduce (fun ~upto t -> head_beta_reduce ~upto t); + NCicPp.set_head_beta_reduce (fun ~upto t -> head_beta_reduce ~upto t); +;; + +(* if n < 0, then splits all prods from an arity, returning a sort *) +let rec split_prods ~subst context n te = + match (n, R.whd ~subst context te) with + | (0, _) -> context,te + | (n, C.Sort _) when n <= 0 -> context,te + | (n, C.Prod (name,so,ta)) -> + split_prods ~subst ((name,(C.Decl so))::context) (n - 1) ta + | (_, _) -> raise (AssertFailure (lazy "split_prods")) +;; (* vim:set foldmethod=marker: *)