X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fbasic_2%2Fdynamic%2Fcnv_cpes.ma;h=73be3fd465f2f6cf3f75d518223b4c808fc1081a;hb=9605ffc88831066a901ea4eb8e419f277662f372;hp=3437d2629855bef48a42c12ceaa5a4729a4f1607;hpb=a0b7db9844126ebcdf4b5dbb586514854cef5d93;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/basic_2/dynamic/cnv_cpes.ma b/matita/matita/contribs/lambdadelta/basic_2/dynamic/cnv_cpes.ma
index 3437d2629..73be3fd46 100644
--- a/matita/matita/contribs/lambdadelta/basic_2/dynamic/cnv_cpes.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/dynamic/cnv_cpes.ma
@@ -14,82 +14,63 @@
 
 include "basic_2/rt_computation/cpms_cpms.ma".
 include "basic_2/rt_equivalence/cpes.ma".
-include "basic_2/dynamic/cnv_aaa.ma".
+include "basic_2/dynamic/cnv.ma".
 
 (* CONTEXT-SENSITIVE NATIVE VALIDITY FOR TERMS ******************************)
 
 (* Properties with t-bound rt-equivalence for terms *************************)
 
-lemma cnv_appl_cpes (a) (h) (G) (L):
-      ∀n. (a = Ⓣ → n ≤ 1) →
-      ∀V. ⦃G, L⦄ ⊢ V ![a, h] → ∀T. ⦃G, L⦄ ⊢ T ![a, h] →
-      ∀W. ⦃G, L⦄ ⊢ V ⬌*[h,1,0] W →
-      ∀p,U. ⦃G, L⦄ ⊢ T ➡*[n, h] ⓛ{p}W.U → ⦃G, L⦄ ⊢ ⓐV.T ![a, h].
-#a #h #G #L #n #Hn #V #HV #T #HT #W *
+lemma cnv_appl_cpes (h) (a) (G) (L):
+      ∀n. ad a n →
+      ∀V. ❨G,L❩ ⊢ V ![h,a] → ∀T. ❨G,L❩ ⊢ T ![h,a] →
+      ∀W. ❨G,L❩ ⊢ V ⬌*[h,1,0] W →
+      ∀p,U. ❨G,L❩ ⊢ T ➡*[h,n] ⓛ[p]W.U → ❨G,L❩ ⊢ ⓐV.T ![h,a].
+#h #a #G #L #n #Hn #V #HV #T #HT #W *
 /4 width=11 by cnv_appl, cpms_cprs_trans, cpms_bind/
 qed.
 
-lemma cnv_cast_cpes (a) (h) (G) (L):
-      ∀U. ⦃G, L⦄ ⊢ U ![a, h] →
-      ∀T. ⦃G, L⦄ ⊢ T ![a, h] → ⦃G, L⦄ ⊢ U ⬌*[h,0,1] T → ⦃G, L⦄ ⊢ ⓝU.T ![a, h].
-#a #h #G #L #U #HU #T #HT * /2 width=3 by cnv_cast/
+lemma cnv_cast_cpes (h) (a) (G) (L):
+      ∀U. ❨G,L❩ ⊢ U ![h,a] →
+      ∀T. ❨G,L❩ ⊢ T ![h,a] → ❨G,L❩ ⊢ U ⬌*[h,0,1] T → ❨G,L❩ ⊢ ⓝU.T ![h,a].
+#h #a #G #L #U #HU #T #HT * /2 width=3 by cnv_cast/
 qed.
 
 (* Inversion lemmas with t-bound rt-equivalence for terms *******************)
 
-lemma cnv_inv_appl_cpes (a) (h) (G) (L):
-      ∀V,T. ⦃G, L⦄ ⊢ ⓐV.T ![a, h] →
-      ∃∃n,p,W,U. a = Ⓣ → n ≤ 1 & ⦃G, L⦄ ⊢ V ![a, h] & ⦃G, L⦄ ⊢ T ![a, h] &
-                 ⦃G, L⦄ ⊢ V ⬌*[h,1,0] W & ⦃G, L⦄ ⊢ T ➡*[n, h] ⓛ{p}W.U.
-#a #h #G #L #V #T #H
+lemma cnv_inv_appl_cpes (h) (a) (G) (L):
+      ∀V,T. ❨G,L❩ ⊢ ⓐV.T ![h,a] →
+      ∃∃n,p,W,U. ad a n & ❨G,L❩ ⊢ V ![h,a] & ❨G,L❩ ⊢ T ![h,a] &
+                 ❨G,L❩ ⊢ V ⬌*[h,1,0] W & ❨G,L❩ ⊢ T ➡*[h,n] ⓛ[p]W.U.
+#h #a #G #L #V #T #H
 elim (cnv_inv_appl … H) -H #n #p #W #U #Hn #HV #HT #HVW #HTU
 /3 width=7 by cpms_div, ex5_4_intro/
 qed-.
 
-lemma cnv_inv_appl_SO_cpes (a) (h) (G) (L):
-      ∀V,T. ⦃G, L⦄ ⊢ ⓐV.T ![a, h] →
-      ∃∃n,p,W,U. a = Ⓣ → n = 1 & ⦃G, L⦄ ⊢ V ![a, h] & ⦃G, L⦄ ⊢ T ![a, h] &
-                 ⦃G, L⦄ ⊢ V ⬌*[h,1,0] W & ⦃G, L⦄ ⊢ T ➡*[n, h] ⓛ{p}W.U.
-#a #h #G #L #V #T #H
-elim (cnv_inv_appl_SO … H) -H #n #p #W #U #Hn #HV #HT #HVW #HTU
-/3 width=7 by cpms_div, ex5_4_intro/
-qed-.
-
-lemma cnv_inv_appl_true_cpes (h) (G) (L):
-      ∀V,T. ⦃G,L⦄ ⊢ ⓐV.T ![h] →
-      ∃∃p,W,U. ⦃G,L⦄ ⊢ V ![h] & ⦃G,L⦄ ⊢ T ![h] &
-                 ⦃G,L⦄ ⊢ V ⬌*[h,1,0] W & ⦃G,L⦄ ⊢ T ➡*[1,h] ⓛ{p}W.U.
-#h #G #L #V #T #H
-elim (cnv_inv_appl_SO_cpes … H) -H #n #p #W #U #Hn
->Hn -n [| // ] #HV #HT #HVW #HTU
-/2 width=5 by ex4_3_intro/
-qed-.
-
-lemma cnv_inv_cast_cpes (a) (h) (G) (L):
-      ∀U,T. ⦃G, L⦄ ⊢ ⓝU.T ![a, h] →
-      ∧∧ ⦃G, L⦄ ⊢ U ![a, h] & ⦃G, L⦄ ⊢ T ![a, h] & ⦃G, L⦄ ⊢ U ⬌*[h,0,1] T.
-#a #h #G #L #U #T #H
+lemma cnv_inv_cast_cpes (h) (a) (G) (L):
+      ∀U,T. ❨G,L❩ ⊢ ⓝU.T ![h,a] →
+      ∧∧ ❨G,L❩ ⊢ U ![h,a] & ❨G,L❩ ⊢ T ![h,a] & ❨G,L❩ ⊢ U ⬌*[h,0,1] T.
+#h #a #G #L #U #T #H
 elim (cnv_inv_cast … H) -H
 /3 width=3 by cpms_div, and3_intro/
 qed-.
 
 (* Eliminators with t-bound rt-equivalence for terms ************************)
 
-lemma cnv_ind_cpes (a) (h) (Q:relation3 genv lenv term):
+lemma cnv_ind_cpes (h) (a) (Q:relation3 genv lenv term):
       (∀G,L,s. Q G L (⋆s)) →
-      (∀I,G,K,V. ⦃G,K⦄ ⊢ V![a,h] → Q G K V → Q G (K.ⓑ{I}V) (#O)) →
-      (∀I,G,K,i. ⦃G,K⦄ ⊢ #i![a,h] → Q G K (#i) → Q G (K.ⓘ{I}) (#(↑i))) →
-      (∀p,I,G,L,V,T. ⦃G,L⦄ ⊢ V![a,h] → ⦃G,L.ⓑ{I}V⦄⊢T![a,h] →
-                     Q G L V →Q G (L.ⓑ{I}V) T →Q G L (ⓑ{p,I}V.T)
+      (∀I,G,K,V. ❨G,K❩ ⊢ V![h,a] → Q G K V → Q G (K.ⓑ[I]V) (#O)) →
+      (∀I,G,K,i. ❨G,K❩ ⊢ #i![h,a] → Q G K (#i) → Q G (K.ⓘ[I]) (#(↑i))) →
+      (∀p,I,G,L,V,T. ❨G,L❩ ⊢ V![h,a] → ❨G,L.ⓑ[I]V❩⊢T![h,a] →
+                     Q G L V →Q G (L.ⓑ[I]V) T →Q G L (ⓑ[p,I]V.T)
       ) →
-      (∀n,p,G,L,V,W,T,U. (a = Ⓣ → n ≤ 1) → ⦃G,L⦄ ⊢ V![a,h] → ⦃G,L⦄ ⊢ T![a,h] →
-                         ⦃G,L⦄ ⊢ V ⬌*[h,1,0]W → ⦃G,L⦄ ⊢ T ➡*[n,h] ⓛ{p}W.U →
+      (∀n,p,G,L,V,W,T,U. ad a n → ❨G,L❩ ⊢ V![h,a] → ❨G,L❩ ⊢ T![h,a] →
+                         ❨G,L❩ ⊢ V ⬌*[h,1,0]W → ❨G,L❩ ⊢ T ➡*[h,n] ⓛ[p]W.U →
                          Q G L V → Q G L T → Q G L (ⓐV.T)
       ) →
-      (∀G,L,U,T. ⦃G,L⦄⊢ U![a,h] → ⦃G,L⦄ ⊢ T![a,h] → ⦃G,L⦄ ⊢ U ⬌*[h,0,1] T →
+      (∀G,L,U,T. ❨G,L❩⊢ U![h,a] → ❨G,L❩ ⊢ T![h,a] → ❨G,L❩ ⊢ U ⬌*[h,0,1] T →
                  Q G L U → Q G L T → Q G L (ⓝU.T)
       ) →
-      ∀G,L,T. ⦃G,L⦄⊢ T![a,h] → Q G L T.
-#a #h #Q #IH1 #IH2 #IH3 #IH4 #IH5 #IH6 #G #L #T #H
+      ∀G,L,T. ❨G,L❩⊢ T![h,a] → Q G L T.
+#h #a #Q #IH1 #IH2 #IH3 #IH4 #IH5 #IH6 #G #L #T #H
 elim H -G -L -T [5,6: /3 width=7 by cpms_div/ |*: /2 width=1 by/ ]
 qed-.