minor update

[helm.git] / matita / matita / contribs / lambdadelta / basic_2 / multiple / llor.ma

diff --git a/matita/matita/contribs/lambdadelta/basic_2/multiple/llor.ma b/matita/matita/contribs/lambdadelta/basic_2/multiple/llor.ma
index df157a9902d9531e6f1482a144580feb914b0c52..a2d1e61a7e32b2a810ccb59d69c64d48fb2270e2 100644 (file)
--- a/matita/matita/contribs/lambdadelta/basic_2/multiple/llor.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/multiple/llor.ma
@@ -17,23 +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.
-                 ∧∧ |L1| ≤ |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.
-                       â\87©[i] L1 â\89¡ K1.â\93\91{I1}V1 â\86\92 â\87©[i] L2 â\89¡ K2.â\93\91{I2}V2 â\86\92 â\87©[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⦄  & I1 = I & V2 = V)
+                       â¬\87[i] L1 â\89¡ K1.â\93\91{I1}V1 â\86\92 â¬\87[i] L2 â\89¡ K2.â\93\91{I2}V2 â\86\92 â¬\87[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 *********************************************************)
 
-lemma llor_atom: ∀L2,T,d. ⋆ ⩖[T, d] L2 ≡ ⋆.
-#L2 #T #d @and3_intro //
+(* Note: this can be proved by llor_skip *)
+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.