matita gtk3: some bugs fixed

[helm.git] / matita / components / ng_tactics / nCicTacReduction.ml

diff --git a/matita/components/ng_tactics/nCicTacReduction.ml b/matita/components/ng_tactics/nCicTacReduction.ml
index 3236956fd26e1c92dcbc36f6bb90fa1ab39b28cc..96a795c3472e8c4ee1a767edd92bc133af331b82 100644 (file)
--- a/matita/components/ng_tactics/nCicTacReduction.ml
+++ b/matita/components/ng_tactics/nCicTacReduction.ml
@@ -11,14 +11,28 @@
 
 (* $Id: nCic.ml 9058 2008-10-13 17:42:30Z tassi $ *)
  
-let rec normalize ?(delta=0) ~subst ctx t =
- let aux = normalize ~delta ~subst in
-  match NCicReduction.whd ~delta ~subst ctx t with
+let rec normalize status ?(delta=0) ~subst ctx t =
+ normalize_machine status ~delta ~subst ctx
+  (fst (NCicReduction.reduce_machine status ~delta ~subst ctx (0,[],t,[])))
+and normalize_machine status ?(delta=0) ~subst ctx (k,e,t,s) =
+ let t = 
+   if k = 0 then t
+   else
+     NCicSubstitution.psubst status ~avoid_beta_redexes:true  
+       (fun e -> normalize_machine status ~delta ~subst ctx (NCicReduction.from_env ~delta e)) e t in
+ let t =
+  match t with
      NCic.Meta (n,(s,lc)) ->
       let l = NCicUtils.expand_local_context lc in
-      let l' = List.map (aux ctx) l in
+      let l' = List.map (normalize status ~delta ~subst ctx) l in
        if l = l' then t
        else
         NCic.Meta (n,(s,NCic.Ctx l))
-   | t -> NCicUtils.map (fun h ctx -> h::ctx) ctx aux t
+   | t -> NCicUtils.map status (fun h ctx -> h::ctx) ctx (normalize status ~delta ~subst) t
+ in
+ if s = [] then t 
+ else
+  NCic.Appl
+   (t::
+    (List.map (fun i -> normalize_machine status ~delta ~subst ctx (NCicReduction.from_stack ~delta i)) s))
 ;;