X-Git-Url: http://matita.cs.unibo.it/gitweb/?p=helm.git;a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fdelayed_updating%2Freduction%2Fifr_unwind.ma;h=077ff798e26298d93345e27bf014fed067b68f45;hp=e8cc51826179f68191c908417adedae47fd85353;hb=829e3a8af3229c4e625245f7265dd67939da98c4;hpb=41a54a797af98d2867d4bf979d424283fb44a1fc

diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/reduction/ifr_unwind.ma b/matita/matita/contribs/lambdadelta/delayed_updating/reduction/ifr_unwind.ma
index e8cc51826..077ff798e 100644
--- a/matita/matita/contribs/lambdadelta/delayed_updating/reduction/ifr_unwind.ma
+++ b/matita/matita/contribs/lambdadelta/delayed_updating/reduction/ifr_unwind.ma
@@ -17,12 +17,12 @@ include "delayed_updating/reduction/ifr.ma".
 include "delayed_updating/unwind/unwind2_preterm_fsubst.ma".
 include "delayed_updating/unwind/unwind2_preterm_eq.ma".
 include "delayed_updating/unwind/unwind2_prototerm_lift.ma".
-include "delayed_updating/unwind/unwind2_rmap_head.ma".
+include "delayed_updating/unwind/unwind2_rmap_closed.ma".
 
 include "delayed_updating/substitution/fsubst_eq.ma".
 include "delayed_updating/substitution/lift_prototerm_eq.ma".
 
-include "delayed_updating/syntax/path_head_structure.ma".
+include "delayed_updating/syntax/path_closed_structure.ma".
 include "delayed_updating/syntax/path_structure_depth.ma".
 
 (* IMMEDIATE FOCUSED REDUCTION **********************************************)
@@ -33,17 +33,14 @@ lemma ifr_unwind_bi (f) (t1) (t2) (r):
       t1 ϵ 𝐓 → r ϵ 𝐈 →
       t1 ➡𝐢𝐟[r] t2 → ▼[f]t1 ➡𝐢𝐟[⊗r] ▼[f]t2.
 #f #t1 #t2 #r #H1t1 #H2r
-* #p #q #k #Hr #H1k #Ht1 #Ht2 destruct
-@(ex4_3_intro … (⊗p) (⊗q) (↑♭q))
-[ -H1t1 -H2r -H1k -Ht1 -Ht2 //
+* #p #q #n #Hr #Hn #Ht1 #Ht2 destruct
+@(ex4_3_intro … (⊗p) (⊗q) (♭q))
+[ -H1t1 -H2r -Hn -Ht1 -Ht2 //
 | -H1t1 -H2r -Ht1 -Ht2
-  >structure_L_sn
-  >H1k in ⊢ (??%?); >path_head_structure_depth <H1k -H1k //
+  /2 width=2 by path_closed_structure_depth/
 | lapply (in_comp_unwind2_path_term f … Ht1) -Ht2 -Ht1 -H1t1 -H2r
-  <unwind2_path_d_dx <list_append_rcons_sn
-  lapply (unwind2_rmap_append_pap_closed f … (p◖𝗔) … H1k) -H1k
-  <depth_L_sn #H2k
-  lapply (eq_inv_ninj_bi … H2k) -H2k #H2k <H2k -H2k #Ht1 //
+  <unwind2_path_d_dx <tr_pap_succ_nap <list_append_rcons_sn
+  <unwind2_rmap_append_closed_nap //
 | lapply (unwind2_term_eq_repl_dx f … Ht2) -Ht2 #Ht2
   @(subset_eq_trans … Ht2) -t2
   @(subset_eq_trans … (unwind2_term_fsubst_pic …))
@@ -55,11 +52,10 @@ lemma ifr_unwind_bi (f) (t1) (t2) (r):
     @unwind2_term_eq_repl_sn
 (* Note: crux of the proof begins *)
     <list_append_rcons_sn
-    @(stream_eq_trans … (tr_compose_uni_dx …))
+    @(stream_eq_trans … (tr_compose_uni_dx_pap …)) <tr_pap_succ_nap
     @tr_compose_eq_repl
-    [ <unwind2_rmap_append_pap_closed //
-    | >unwind2_rmap_A_dx
-      /2 width=1 by tls_unwind2_rmap_closed/
+    [ <unwind2_rmap_append_closed_nap //
+    | /2 width=1 by tls_succ_unwind2_rmap_append_L_closed_dx/
     ]
 (* Note: crux of the proof ends *)
   | //