removed no longer used METAs

[helm.git] / helm / ocaml / tactics / proofEngineReduction.ml

diff --git a/helm/ocaml/tactics/proofEngineReduction.ml b/helm/ocaml/tactics/proofEngineReduction.ml
index 0a1f13a78ffd0d04072c223fbdcdda06c39f4068..0dc4ce4ee3e617a1b1cb6a98efa6dc68db8e922b 100644 (file)
--- a/helm/ocaml/tactics/proofEngineReduction.ml
+++ b/helm/ocaml/tactics/proofEngineReduction.ml
@@ -33,6 +33,7 @@
 (*                                                                            *)
 (******************************************************************************)
 
+(* $Id$ *)
 
 (* The code of this module is derived from the code of CicReduction *)
 
@@ -602,14 +603,8 @@ let simpl context =
   let module S = CicSubstitution in
    function
       C.Rel n as t ->
-       (try
-         match List.nth context (n-1) with
-            Some (_,C.Decl _) -> if l = [] then t else C.Appl (t::l)
-          | Some (_,C.Def (bo,_)) ->
-             try_delta_expansion context l t (S.lift n bo)
-         | None -> raise RelToHiddenHypothesis
-        with
-         Failure _ -> assert false)
+       (* we never perform delta expansion automatically *)
+       if l = [] then t else C.Appl (t::l)
     | C.Var (uri,exp_named_subst) ->
        let exp_named_subst' =
         reduceaux_exp_named_subst context l exp_named_subst
@@ -630,7 +625,7 @@ let simpl context =
     | C.Sort _ as t -> t (* l should be empty *)
     | C.Implicit _ as t -> t
     | C.Cast (te,ty) ->
-       C.Cast (reduceaux context l te, reduceaux context l ty)
+       C.Cast (reduceaux context l te, reduceaux context [] ty)
     | C.Prod (name,s,t) ->
        assert (l = []) ;
        C.Prod (name,
@@ -694,18 +689,16 @@ let simpl context =
               in
                reduceaux context [] body'
          | C.Appl (C.CoFix (i,fl) :: tl) ->
-            let tys =
-             List.map (function (name,ty,_) -> Some (C.Name name, C.Decl ty)) fl            in
              let (_,_,body) = List.nth fl i in
-              let body' =
-               let counter = ref (List.length fl) in
-                List.fold_right
-                 (fun _ -> decr counter ; S.subst (C.CoFix (!counter,fl)))
-                 fl
-                 body
-              in
-               let tl' = List.map (reduceaux context []) tl in
-                reduceaux context tl' body'
+             let body' =
+              let counter = ref (List.length fl) in
+               List.fold_right
+                (fun _ -> decr counter ; S.subst (C.CoFix (!counter,fl)))
+                fl
+                body
+             in
+              let tl' = List.map (reduceaux context []) tl in
+               reduceaux context tl' body'
          | t -> t
        in
         (match decofix (CicReduction.whd context term) with