X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fbasic_2%2Frelocation%2Ffsup.ma;h=80ec9b0b52ad9084a6e91a47a94529041b937269;hb=29973426e0227ee48368d1c24dc0c17bf2baef77;hp=53f7b55840a5a76d99d81fb480e96e0ffd43e585;hpb=f95f6cb21b86f3dad114b21f687aa5df36088064;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/fsup.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/fsup.ma
index 53f7b5584..80ec9b0b5 100644
--- a/matita/matita/contribs/lambdadelta/basic_2/relocation/fsup.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/fsup.ma
@@ -12,36 +12,37 @@
 (*                                                                        *)
 (**************************************************************************)
 
-include "basic_2/notation/relations/supterm_4.ma".
+include "basic_2/notation/relations/supterm_6.ma".
 include "basic_2/grammar/cl_weight.ma".
 include "basic_2/relocation/ldrop.ma".
 
 (* SUPCLOSURE ***************************************************************)
 
-inductive fsup: bi_relation lenv term ≝
-| fsup_lref_O  : ∀I,L,V. fsup (L.ⓑ{I}V) (#0) L V
-| fsup_pair_sn : ∀I,L,V,T. fsup L (②{I}V.T) L V
-| fsup_bind_dx : ∀a,I,L,V,T. fsup L (ⓑ{a,I}V.T) (L.ⓑ{I}V) T
-| fsup_flat_dx : ∀I,L,V,T.   fsup L (ⓕ{I}V.T) L T
-| fsup_ldrop_lt: ∀L,K,T,U,d,e.
-                 ⇩[d, e] L ≡ K → ⇧[d, e] T ≡ U → 0 < e → fsup L U K T
-| fsup_ldrop   : ∀L1,K1,K2,T1,T2,U1,d,e.
+(* activate genv *)
+inductive fsup: tri_relation genv lenv term ≝
+| fsup_lref_O  : ∀I,G,L,V. fsup G (L.ⓑ{I}V) (#0) G L V
+| fsup_pair_sn : ∀I,G,L,V,T. fsup G L (②{I}V.T) G L V
+| fsup_bind_dx : ∀a,I,G,L,V,T. fsup G L (ⓑ{a,I}V.T) G (L.ⓑ{I}V) T
+| fsup_flat_dx : ∀I,G,L,V,T. fsup G L (ⓕ{I}V.T) G L T
+| fsup_ldrop_lt: ∀G,L,K,T,U,d,e.
+                 ⇩[d, e] L ≡ K → ⇧[d, e] T ≡ U → 0 < e → fsup G L U G K T
+| fsup_ldrop   : ∀G1,G2,L1,K1,K2,T1,T2,U1,d,e.
                  ⇩[d, e] L1 ≡ K1 → ⇧[d, e] T1 ≡ U1 →
-                 fsup K1 T1 K2 T2 → fsup L1 U1 K2 T2
+                 fsup G1 K1 T1 G2 K2 T2 → fsup G1 L1 U1 G2 K2 T2
 .
 
 interpretation
    "structural successor (closure)"
-   'SupTerm L1 T1 L2 T2 = (fsup L1 T1 L2 T2).
+   'SupTerm G1 L1 T1 G2 L2 T2 = (fsup G1 L1 T1 G2 L2 T2).
 
 (* Basic properties *********************************************************)
 
-lemma fsup_lref_S_lt: ∀I,L,K,V,T,i. 0 < i → ⦃L, #(i-1)⦄ ⊃ ⦃K, T⦄ → ⦃L.ⓑ{I}V, #i⦄ ⊃ ⦃K, T⦄.
-#I #L #K #V #T #i #Hi #H /3 width=7 by fsup_ldrop, ldrop_ldrop, lift_lref_ge_minus/ (**) (* auto too slow without trace *)
+lemma fsup_lref_S_lt: ∀I,G1,G2,L,K,V,T,i. 0 < i → ⦃G1, L, #(i-1)⦄ ⊃ ⦃G2, K, T⦄ → ⦃G1, L.ⓑ{I}V, #i⦄ ⊃ ⦃G2, K, T⦄.
+#I #G1 #G2 #L #K #V #T #i #Hi #H /3 width=7 by fsup_ldrop, ldrop_ldrop, lift_lref_ge_minus/ (**) (* auto too slow without trace *)
 qed.
 
-lemma fsup_lref: ∀I,K,V,i,L. ⇩[0, i] L ≡ K.ⓑ{I}V → ⦃L, #i⦄ ⊃ ⦃K, V⦄.
-#I #K #V #i @(nat_elim1 i) -i #i #IH #L #H
+lemma fsup_lref: ∀I,G,K,V,i,L. ⇩[0, i] L ≡ K.ⓑ{I}V → ⦃G, L, #i⦄ ⊃ ⦃G, K, V⦄.
+#I #G #K #V #i @(nat_elim1 i) -i #i #IH #L #H
 elim (ldrop_inv_O1_pair2 … H) -H *
 [ #H1 #H2 destruct //
 | #I1 #K1 #V1 #HK1 #H #Hi destruct
@@ -51,32 +52,32 @@ qed.
 
 (* Basic forward lemmas *****************************************************)
 
-lemma fsup_fwd_fw: ∀L1,L2,T1,T2. ⦃L1, T1⦄ ⊃ ⦃L2, T2⦄ → ♯{L2, T2} < ♯{L1, T1}.
-#L1 #L2 #T1 #T2 #H elim H -L1 -L2 -T1 -T2 //
-[ #L #K #T #U #d #e #HLK #HTU #HKL
+lemma fsup_fwd_fw: ∀G1,G2,L1,L2,T1,T2. ⦃G1, L1, T1⦄ ⊃ ⦃G2, L2, T2⦄ → ♯{G2, L2, T2} < ♯{G1, L1, T1}.
+#G1 #G2 #L1 #L2 #T1 #T2 #H elim H -G1 -G2 -L1 -L2 -T1 -T2 //
+[ #G #L #K #T #U #d #e #HLK #HTU #HKL
   lapply (ldrop_fwd_lw_lt … HLK HKL) -HKL -HLK #HKL
   lapply (lift_fwd_tw … HTU) -d -e #H
   normalize in ⊢ (?%%); /2 width=1/
-| #L1 #K1 #K2 #T1 #T2 #U1 #d #e #HLK1 #HTU1 #_ #IHT12
+| #G1 #G2 #L1 #K1 #K2 #T1 #T2 #U1 #d #e #HLK1 #HTU1 #_ #IHT12
   lapply (ldrop_fwd_lw … HLK1) -HLK1 #HLK1
   lapply (lift_fwd_tw … HTU1) -HTU1 #HTU1
   @(lt_to_le_to_lt … IHT12) -IHT12 /2 width=1/
 ]
 qed-.
 
-fact fsup_fwd_length_lref1_aux: ∀L1,L2,T1,T2. ⦃L1, T1⦄ ⊃ ⦃L2, T2⦄ →
+fact fsup_fwd_length_lref1_aux: ∀G1,G2,L1,L2,T1,T2. ⦃G1, L1, T1⦄ ⊃ ⦃G2, L2, T2⦄ →
                                 ∀i. T1 = #i → |L2| < |L1|.
-#L1 #L2 #T1 #T2 #H elim H -L1 -L2 -T1 -T2
+#G1 #G2 #L1 #L2 #T1 #T2 #H elim H -G1 -G2 -L1 -L2 -T1 -T2
 [1: normalize //
 |3: #a
 |5: /2 width=4 by ldrop_fwd_length_lt4/
-|6: #L1 #K1 #K2 #T1 #T2 #U1 #d #e #HLK1 #HTU1 #_ #IHT12 #i #H destruct
+|6: #G1 #G2 #L1 #K1 #K2 #T1 #T2 #U1 #d #e #HLK1 #HTU1 #_ #IHT12 #i #H destruct
     lapply (ldrop_fwd_length_le4 … HLK1) -HLK1 #HLK1
     elim (lift_inv_lref2 … HTU1) -HTU1 * #Hdei #H destruct
     @(lt_to_le_to_lt … HLK1) /2 width=2/
-] #I #L #V #T #j #H destruct
+] #I #G #L #V #T #j #H destruct
 qed-.
 
-lemma fsup_fwd_length_lref1: ∀L1,L2,T2,i. ⦃L1, #i⦄ ⊃ ⦃L2, T2⦄ → |L2| < |L1|.
-/2 width=5 by fsup_fwd_length_lref1_aux/
+lemma fsup_fwd_length_lref1: ∀G1,G2,L1,L2,T2,i. ⦃G1, L1, #i⦄ ⊃ ⦃G2, L2, T2⦄ → |L2| < |L1|.
+/2 width=7 by fsup_fwd_length_lref1_aux/
 qed-.