X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fbasic_2%2Fmultiple%2Fllor.ma;h=a2d1e61a7e32b2a810ccb59d69c64d48fb2270e2;hb=5102e7f780e83c7fef1d3826f81dfd37ee4028bc;hp=7832b48987a850812054aa6d8f120763dcbbac9e;hpb=c88fe30a6900da730a684d7df6522407a388cd67;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/basic_2/multiple/llor.ma b/matita/matita/contribs/lambdadelta/basic_2/multiple/llor.ma
index 7832b4898..a2d1e61a7 100644
--- a/matita/matita/contribs/lambdadelta/basic_2/multiple/llor.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/multiple/llor.ma
@@ -17,24 +17,24 @@ include "basic_2/multiple/frees.ma".
 
 (* POINTWISE UNION FOR LOCAL ENVIRONMENTS ***********************************)
 
-definition llor: ynat → relation4 term lenv lenv lenv ≝ λd,T,L2,L1,L.
+definition llor: ynat → relation4 term lenv lenv lenv ≝ λl,T,L2,L1,L.
                  ∧∧ |L1| = |L2| & |L1| = |L|
                   & (∀I1,I2,I,K1,K2,K,V1,V2,V,i.
-                       ⇩[i] L1 ≡ K1.ⓑ{I1}V1 → ⇩[i] L2 ≡ K2.ⓑ{I2}V2 → ⇩[i] L ≡ K.ⓑ{I}V → ∨∨
-                       (∧∧ yinj i < d & I1 = I & V1 = V) |
-                       (∧∧ (L1 ⊢ i ϵ 𝐅*[d]⦃T⦄ → ⊥) & I1 = I & V1 = V) |
-                       (∧∧ d ≤ yinj i & L1 ⊢ i ϵ 𝐅*[d]⦃T⦄ & I2 = I & V2 = V)
+                       ⬇[i] L1 ≡ K1.ⓑ{I1}V1 → ⬇[i] L2 ≡ K2.ⓑ{I2}V2 → ⬇[i] L ≡ K.ⓑ{I}V → ∨∨
+                       (∧∧ yinj i < l & I1 = I & V1 = V) |
+                       (∧∧ (L1 ⊢ i ϵ 𝐅*[l]⦃T⦄ → ⊥) & I1 = I & V1 = V) |
+                       (∧∧ l ≤ yinj i & L1 ⊢ i ϵ 𝐅*[l]⦃T⦄ & I2 = I & V2 = V)
                     ).
 
 interpretation
    "lazy union (local environment)"
-   'LazyOr L1 T d L2 L = (llor d T L2 L1 L).
+   'LazyOr L1 T l L2 L = (llor l T L2 L1 L).
 
 (* Basic properties *********************************************************)
 
 (* Note: this can be proved by llor_skip *)
-lemma llor_atom: ∀T,d. ⋆ ⩖[T, d] ⋆ ≡ ⋆.
-#T #d @and3_intro //
+lemma llor_atom: ∀T,l. ⋆ ⋓[T, l] ⋆ ≡ ⋆.
+#T #l @and3_intro //
 #I1 #I2 #I #K1 #K2 #K #V1 #V2 #V #i #HLK1
-elim (ldrop_inv_atom1 … HLK1) -HLK1 #H destruct
+elim (drop_inv_atom1 … HLK1) -HLK1 #H destruct
 qed.