X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicSubstitution.ml;h=43a2f8174a74a1cad4696523908e8a4575f6933e;hb=11b2157bacf59cfc561c2ef6f92ee41ee2c1a006;hp=2be7f5871704457a10683e7fd673e76e834b3fc5;hpb=5ba3b166fff4398b031774b52bd7c1ae1e5be09b;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicSubstitution.ml b/helm/software/components/ng_kernel/nCicSubstitution.ml index 2be7f5871..43a2f8174 100644 --- a/helm/software/components/ng_kernel/nCicSubstitution.ml +++ b/helm/software/components/ng_kernel/nCicSubstitution.ml @@ -11,18 +11,27 @@ (* $Id$ *) +let ppterm = + ref (fun ~context:_ ~subst:_ ~metasenv:_ ?inside_fix _ -> + let _ = inside_fix in assert false) +;; +let set_ppterm f = ppterm := f;; + +module C = NCic +module Ref = NReference + let debug_print = fun _ -> ();; let lift_from k n = let rec liftaux k = function - | NCic.Rel m as t -> if m < k then t else NCic.Rel (m + n) - | NCic.Meta (i,(m,l)) as t when k <= m -> - if n = 0 then t else NCic.Meta (i,(m+n,l)) - | NCic.Meta (_,(m,NCic.Irl l)) as t when k > l + m -> t - | NCic.Meta (i,(m,l)) -> + | C.Rel m as t -> if m < k then t else C.Rel (m + n) + | C.Meta (i,(m,(C.Irl 0 as l))) when k <= m+1 -> C.Meta (i,(m,l)) + | C.Meta (i,(m,l)) when k <= m+1 -> C.Meta (i,(m+n,l)) + | C.Meta (_,(m,C.Irl l)) as t when k > l + m -> t + | C.Meta (i,(m,l)) -> let lctx = NCicUtils.expand_local_context l in - NCic.Meta (i, (m, NCic.Ctx (NCicUtils.sharing_map (liftaux (k-m)) lctx))) - | NCic.Implicit _ -> (* was the identity *) assert false + C.Meta (i, (m, C.Ctx (HExtlib.sharing_map (liftaux (k-m)) lctx))) + | C.Implicit _ -> (* was the identity *) assert false | t -> NCicUtils.map (fun _ k -> k + 1) k liftaux t in liftaux k @@ -33,6 +42,7 @@ let lift ?(from=1) n t = else lift_from from n t ;; + (* subst t1 t2 *) (* substitutes [t1] for [Rel 1] in [t2] *) (* if avoid_beta_redexes is true (default: false) no new beta redexes *) @@ -40,42 +50,40 @@ let lift ?(from=1) n t = (* well typed and avoid_beta_redexes is true. *) (* map_arg is ReductionStrategy.from_env_for_unwind when psubst is *) (* used to implement nCicReduction.unwind' *) -let rec psubst ?(avoid_beta_redexes=false) delift lift_args map_arg args = +let rec psubst ?(avoid_beta_redexes=false) map_arg args = let nargs = List.length args in let rec substaux k = function - | NCic.Rel n as t -> + | C.Rel n as t -> (match n with | n when n >= (k+nargs) -> - if delift && nargs <> 0 then NCic.Rel (n - nargs) else t + if nargs <> 0 then C.Rel (n - nargs) else t | n when n < k -> t | n (* k <= n < k+nargs *) -> - (try lift (k+lift_args) (map_arg (List.nth args (n-k))) - with Failure _ -> assert false)) - | NCic.Meta (i,(m,l)) as t when m >= k + nargs - 1 -> - if delift && nargs <> 0 then NCic.Meta (i,(m-nargs,l)) else t - | NCic.Meta (i,(m,(NCic.Irl l as irl))) as t when k > l + m -> - if delift && nargs <> 0 then NCic.Meta (i,(m-nargs,irl)) else t - | NCic.Meta (i,(m,l)) -> + (try lift (k-1) (map_arg (List.nth args (n-k))) + with Failure _ | Invalid_argument _ -> assert false)) + | C.Meta (i,(m,l)) as t when m >= k + nargs - 1 -> + if nargs <> 0 then C.Meta (i,(m-nargs,l)) else t + | C.Meta (_,(m,(C.Irl l))) as t when k > l + m -> t + | C.Meta (i,(m,l)) -> let lctx = NCicUtils.expand_local_context l in - (* 1-nargs < k-m, when <= 0 is still reasonable because we will - * substitute args[ k-m ... k-m+nargs-1 > 0 ] *) - NCic.Meta (i,(m, NCic.Ctx (NCicUtils.sharing_map (substaux (k-m)) lctx))) - | NCic.Implicit _ -> assert false (* was identity *) - | NCic.Appl (he::tl) as t -> + C.Meta (i,(0, + C.Ctx (HExtlib.sharing_map (fun x -> substaux k (lift m x)) lctx))) + | C.Implicit _ -> assert false (* was identity *) + | C.Appl (he::tl) as t -> (* Invariant: no Appl applied to another Appl *) let rec avoid he' = function | [] -> he' | arg::tl' as args-> (match he' with - | NCic.Appl l -> NCic.Appl (l@args) - | NCic.Lambda (_,_,bo) when avoid_beta_redexes -> + | C.Appl l -> C.Appl (l@args) + | C.Lambda (_,_,bo) when avoid_beta_redexes -> (* map_arg is here \x.x, Obj magic is needed because * we don't have polymorphic recursion w/o records *) avoid (psubst - ~avoid_beta_redexes true 0 Obj.magic [Obj.magic arg] bo) tl' - | _ -> if he == he' && args == tl then t else NCic.Appl (he'::args)) + ~avoid_beta_redexes Obj.magic [Obj.magic arg] bo) tl' + | _ -> if he == he' && args == tl then t else C.Appl (he'::args)) in - let tl = NCicUtils.sharing_map (substaux k) tl in + let tl = HExtlib.sharing_map (substaux k) tl in avoid (substaux k he) tl | t -> NCicUtils.map (fun _ k -> k + 1) k substaux t in @@ -83,14 +91,14 @@ let rec psubst ?(avoid_beta_redexes=false) delift lift_args map_arg args = ;; let subst ?avoid_beta_redexes arg = - psubst ?avoid_beta_redexes true 0 (fun x -> x)[arg];; + psubst ?avoid_beta_redexes (fun x -> x)[arg];; -(* subst_meta (n, Some [t_1 ; ... ; t_n]) t *) +(* subst_meta (n, C.Ctx [t_1 ; ... ; t_n]) t *) (* returns the term [t] where [Rel i] is substituted with [t_i] lifted by n *) (* [t_i] is lifted as usual when it crosses an abstraction *) -(* subst_meta (n, Non) t -> lift n t *) +(* subst_meta (n, (C.Irl _ | C.Ctx [])) t | -> lift n t *) let subst_meta = function - | m, NCic.Irl _ - | m, NCic.Ctx [] -> lift m - | m, NCic.Ctx l -> psubst false m (fun x -> x) l + | m, C.Irl _ + | m, C.Ctx [] -> lift m + | m, C.Ctx l -> psubst (lift m) l ;;