- bugfixed "aacr" allows to remove historical eta-conversions

[helm.git] / matita / matita / contribs / lambdadelta / basic_2 / computation / acp.ma

diff --git a/matita/matita/contribs/lambdadelta/basic_2/computation/acp.ma b/matita/matita/contribs/lambdadelta/basic_2/computation/acp.ma
index 5de1506977dab113b55a29dc980d4a5109cf5dc3..6bcbfe4c7982511c4688364c154cfd64d72849e9 100644 (file)
--- a/matita/matita/contribs/lambdadelta/basic_2/computation/acp.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/computation/acp.ma
@@ -13,40 +13,38 @@
 (**************************************************************************)
 
 include "basic_2/grammar/genv.ma".
-include "basic_2/substitution/ldrops.ma".
+include "basic_2/multiple/drops.ma".
 
 (* ABSTRACT COMPUTATION PROPERTIES ******************************************)
 
-definition CP1 ≝ λRR:relation4 genv lenv term term. λRS:relation term.
-                 ∀G,L. ∃k. NF … (RR G L) RS (⋆k).
+definition candidate: Type[0] ≝ relation3 genv lenv term.
 
-definition CP2 ≝ λRR:relation4 genv lenv term term. λRS:relation term.
+definition CP0 ≝ λRR:relation4 genv lenv term term. λRS:relation term.
                  ∀G,L0,L,T,T0,s,d,e. NF … (RR G L) RS T →
                  ⇩[s, d, e] L0 ≡ L → ⇧[d, e] T ≡ T0 → NF … (RR G L0) RS T0.
 
-definition CP2s ≝ λRR:relation4 genv lenv term term. λRS:relation term.
+definition CP0s ≝ λRR:relation4 genv lenv term term. λRS:relation term.
                   ∀G,L0,L,s,des. ⇩*[s, des] L0 ≡ L →
                   ∀T,T0. ⇧*[des] T ≡ T0 →
                   NF … (RR G L) RS T → NF … (RR G L0) RS T0.
 
-definition CP3 ≝ λRP:relation3 genv lenv term.
-                 ∀G,L,T,k. RP G L (ⓐ⋆k.T) → RP G L T.
+definition CP1 ≝ λRR:relation4 genv lenv term term. λRS:relation term.
+                 ∀G,L. ∃k. NF … (RR G L) RS (⋆k).
 
-definition CP4 ≝ λRP:relation3 genv lenv term.
-                 ∀G,L,W,T. RP G L W → RP G L T → RP G L (ⓝW.T).
+definition CP2 ≝ λRP:candidate.
+                 ∀G,L,T,k. RP G L (ⓐ⋆k.T) → RP G L T.
 
 (* requirements for abstract computation properties *)
-record acp (RR:relation4 genv lenv term term) (RS:relation term) (RP:relation3 genv lenv term) : Prop ≝
-{ cp1: CP1 RR RS;
-  cp2: CP2 RR RS;
-  cp3: CP3 RP;
-  cp4: CP4 RP
+record acp (RR:relation4 genv lenv term term) (RS:relation term) (RP:candidate) : Prop ≝
+{ cp0: CP0 RR RS;
+  cp1: CP1 RR RS;
+  cp2: CP2 RP
 }.
 
 (* Basic properties *********************************************************)
 
 (* Basic_1: was: nf2_lift1 *)
-lemma acp_lifts: ∀RR,RS. CP2 RR RS → CP2s RR RS.
+lemma acp_lifts: ∀RR,RS. CP0 RR RS → CP0s RR RS.
 #RR #RS #HRR #G #L1 #L2 #s #des #H elim H -L1 -L2 -des
 [ #L #T1 #T2 #H #HT1
   <(lifts_inv_nil … H) -H //