X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Flibrary%2FZ%2Fplus.ma;h=976f6cfb3ce01d379244fc66ec964a99563917d3;hb=97c2d258a5c524eb5c4b85208899d80751a2c82f;hp=c1db18b18d949b5573cb93829bb8f3c721cad605;hpb=5433a131a7ff29529747e58c68dbf258d696e55b;p=helm.git diff --git a/helm/matita/library/Z/plus.ma b/helm/matita/library/Z/plus.ma index c1db18b18..976f6cfb3 100644 --- a/helm/matita/library/Z/plus.ma +++ b/helm/matita/library/Z/plus.ma @@ -140,7 +140,7 @@ intros.elim x. apply Zplus_pos_pos. apply Zplus_pos_neg. elim y. - rewrite < sym_Zplus.rewrite < sym_Zplus (Zpred OZ). + rewrite < sym_Zplus.rewrite < (sym_Zplus (Zpred OZ)). rewrite < Zpred_Zplus_neg_O.rewrite > Zpred_Zsucc.simplify.reflexivity. apply Zplus_neg_pos. rewrite < Zplus_neg_neg.reflexivity. @@ -154,8 +154,8 @@ qed. theorem Zplus_Zsucc_pos_neg: \forall n,m. (Zsucc (pos n))+(neg m) = (Zsucc ((pos n)+(neg m))). intros. -apply nat_elim2 -(\lambda n,m. (Zsucc (pos n))+(neg m) = (Zsucc ((pos n)+(neg m)))).intro. +apply (nat_elim2 +(\lambda n,m. (Zsucc (pos n))+(neg m) = (Zsucc ((pos n)+(neg m))))).intro. intros.elim n1. simplify. reflexivity. elim n2.simplify. reflexivity. @@ -171,8 +171,8 @@ qed. theorem Zplus_Zsucc_neg_neg : \forall n,m. Zsucc (neg n) + neg m = Zsucc (neg n + neg m). intros. -apply nat_elim2 -(\lambda n,m. Zsucc (neg n) + neg m = Zsucc (neg n + neg m)).intro. +apply (nat_elim2 +(\lambda n,m. Zsucc (neg n) + neg m = Zsucc (neg n + neg m))).intro. intros.elim n1. simplify. reflexivity. elim n2.simplify. reflexivity. @@ -188,8 +188,8 @@ qed. theorem Zplus_Zsucc_neg_pos: \forall n,m. Zsucc (neg n)+(pos m) = Zsucc ((neg n)+(pos m)). intros. -apply nat_elim2 -(\lambda n,m. Zsucc (neg n) + (pos m) = Zsucc (neg n + pos m)). +apply (nat_elim2 +(\lambda n,m. Zsucc (neg n) + (pos m) = Zsucc (neg n + pos m))). intros.elim n1. simplify. reflexivity. elim n2.simplify. reflexivity. @@ -210,18 +210,18 @@ intros.elim x. simplify.reflexivity. rewrite < Zsucc_Zplus_pos_O.reflexivity. elim y. - rewrite < sym_Zplus OZ.reflexivity. + rewrite < (sym_Zplus OZ).reflexivity. apply Zplus_Zsucc_pos_pos. apply Zplus_Zsucc_pos_neg. elim y. - rewrite < sym_Zplus.rewrite < sym_Zplus OZ.simplify.reflexivity. + rewrite < sym_Zplus.rewrite < (sym_Zplus OZ).simplify.reflexivity. apply Zplus_Zsucc_neg_pos. apply Zplus_Zsucc_neg_neg. qed. theorem Zplus_Zpred: \forall x,y:Z. (Zpred x)+y = Zpred (x+y). intros. -cut Zpred (x+y) = Zpred ((Zsucc (Zpred x))+y). +cut (Zpred (x+y) = Zpred ((Zsucc (Zpred x))+y)). rewrite > Hcut. rewrite > Zplus_Zsucc. rewrite > Zpred_Zsucc. @@ -232,20 +232,20 @@ qed. theorem associative_Zplus: associative Z Zplus. -change with \forall x,y,z:Z. (x + y) + z = x + (y + z). +change with (\forall x,y,z:Z. (x + y) + z = x + (y + z)). (* simplify. *) intros.elim x. simplify.reflexivity. elim n. rewrite < Zsucc_Zplus_pos_O.rewrite < Zsucc_Zplus_pos_O. rewrite > Zplus_Zsucc.reflexivity. - rewrite > Zplus_Zsucc (pos n1).rewrite > Zplus_Zsucc (pos n1). - rewrite > Zplus_Zsucc ((pos n1)+y).apply eq_f.assumption. + rewrite > (Zplus_Zsucc (pos n1)).rewrite > (Zplus_Zsucc (pos n1)). + rewrite > (Zplus_Zsucc ((pos n1)+y)).apply eq_f.assumption. elim n. rewrite < (Zpred_Zplus_neg_O (y+z)).rewrite < (Zpred_Zplus_neg_O y). rewrite < Zplus_Zpred.reflexivity. - rewrite > Zplus_Zpred (neg n1).rewrite > Zplus_Zpred (neg n1). - rewrite > Zplus_Zpred ((neg n1)+y).apply eq_f.assumption. + rewrite > (Zplus_Zpred (neg n1)).rewrite > (Zplus_Zpred (neg n1)). + rewrite > (Zplus_Zpred ((neg n1)+y)).apply eq_f.assumption. qed. variant assoc_Zplus : \forall x,y,z:Z. (x+y)+z = x+(y+z)