X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcontribs%2FLAMBDA-TYPES%2FBase-1%2Fpreamble.ma;h=44823fc814b685f673bb1665b1a238e195c842c8;hb=4a3ced7cc547cc4f4566c4c68c35b0de1aabf7f0;hp=0b7687bddf7630d8fdfc8c30766fc40959e891ba;hpb=387c6f39b2e55c887e8947039e5d7f56bce7f7a8;p=helm.git diff --git a/matita/contribs/LAMBDA-TYPES/Base-1/preamble.ma b/matita/contribs/LAMBDA-TYPES/Base-1/preamble.ma index 0b7687bdd..44823fc81 100644 --- a/matita/contribs/LAMBDA-TYPES/Base-1/preamble.ma +++ b/matita/contribs/LAMBDA-TYPES/Base-1/preamble.ma @@ -16,16 +16,10 @@ set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/preamble". include' "../../../legacy/coq.ma". -(* FG: This is because "and" is a reserved keyword of the parser *) -alias id "land" = "cic:/Coq/Init/Logic/and.ind#xpointer(1/1)". - -(* FG/CSC: These aliases should disappear: we would like to write something - * like: "disambiguate in cic:/Coq/*" - *) -alias symbol "plus" = "Coq's natural plus". +alias symbol "eq" = "Coq's leibnitz's equality". alias symbol "leq" = "Coq's natural 'less or equal to'". alias symbol "neq" = "Coq's not equal to (leibnitz)". -alias symbol "eq" = "Coq's leibnitz's equality". +alias symbol "plus" = "Coq's natural plus". alias id "bool" = "cic:/Coq/Init/Datatypes/bool.ind#xpointer(1/1)". alias id "conj" = "cic:/Coq/Init/Logic/and.ind#xpointer(1/1/1)". @@ -35,13 +29,12 @@ alias id "eq_ind" = "cic:/Coq/Init/Logic/eq_ind.con". alias id "eq_ind_r" = "cic:/Coq/Init/Logic/eq_ind_r.con". alias id "ex2" = "cic:/Coq/Init/Logic/ex2.ind#xpointer(1/1)". alias id "ex2_ind" = "cic:/Coq/Init/Logic/ex2_ind.con". -alias id "ex" = "cic:/Coq/Init/Logic/ex.ind#xpointer(1/1)". alias id "ex_intro2" = "cic:/Coq/Init/Logic/ex2.ind#xpointer(1/1/1)". alias id "false" = "cic:/Coq/Init/Datatypes/bool.ind#xpointer(1/1/2)". alias id "False" = "cic:/Coq/Init/Logic/False.ind#xpointer(1/1)". alias id "False_ind" = "cic:/Coq/Init/Logic/False_ind.con". alias id "I" = "cic:/Coq/Init/Logic/True.ind#xpointer(1/1/1)". -alias id "le_antisym" = "cic:/Coq/Arith/Le/le_antisym.con". +alias id "land" = "cic:/Coq/Init/Logic/and.ind#xpointer(1/1)". alias id "le" = "cic:/Coq/Init/Peano/le.ind#xpointer(1/1)". alias id "le_lt_n_Sm" = "cic:/Coq/Arith/Lt/le_lt_n_Sm.con". alias id "le_lt_or_eq" = "cic:/Coq/Arith/Lt/le_lt_or_eq.con". @@ -90,40 +83,6 @@ alias id "refl_equal" = "cic:/Coq/Init/Logic/eq.ind#xpointer(1/1/1)". alias id "S" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1/2)". alias id "true" = "cic:/Coq/Init/Datatypes/bool.ind#xpointer(1/1/1)". alias id "True" = "cic:/Coq/Init/Logic/True.ind#xpointer(1/1)". -alias id "plus_lt_compat_r" = "cic:/Coq/Arith/Plus/plus_lt_compat_r.con". -alias id "plus_n_O" = "cic:/Coq/Init/Peano/plus_n_O.con". -alias id "plus_le_lt_compat" = "cic:/Coq/Arith/Plus/plus_le_lt_compat.con". -alias id "lt_wf_ind" = "cic:/Coq/Arith/Wf_nat/lt_wf_ind.con". -alias id "minus_Sn_m" = "cic:/Coq/Arith/Minus/minus_Sn_m.con". -alias id "and_ind" = "cic:/Coq/Init/Logic/and_ind.con". -alias id "le_lt_trans" = "cic:/Coq/Arith/Lt/le_lt_trans.con". -alias id "lt_le_trans" = "cic:/Coq/Arith/Lt/lt_le_trans.con". -alias id "le_lt_trans" = "cic:/Coq/Arith/Lt/le_lt_trans.con". -alias id "plus_n_O" = "cic:/Coq/Init/Peano/plus_n_O.con". -alias id "f_equal3" = "cic:/Coq/Init/Logic/f_equal3.con". -alias id "S_pred" = "cic:/Coq/Arith/Lt/S_pred.con". -alias id "lt_le_trans" = "cic:/Coq/Arith/Lt/lt_le_trans.con". -alias id "plus_lt_compat_r" = "cic:/Coq/Arith/Plus/plus_lt_compat_r.con". -alias id "le_plus_trans" = "cic:/Coq/Arith/Plus/le_plus_trans.con". -alias id "f_equal2" = "cic:/Coq/Init/Logic/f_equal2.con". -alias id "le_plus_trans" = "cic:/Coq/Arith/Plus/le_plus_trans.con". -alias id "f_equal2" = "cic:/Coq/Init/Logic/f_equal2.con". -alias id "plus_n_O" = "cic:/Coq/Init/Peano/plus_n_O.con". -alias id "plus_n_O" = "cic:/Coq/Init/Peano/plus_n_O.con". -alias id "lt_trans" = "cic:/Coq/Arith/Lt/lt_trans.con". -alias id "minus_Sn_m" = "cic:/Coq/Arith/Minus/minus_Sn_m.con". -alias id "ex_intro" = "cic:/Coq/Init/Logic/ex.ind#xpointer(1/1/1)". -alias id "lt_trans" = "cic:/Coq/Arith/Lt/lt_trans.con". -alias id "lt_n_Sn" = "cic:/Coq/Arith/Lt/lt_n_Sn.con". -alias id "lt_le_trans" = "cic:/Coq/Arith/Lt/lt_le_trans.con". -alias id "lt_wf_ind" = "cic:/Coq/Arith/Wf_nat/lt_wf_ind.con". -alias id "bool_ind" = "cic:/Coq/Init/Datatypes/bool_ind.con". -alias id "ex_ind" = "cic:/Coq/Init/Logic/ex_ind.con". -alias id "plus_Snm_nSm" = "cic:/Coq/Arith/Plus/plus_Snm_nSm.con". -alias id "plus_lt_le_compat" = "cic:/Coq/Arith/Plus/plus_lt_le_compat.con". -alias id "plus_lt_compat" = "cic:/Coq/Arith/Plus/plus_lt_compat.con". -alias id "lt_S_n" = "cic:/Coq/Arith/Lt/lt_S_n.con". -alias id "minus_n_n" = "cic:/Coq/Arith/Minus/minus_n_n.con". theorem f_equal: \forall A,B:Type. \forall f:A \to B. \forall x,y:A. x = y \to f x = f y. @@ -143,18 +102,9 @@ theorem trans_eq : \forall A:Type. \forall x,y,z:A. x=y \to y=z \to x=z. qed. theorem plus_reg_l: \forall n,m,p. n + m = n + p \to m = p. - intros. apply plus_reg_l; auto. + intros. apply plus_reg_l; autobatch. qed. theorem plus_le_reg_l: \forall p,n,m. p + n <= p + m \to n <= m. - intros. apply plus_le_reg_l; auto. + intros. apply plus_le_reg_l; autobatch. qed. - -default "equality" - cic:/Coq/Init/Logic/eq.ind - cic:/matita/LAMBDA-TYPES/Base-1/preamble/sym_eq.con - cic:/matita/LAMBDA-TYPES/Base-1/preamble/trans_eq.con - cic:/Coq/Init/Logic/eq_ind.con - cic:/Coq/Init/Logic/eq_ind_r.con - cic:/matita/LAMBDA-TYPES/Base-1/preamble/f_equal.con - cic:/matita/legacy/coq/f_equal1.con.