X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2FPOPLmark%2FFsub%2Fdefn2.ma;h=812c6687d91688e5aaaf30d46521fff0bcfb30e5;hb=8c958489f93596d8132a181eb459c968ab84be4e;hp=eaeb47491d3a03af95bb40365f41d844fb4788ab;hpb=097e94fd9b070378d68dbfe8e7cba18b14ed8518;p=helm.git diff --git a/helm/software/matita/contribs/POPLmark/Fsub/defn2.ma b/helm/software/matita/contribs/POPLmark/Fsub/defn2.ma index eaeb47491..812c6687d 100644 --- a/helm/software/matita/contribs/POPLmark/Fsub/defn2.ma +++ b/helm/software/matita/contribs/POPLmark/Fsub/defn2.ma @@ -152,18 +152,19 @@ intros 2;elim G [elim H;elim H1;lapply (not_in_list_nil ? ? H2);elim Hletin |elim H1;elim H2;elim (in_list_cons_case ? ? ? ? H3) [rewrite < H4;simplify;apply in_list_head - |simplify;apply in_list_cons;apply H;apply (ex_intro ? ? a); - apply (ex_intro ? ? a1);assumption]] + |simplify;apply in_list_cons;apply H;apply (ex_intro ? ? a1); + apply (ex_intro ? ? a2);assumption]] qed. lemma natinfv_boundinenv : \forall x,G.(in_list ? x (fv_env G)) \to \exists B,T.(in_list ? (mk_bound B x T) G). intros 2;elim G 0 [simplify;intro;lapply (not_in_list_nil ? ? H);elim Hletin - |intros 3;elim t;simplify in H1;elim (in_list_cons_case ? ? ? ? H1) - [rewrite < H2;apply (ex_intro ? ? b);apply (ex_intro ? ? t1);apply in_list_head - |elim (H H2);elim H3;apply (ex_intro ? ? a); - apply (ex_intro ? ? a1);apply in_list_cons;assumption]] + |intros 3; + elim a;simplify in H1;elim (in_list_cons_case ? ? ? ? H1) + [rewrite < H2;apply (ex_intro ? ? b);apply (ex_intro ? ? t);apply in_list_head + |elim (H H2);elim H3;apply (ex_intro ? ? a1); + apply (ex_intro ? ? a2);apply in_list_cons;assumption]] qed. lemma incl_bound_fv : \forall l1,l2.(incl ? l1 l2) \to @@ -199,7 +200,7 @@ lemma fv_env_extends : \forall H,x,B,C,T,U,G. (fv_env (H @ ((mk_bound B x T) :: G))) = (fv_env (H @ ((mk_bound C x U) :: G))). intros;elim H - [simplify;reflexivity|elim t;simplify;rewrite > H1;reflexivity] + [simplify;reflexivity|elim a;simplify;rewrite > H1;reflexivity] qed. lemma lookup_env_extends : \forall G,H,B,C,D,T,U,V,x,y. @@ -236,12 +237,12 @@ cut (\forall l:(list nat).\exists n.\forall m. |intros;elim l [apply (ex_intro ? ? O);intros;unfold;intro;elim (not_in_list_nil ? ? H1) |elim H; - apply (ex_intro ? ? (S (max a t))). + apply (ex_intro ? ? (S (max a1 a))). intros.unfold. intro. elim (in_list_cons_case ? ? ? ? H3) [rewrite > H4 in H2.autobatch |elim H4 - [apply (H1 m ? H4).apply (trans_le ? (max a t));autobatch + [apply (H1 m ? H4).apply (trans_le ? (max a1 a));autobatch |assumption]]]] qed. @@ -308,7 +309,7 @@ intros 7;elim H 0 [simplify;intros;(*FIXME*)generalize in match H1;intro;inversion H1;intros [lapply (nil_cons ? G (mk_bound B x T));elim (Hletin H4) |destruct H8;apply (WFE_cons ? ? ? ? H4 H6 H2)] - |intros;simplify;generalize in match H2;elim t;simplify in H4; + |intros;simplify;generalize in match H2;elim a;simplify in H4; inversion H4;intros [destruct H5 |destruct H9;apply WFE_cons