X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fbasic_2%2Fdynamic%2Fcnv_eval.ma;h=d87201dad1b18afbaa0b2d30b5e04f91a880a177;hb=90c02d72e5bb0ee0a9f98b12c540cca1b0c9c411;hp=9d86f579d37466008ec0c267cdf7272b70203d1e;hpb=0fea4ed429678c3293027cfe76fdbe15cfa331cb;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/basic_2/dynamic/cnv_eval.ma b/matita/matita/contribs/lambdadelta/basic_2/dynamic/cnv_eval.ma
index 9d86f579d..d87201dad 100644
--- a/matita/matita/contribs/lambdadelta/basic_2/dynamic/cnv_eval.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/dynamic/cnv_eval.ma
@@ -14,7 +14,8 @@
 
 include "basic_2/rt_computation/cpmuwe_cpmuwe.ma".
 include "basic_2/rt_equivalence/cpes_cpes.ma".
-include "basic_2/dynamic/cnv_cpmuwe.ma".
+include "basic_2/dynamic/cnv_cpmuwe.ma". (**) (* should be included by the next *)
+include "basic_2/dynamic/cnv_cpmuwe_cpme.ma".
 include "basic_2/dynamic/cnv_cpes.ma".
 include "basic_2/dynamic/cnv_preserve_cpes.ma".
 
@@ -22,9 +23,9 @@ include "basic_2/dynamic/cnv_preserve_cpes.ma".
 
 (* main properties with evaluations for rt-transition on terms **************)
 
-theorem cnv_dec (a) (h) (G) (L) (T): ac_props a →
-        Decidable (⦃G,L⦄ ⊢ T ![a,h]).
-#a #h #G #L #T #Ha
+theorem cnv_dec (h) (a) (G) (L) (T): ac_props a →
+        Decidable (⦃G,L⦄ ⊢ T ![h,a]).
+#h #a #G #L #T #Ha
 @(fqup_wf_ind_eq (Ⓣ) … G L T) -G -L -T #G0 #L0 #T0 #IH #G #L * * [|||| * ]
 [ #s #HG #HL #HT destruct -Ha -IH
   /2 width=1 by cnv_sort, or_introl/
@@ -55,7 +56,7 @@ theorem cnv_dec (a) (h) (G) (L) (T): ac_props a →
       elim (dec_min (R_cpmuwe h G L T) … Hn) -Hn
       [| /2 width=2 by cnv_R_cpmuwe_dec/ ] #n0 #_ -n
       elim (ac_dec … Ha n0) -Ha
-      [ * #n #Hn #Ha * #X0 #HX0 #_
+      [ * #n #Ha #Hn * #X0 #HX0 #_
         elim (abst_dec X0)
         [ * #p #W #U0 #H destruct
           elim (cnv_cpes_dec … 1 0 … HV W) [ #HVW | #HnVW ]