Yet another strategy for let...ins: a let-in is _NEVER_ simplified.

The user has to use unfold to zeta-expand it.
(Thus, a let-in is more opaque than a constant in the environment.)

diff --git a/helm/matita/tests/simpl.ma b/helm/matita/tests/simpl.ma
index 65e9d48a48c6e2f3467eacb56c3408c6a7a55459..89812286985c0080428f038b205a8375ed28cd1b 100644 (file)
--- a/helm/matita/tests/simpl.ma
+++ b/helm/matita/tests/simpl.ma
@@ -23,27 +23,15 @@ alias id "not" = "cic:/Coq/Init/Logic/not.con".
 alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)".
 alias id "plus_comm" = "cic:/Coq/Arith/Plus/plus_comm.con".
 
-theorem a : 
- \forall A:Set.
- \forall x,y : A.
- not (x = y) \to not(y = x).
-intros.
-unfold not. (* simplify. *)
-intro. apply H.
-symmetry.
-exact H1.
-qed.
-
 theorem t: let f \def \lambda x,y. x y in f (\lambda x.S x) O = S O.
- intros. simplify. change in \vdash (? ? (? %) ?) with O. 
+ intros. simplify. change in \vdash (? ? (? ? %) ?) with O. 
  reflexivity. qed.
- 
 
 theorem X: \forall x:nat. let myplus \def plus x in myplus (S O) = S x.
  intros. simplify. change in \vdash (? ? (% ?) ?) with (plus x).
 
 rewrite > plus_comm. reflexivity. qed.
- 
+
 theorem R: \forall x:nat. let uno \def x + O in S O + uno = 1 + x.
  intros. simplify.
   change in \vdash (? ? (? %) ?) with (x + O).

diff --git a/helm/ocaml/tactics/proofEngineReduction.ml b/helm/ocaml/tactics/proofEngineReduction.ml
index fca06f6f078301430648759b07c445d5955e6f0f..0dc4ce4ee3e617a1b1cb6a98efa6dc68db8e922b 100644 (file)
--- a/helm/ocaml/tactics/proofEngineReduction.ml
+++ b/helm/ocaml/tactics/proofEngineReduction.ml
@@ -603,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