From: Ferruccio Guidi <ferruccio.guidi@unibo.it>
Date: Tue, 10 Oct 2017 20:43:56 +0000 (+0000)
Subject: update in basic_2 due to previous update in grond_2
X-Git-Tag: make_still_working~437
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=6386442a6850f86fe24a16871b84961fd2aee47c;p=helm.git

update in basic_2 due to previous update in grond_2
---

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index cd6bcea17..7065d3a1f 100644
--- a/matita/matita/contribs/lambdadelta/Makefile
+++ b/matita/matita/contribs/lambdadelta/Makefile
@@ -4,14 +4,14 @@ H    := @
 TRIM := sed "s/ \\+$$//"
 
 XOA_CONF     := ground_2/xoa.conf.xml
-XOA_TARGETS  := ground_2/notation/xoa_notation.ma ground_2/xoa/xoa.ma
+XOA_TARGETS  := ground_2/notation/xoa/notation.ma ground_2/xoa/xoa.ma
 
 XOA_DIR      := ../../../components/binaries/xoa
 XOA          := xoa.native
 XOA_OPTS     := ../../matita.conf.xml $(XOA_CONF)
 
 XOA2_CONF    := ground_2/xoa2.conf.xml
-XOA2_TARGETS := ground_2/notation/xoa2_notation.ma ground_2/xoa/xoa2.ma
+XOA2_TARGETS := ground_2/notation/xoa/notation2.ma ground_2/xoa/xoa2.ma
 XOA2_OPTS    := ../../matita.conf.xml $(XOA2_CONF)
 
 DEP_INPUT    := .depend
diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/frees_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/static/frees_drops.ma
index f153ad53c..926065c83 100644
--- a/matita/matita/contribs/lambdadelta/basic_2/static/frees_drops.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/static/frees_drops.ma
@@ -97,38 +97,38 @@ lemma frees_lifts: ∀b,f1,K,T. K ⊢ 𝐅*⦃T⦄ ≡ f1 →
   lapply (at_inv_uni … Hj) -Hj #H destruct
   /3 width=8 by frees_lref_atom, drops_trans/
 | #f1 #I #K #V #s #_ #IH #Hf1 #f #L #H1 #U #H2 #f2 #H3
-  lapply (isfin_fwd_push … Hf1 ??) -Hf1 [3: |*: // ] #Hf1
+  lapply (isfin_inv_push … Hf1 ??) -Hf1 [3: |*: // ] #Hf1
   lapply (lifts_inv_sort1 … H2) -H2 #H destruct
   elim (drops_split_trans_pair2 … H1) -H1 [ |*: // ] #Y #W #HLY #HYK #_
-  elim (coafter_fwd_xpx_pushs … H3) [ |*: // ] #g2 #H2 destruct
+  elim (coafter_fwd_xpx_pushs … 0 … H3) [ |*: // ] #g2 #H2 destruct
   lapply (coafter_tls_succ … H3 ??) -H3 [3: |*: // ] #H3
-  lapply (IH … HYK … H3) -IH -H3 -HYK [1,3: // | skip ]
+  lapply (IH … HYK … H3) -IH -H3 -HYK [1,3: // | skip ] #Hf2 #H destruct
   /3 width=5 by drops_isuni_fwd_drop2, frees_sort_pushs/
 | #f1 #I #K #V #_ #IH #Hf1 #f #L #H1 #U #H2 #f2 #H3
   lapply (isfin_inv_next … Hf1 ??) -Hf1 [3: |*: // ] #Hf1
   lapply (lifts_inv_lref1 … H2) -H2 * #j #Hf #H destruct
   elim (drops_split_trans_pair2 … H1) -H1 [ |*: // ] #Y #W #HLY #HYK #HVW
-  elim (coafter_fwd_xnx_pushs … H3) [ |*: // ] #g2 #H2 destruct
+  elim (coafter_fwd_xnx_pushs … 0 … H3) [ |*: // ] #g2 #H2 destruct
   lapply (coafter_tls_succ … H3 ??) -H3 [3: |*: // ]
-  <tls_S in ⊢ (???%→?); <tls_pushs <tl_next_rew <tl_next_rew #H3
+  <tls_S in ⊢ (???%→?); <tl_next_rew #H3 #H destruct
   lapply (IH … HYK … HVW … H3) -IH -H3 -HYK -HVW //
   /2 width=5 by frees_lref_pair/
 | #f1 #I #K #V #i #_ #IH #Hf1 #f #L #H1 #U #H2 #f2 #H3
-  lapply (isfin_fwd_push … Hf1 ??) -Hf1 [3: |*: // ] #Hf1
+  lapply (isfin_inv_push … Hf1 ??) -Hf1 [3: |*: // ] #Hf1
   lapply (lifts_inv_lref1 … H2) -H2 * #x #Hf #H destruct
   elim (at_inv_nxx … Hf) -Hf [ |*: // ] #j #Hf #H destruct
   elim (drops_split_trans_pair2 … H1) -H1 [ |*: // ] #Y #W #HLY #HYK #_
-  elim (coafter_fwd_xpx_pushs … H3) [ |*: // ] #g2 #H2 destruct
-  lapply (coafter_tls_succ … H3 ??) -H3 [3: |*: // ] <tls_pushs #H3
+  elim (coafter_fwd_xpx_pushs … 0 … H3) [ |*: // ] #g2 #H2 destruct
+  lapply (coafter_tls_succ … H3 ??) -H3 [3: |*: // ] #H3 #H destruct
   lapply (drops_isuni_fwd_drop2 … HLY) -HLY // #HLY
   lapply (IH … HYK … H3) -IH -H3 -HYK [4: |*: /2 width=2 by lifts_lref/ ]
   >plus_S1 /2 width=3 by frees_lref_pushs/ (**) (* full auto fails *)
 | #f1 #I #K #V #l #_ #IH #Hf1 #f #L #H1 #U #H2 #f2 #H3
-  lapply (isfin_fwd_push … Hf1 ??) -Hf1 [3: |*: // ] #Hf1
+  lapply (isfin_inv_push … Hf1 ??) -Hf1 [3: |*: // ] #Hf1
   lapply (lifts_inv_gref1 … H2) -H2 #H destruct
   elim (drops_split_trans_pair2 … H1) -H1 [ |*: // ] #Y #W #HLY #HYK #_
-  elim (coafter_fwd_xpx_pushs … H3) [ |*: // ] #g2 #H2 destruct
-  lapply (coafter_tls_succ … H3 ??) -H3 [3: |*: // ] #H3
+  elim (coafter_fwd_xpx_pushs … 0 … H3) [ |*: // ] #g2 #H2 destruct
+  lapply (coafter_tls_succ … H3 ??) -H3 [3: |*: // ] #H3 #H destruct
   lapply (IH … HYK … H3) -IH -H3 -HYK [1,3: // | skip ]
   /3 width=5 by drops_isuni_fwd_drop2, frees_gref_pushs/
 | #f1V #f1T #f1 #p #I #K #V #T #_ #_ #H1f1 #IHV #IHT #H2f1 #f #L #H1 #Y #H2 #f2 #H3
@@ -185,7 +185,7 @@ lemma frees_inv_drops: ∀f2,L,U. L ⊢ 𝐅*⦃U⦄ ≡ f2 →
   elim (drops_inv_atom1 … H1) -H1 #H #Hf destruct
   /4 width=3 by frees_atom, lifts_refl, ex2_intro/
 | #f2 #I #L #W #s #_ #IH #Hf2 #f #Y #H1 #f1 #H2
-  lapply (isfin_fwd_push … Hf2 ??) -Hf2 [3: |*: // ] #Hf2
+  lapply (isfin_inv_push … Hf2 ??) -Hf2 [3: |*: // ] #Hf2
   elim (coafter_inv_xxp … H2) -H2 [1,3: * |*: // ]
   [ #g #g1 #Hf2 #H #H0 destruct
     elim (drops_inv_skip1 … H1) -H1 #K #V #HLK #_ #H destruct
@@ -203,7 +203,7 @@ lemma frees_inv_drops: ∀f2,L,U. L ⊢ 𝐅*⦃U⦄ ≡ f2 →
   lapply (lifts_inj … HX … HVW) -W #H destruct
   /3 width=3 by frees_zero, lifts_lref, ex2_intro/
 | #f2 #I #L #W #j #_ #IH #Hf2 #f #Y #H1 #f1 #H2
-  lapply (isfin_fwd_push … Hf2 ??) -Hf2 [3: |*: // ] #Hf2
+  lapply (isfin_inv_push … Hf2 ??) -Hf2 [3: |*: // ] #Hf2
   elim (coafter_inv_xxp … H2) -H2 [1,3: * |*: // ]
   [ #g #g1 #Hf2 #H #H0 destruct
     elim (drops_inv_skip1 … H1) -H1 #K #V #HLK #_ #H destruct
@@ -214,7 +214,7 @@ lemma frees_inv_drops: ∀f2,L,U. L ⊢ 𝐅*⦃U⦄ ≡ f2 →
   elim (lifts_inv_lref2 … HX) -HX #i #Hij #H destruct
   /4 width=7 by frees_lref, lifts_lref, at_S1, at_next, ex2_intro/
 | #f2 #I #L #W #l #_ #IH #Hf2 #f #Y #H1 #f1 #H2
-  lapply (isfin_fwd_push … Hf2 ??) -Hf2 [3: |*: // ] #Hf2
+  lapply (isfin_inv_push … Hf2 ??) -Hf2 [3: |*: // ] #Hf2
   elim (coafter_inv_xxp … H2) -H2 [1,3: * |*: // ]
   [ #g #g1 #Hf2 #H #H0 destruct
     elim (drops_inv_skip1 … H1) -H1 #K #V #HLK #_ #H destruct
diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/frees_fqup.ma b/matita/matita/contribs/lambdadelta/basic_2/static/frees_fqup.ma
index 7046b8ce9..de512457b 100644
--- a/matita/matita/contribs/lambdadelta/basic_2/static/frees_fqup.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/static/frees_fqup.ma
@@ -64,7 +64,7 @@ lemma frees_drops_next: ∀f1,L1,T1. L1 ⊢ 𝐅*⦃T1⦄ ≡ f1 →
 | #f1 #I1 #L1 #V1 #Hf1 #IH #I2 #L2 #V2 *
   [ -IH #HL12 lapply (drops_fwd_isid … HL12 ?) -HL12 //
     #H destruct #g1 #Hgf1 >(injective_next … Hgf1) -g1
-    /2 width=3 by sle_refl, ex2_intro/
+    /3 width=3 by sle_refl, ex2_intro/
   | -Hf1 #n #HL12 lapply (drops_inv_drop1 … HL12) -HL12
     #HL12 #g1 <tls_xn <tl_next_rew #Hgf1 elim (IH … HL12 … Hgf1) -IH -HL12 -Hgf1
     /2 width=3 by ex2_intro/
diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lfdeq.ma b/matita/matita/contribs/lambdadelta/basic_2/static/lfdeq.ma
index 6fb68863e..07705bb8e 100644
--- a/matita/matita/contribs/lambdadelta/basic_2/static/lfdeq.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/static/lfdeq.ma
@@ -66,7 +66,7 @@ lemma frees_tdeq_conf: ∀h,o,f,L,T1. L ⊢ 𝐅*⦃T1⦄ ≡ f →
 /3 width=7 by frees_tdeq_conf_lexs, lexs_refl/ qed-.
 
 lemma frees_lfdeq_conf_lexs: ∀h,o. lexs_frees_confluent (cdeq h o) cfull.
-/3 width=7 by frees_tdeq_conf_lexs, ex2_intro/ qed-.
+/3 width=7 by frees_tdeq_conf_lexs, sle_refl, ex2_intro/ qed-.
 
 lemma tdeq_lfdeq_conf_sn: ∀h,o. s_r_confluent1 … (cdeq h o) (lfdeq h o).
 #h #o #L1 #T1 #T2 #HT12 #L2 *
@@ -76,7 +76,7 @@ qed-.
 (* Basic_2A1: uses: lleq_sym *)
 lemma lfdeq_sym: ∀h,o,T. symmetric … (lfdeq h o T).
 #h #o #T #L1 #L2 *
-/4 width=7 by frees_tdeq_conf_lexs, lfxs_sym, tdeq_sym, ex2_intro/
+/4 width=7 by frees_tdeq_conf_lexs, lfxs_sym, tdeq_sym, sle_refl, ex2_intro/
 qed-.
 
 lemma lfdeq_atom: ∀h,o,I. ⋆ ≡[h, o, ⓪{I}] ⋆.