X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fbasic_2%2Fcomputation%2Flsubc_drop.ma;h=678604fddf6087fdc3ed86d52b7d29f3e060f2ee;hb=ad3ca38634cfae29e8c26d0ab23cb466407eca5e;hp=36f35527c0bc64ba838fdcef34aaae53dd6ebb50;hpb=fca909e9e53de73771e1b47e94434ae8f747d7fb;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/basic_2/computation/lsubc_drop.ma b/matita/matita/contribs/lambdadelta/basic_2/computation/lsubc_drop.ma
index 36f35527c..678604fdd 100644
--- a/matita/matita/contribs/lambdadelta/basic_2/computation/lsubc_drop.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/computation/lsubc_drop.ma
@@ -21,19 +21,19 @@ include "basic_2/computation/lsubc.ma".
 
 (* Basic_1: was: csubc_drop_conf_O *)
 (* Note: the constant 0 can not be generalized *)
-lemma lsubc_drop_O1_trans: ∀RP,G,L1,L2. G ⊢ L1 ⫃[RP] L2 → ∀K2,s,e. ⇩[s, 0, e] L2 ≡ K2 →
-                           ∃∃K1. ⇩[s, 0, e] L1 ≡ K1 & G ⊢ K1 ⫃[RP] K2.
+lemma lsubc_drop_O1_trans: ∀RP,G,L1,L2. G ⊢ L1 ⫃[RP] L2 → ∀K2,c,k. ⬇[c, 0, k] L2 ≡ K2 →
+                           ∃∃K1. ⬇[c, 0, k] L1 ≡ K1 & G ⊢ K1 ⫃[RP] K2.
 #RP #G #L1 #L2 #H elim H -L1 -L2
-[ #X #s #e #H elim (drop_inv_atom1 … H) -H /4 width=3 by drop_atom, ex2_intro/
-| #I #L1 #L2 #V #_ #IHL12 #X #s #e #H
-  elim (drop_inv_O1_pair1 … H) -H * #He #H destruct
-  [ elim (IHL12 L2 s 0) -IHL12 // #X #H <(drop_inv_O2 … H) -H
+[ #X #c #k #H elim (drop_inv_atom1 … H) -H /4 width=3 by drop_atom, ex2_intro/
+| #I #L1 #L2 #V #_ #IHL12 #X #c #k #H
+  elim (drop_inv_O1_pair1 … H) -H * #Hm #H destruct
+  [ elim (IHL12 L2 c 0) -IHL12 // #X #H <(drop_inv_O2 … H) -H
     /3 width=3 by lsubc_pair, drop_pair, ex2_intro/
   | elim (IHL12 … H) -L2 /3 width=3 by drop_drop_lt, ex2_intro/
   ]
-| #L1 #L2 #V #W #A #HV #H1W #H2W #_ #IHL12 #X #s #e #H
-  elim (drop_inv_O1_pair1 … H) -H * #He #H destruct
-  [ elim (IHL12 L2 s 0) -IHL12 // #X #H <(drop_inv_O2 … H) -H
+| #L1 #L2 #V #W #A #HV #H1W #H2W #_ #IHL12 #X #c #k #H
+  elim (drop_inv_O1_pair1 … H) -H * #Hm #H destruct
+  [ elim (IHL12 L2 c 0) -IHL12 // #X #H <(drop_inv_O2 … H) -H
     /3 width=8 by lsubc_beta, drop_pair, ex2_intro/
   | elim (IHL12 … H) -L2 /3 width=3 by drop_drop_lt, ex2_intro/
   ]
@@ -41,31 +41,29 @@ lemma lsubc_drop_O1_trans: ∀RP,G,L1,L2. G ⊢ L1 ⫃[RP] L2 → ∀K2,s,e. ⇩
 qed-.
 
 (* Basic_1: was: csubc_drop_conf_rev *)
-lemma drop_lsubc_trans: ∀RR,RS,RP.
-                        gcp RR RS RP → gcr RR RS RP RP →
-                        ∀G,L1,K1,d,e. ⇩[Ⓕ, d, e] L1 ≡ K1 → ∀K2. G ⊢ K1 ⫃[RP] K2 →
-                        ∃∃L2. G ⊢ L1 ⫃[RP] L2 & ⇩[Ⓕ, d, e] L2 ≡ K2.
-#RR #RS #RP #Hgcp #Hgcr #G #L1 #K1 #d #e #H elim H -L1 -K1 -d -e
-[ #d #e #He #X #H elim (lsubc_inv_atom1 … H) -H
-  >He /2 width=3 by ex2_intro/
+lemma drop_lsubc_trans: ∀RR,RS,RP. gcp RR RS RP →
+                        ∀G,L1,K1,l,k. ⬇[Ⓕ, l, k] L1 ≡ K1 → ∀K2. G ⊢ K1 ⫃[RP] K2 →
+                        ∃∃L2. G ⊢ L1 ⫃[RP] L2 & ⬇[Ⓕ, l, k] L2 ≡ K2.
+#RR #RS #RP #Hgcp #G #L1 #K1 #l #k #H elim H -L1 -K1 -l -k
+[ #l #k #Hm #X #H elim (lsubc_inv_atom1 … H) -H
+  >Hm /2 width=3 by ex2_intro/
 | #L1 #I #V1 #X #H
   elim (lsubc_inv_pair1 … H) -H *
   [ #K1 #HLK1 #H destruct /3 width=3 by lsubc_pair, drop_pair, ex2_intro/
   | #K1 #V #W1 #A #HV1 #H1W1 #H2W1 #HLK1 #H1 #H2 #H3 destruct
     /3 width=4 by lsubc_beta, drop_pair, ex2_intro/
   ]
-| #I #L1 #K1 #V1 #e #_ #IHLK1 #K2 #HK12
+| #I #L1 #K1 #V1 #k #_ #IHLK1 #K2 #HK12
   elim (IHLK1 … HK12) -K1 /3 width=5 by lsubc_pair, drop_drop, ex2_intro/
-| #I #L1 #K1 #V1 #V2 #d #e #HLK1 #HV21 #IHLK1 #X #H
+| #I #L1 #K1 #V1 #V2 #l #k #HLK1 #HV21 #IHLK1 #X #H
   elim (lsubc_inv_pair1 … H) -H *
   [ #K2 #HK12 #H destruct
     elim (IHLK1 … HK12) -K1 /3 width=5 by lsubc_pair, drop_skip, ex2_intro/
   | #K2 #V #W2 #A #HV2 #H1W2 #H2W2 #HK12 #H1 #H2 #H3 destruct
     elim (lift_inv_flat1 … HV21) -HV21 #W3 #V3 #HW23 #HV3 #H destruct
     elim (IHLK1 … HK12) #K #HL1K #HK2
-    lapply (acr_gcr … Hgcp Hgcr A) -Hgcp -Hgcr #HA
-    lapply (s0 … HA … HV2 … HLK1 HV3) -HV2
-    lapply (s0 … HA … H1W2 … HLK1 HW23) -H1W2
+    lapply (gcr_lift … Hgcp … HV2 … HLK1 … HV3) -HV2
+    lapply (gcr_lift … Hgcp … H1W2 … HLK1 … HW23) -H1W2
     /4 width=11 by lsubc_beta, aaa_lift, drop_skip, ex2_intro/
   ]
 ]