From 44927f6b05adef73df12ff1b85f79f99698709d3 Mon Sep 17 00:00:00 2001 From: Ferruccio Guidi Date: Mon, 26 May 2014 17:08:40 +0000 Subject: [PATCH] new definition of llor gives a long awaited lemma :), but introduces an axiom :( --- .../llor.ma => etc/llor/llor.etc} | 0 .../llor_alt.ma => etc/llor/llor_alt.etc} | 0 .../lleq_llor.ma} | 33 +++++++++--------- .../basic_2/substitution/llpx_sn_llor.ma | 34 +++++++++++++++++++ .../lambdadelta/basic_2/web/basic_2_src.tbl | 6 ++-- 5 files changed, 54 insertions(+), 19 deletions(-) rename matita/matita/contribs/lambdadelta/basic_2/{substitution/llor.ma => etc/llor/llor.etc} (100%) rename matita/matita/contribs/lambdadelta/basic_2/{substitution/llor_alt.ma => etc/llor/llor_alt.etc} (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc/llor/lleq_llor.etc => substitution/lleq_llor.ma} (66%) create mode 100644 matita/matita/contribs/lambdadelta/basic_2/substitution/llpx_sn_llor.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/substitution/llor.ma b/matita/matita/contribs/lambdadelta/basic_2/etc/llor/llor.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/substitution/llor.ma rename to matita/matita/contribs/lambdadelta/basic_2/etc/llor/llor.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/substitution/llor_alt.ma b/matita/matita/contribs/lambdadelta/basic_2/etc/llor/llor_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/substitution/llor_alt.ma rename to matita/matita/contribs/lambdadelta/basic_2/etc/llor/llor_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llor/lleq_llor.etc b/matita/matita/contribs/lambdadelta/basic_2/substitution/lleq_llor.ma similarity index 66% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llor/lleq_llor.etc rename to matita/matita/contribs/lambdadelta/basic_2/substitution/lleq_llor.ma index a180d1124..80bc596f2 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/etc/llor/lleq_llor.etc +++ b/matita/matita/contribs/lambdadelta/basic_2/substitution/lleq_llor.ma @@ -12,24 +12,25 @@ (* *) (**************************************************************************) -include "basic_2/relocation/llor.ma". +include "basic_2/substitution/llor.ma". include "basic_2/substitution/lleq_alt.ma". (* LAZY EQUIVALENCE FOR LOCAL ENVIRONMENTS **********************************) (* Properties on poinwise union for local environments **********************) - -lemma llor_lleq_O: ∀T,L1,L2,L. L1 ⩖[T] L2 ≡ L → |L1| ≤ |L2| → |L2| = |L| → L2 ⋕[T, yinj 0] L. -#T #L1 @(f2_ind … rfw … L1 T) -L1 -T -#n #IH #L1 #T #Hn #L2 #L #H #HL12 #HL2 elim (llor_inv_alt … H) // destruct -#HL1 #IHT @lleq_intro_alt // -#I2 #I #K2 #K #V2 #V #i #_ #HnT #HLK2 #HLK lapply (ldrop_fwd_length_lt2 … HLK) -#Hi elim (ldrop_O1_lt L1 i) // -#I1 #K1 #V1 #HLK1 elim (IHT … HLK1 HLK) >HL1 >HL2