X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fbasic_2%2Fcomputation%2Fcpre.ma;h=65a6146a7854dbe6dce6b3335ff9443e7dd2dbd3;hb=5832735b721c0bd8567c8f0be761a9136363a2a6;hp=d6f6e3dce091ec200829970bfea0b4d50dea3106;hpb=29973426e0227ee48368d1c24dc0c17bf2baef77;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/basic_2/computation/cpre.ma b/matita/matita/contribs/lambdadelta/basic_2/computation/cpre.ma
index d6f6e3dce..65a6146a7 100644
--- a/matita/matita/contribs/lambdadelta/basic_2/computation/cpre.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/computation/cpre.ma
@@ -12,25 +12,24 @@
 (*                                                                        *)
 (**************************************************************************)
 
-include "basic_2/notation/relations/peval_3.ma".
+include "basic_2/notation/relations/predeval_4.ma".
 include "basic_2/computation/cprs.ma".
-include "basic_2/computation/csn.ma".
+include "basic_2/computation/csx.ma".
 
-(* CONTEXT-SENSITIVE PARALLEL EVALUATION ON TERMS **************************)
+(* EVALUATION FOR CONTEXT-SENSITIVE PARALLEL REDUCTION ON TERMS *************)
 
-definition cpre: lenv → relation term ≝
-                 λL,T1,T2. ⦃G, L⦄ ⊢ T1 ➡* T2 ∧ ⦃G, L⦄ ⊢ 𝐍⦃T2⦄.
+definition cpre: relation4 genv lenv term term ≝
+                 λG,L,T1,T2. ⦃G, L⦄ ⊢ T1 ➡* T2 ∧ ⦃G, L⦄ ⊢ ➡ 𝐍⦃T2⦄.
 
-interpretation "context-sensitive parallel evaluation (term)"
-   'PEval L T1 T2 = (cpre L T1 T2).
+interpretation "evaluation for context-sensitive parallel reduction (term)"
+   'PRedEval G L T1 T2 = (cpre G L T1 T2).
 
-(* Basic_properties *********************************************************)
+(* Basic properties *********************************************************)
 
 (* Basic_1: was just: nf2_sn3 *)
-lemma csn_cpre: ∀h,g,L,T1. ⦃G, L⦄ ⊢ ⬊*[h, g] T1 → ∃T2. ⦃G, L⦄ ⊢ T1 ➡* 𝐍⦃T2⦄.
-#h #g #L #T1 #H @(csn_ind … H) -T1
-#T1 #_ #IHT1
-elim (cnr_dec L T1) /3 width=3/
-* #T #H1T1 #H2T1
-elim (IHT1 … H2T1) -IHT1 -H2T1 [2: /2 width=2/ ] #T2 * /4 width=3/
+lemma csx_cpre: ∀h,g,G,L,T1. ⦃G, L⦄ ⊢ ⬊*[h, g] T1 → ∃T2. ⦃G, L⦄ ⊢ T1 ➡* 𝐍⦃T2⦄.
+#h #g #G #L #T1 #H @(csx_ind … H) -T1
+#T1 #_ #IHT1 elim (cnr_dec G L T1) /3 width=3 by ex_intro, conj/
+* #T #H1T1 #H2T1 elim (IHT1 … H2T1) -IHT1 -H2T1 /2 width=2 by cpr_cpx/
+#T2 * /4 width=3 by cprs_strap2, ex_intro, conj/
 qed.