X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2FRELATIONAL-ARITHMETICS%2Fadd_props.ma;h=6d2bef8232e910d91938fdea03fcde7d37812a3f;hb=cadde4128694655a6df2e01b6c6a6e6913ee6096;hp=567bb1fed7b1c4f56a7c24e305813fa68f6f8af7;hpb=389b29d17694ba6abe79dfd36d862321e05d17d6;p=helm.git

diff --git a/helm/software/matita/contribs/RELATIONAL-ARITHMETICS/add_props.ma b/helm/software/matita/contribs/RELATIONAL-ARITHMETICS/add_props.ma
index 567bb1fed..6d2bef823 100644
--- a/helm/software/matita/contribs/RELATIONAL-ARITHMETICS/add_props.ma
+++ b/helm/software/matita/contribs/RELATIONAL-ARITHMETICS/add_props.ma
@@ -14,12 +14,7 @@
 
 set "baseuri" "cic:/matita/RELATIONAL-ARITHMETICS/add_props".
 
-include "add_defs.ma".
-
-axiom add_gen_O_2: \forall p,r. add p O r \to p = r.
-
-axiom add_gen_S_2: \forall p,q,r. add p (S q) r \to 
-                   \exists s. r = (S s) \land add p q s.
+include "add_gen.ma".
 
 theorem add_O_1: \forall q. add O q q.
  intros. elim q; clear q; auto.
@@ -27,9 +22,9 @@ qed.
 
 theorem add_S_1: \forall p,q,r. add p q r \to add (S p) q (S r).
  intros 2. elim q; clear q;
- [ lapply add_gen_O_2 to H using H0. clear H.
+ [ lapply add_gen_O_2 to H as H0. clear H.
    rewrite > H0. clear H0. clear p
- | lapply add_gen_S_2 to H1 using H0. clear H1.
+ | lapply add_gen_S_2 to H1 as H0. clear H1.
    decompose H0.
    rewrite > H2. clear H2. clear r
  ]; auto.
@@ -37,9 +32,9 @@ qed.
 
 theorem add_sym: \forall p,q,r. add p q r \to add q p r.
  intros 2. elim q; clear q;
- [ lapply add_gen_O_2 to H using H0. clear H.
+ [ lapply add_gen_O_2 to H as H0. clear H.
    rewrite > H0. clear H0. clear p
- | lapply add_gen_S_2 to H1 using H0. clear H1.
+ | lapply add_gen_S_2 to H1 as H0. clear H1.
    decompose H0.
    rewrite > H2. clear H2. clear r
  ]; auto.
@@ -47,24 +42,15 @@ qed.
 
 theorem add_shift_S_sx: \forall p,q,r. add p (S q) r \to add (S p) q r.
  intros.
- lapply add_gen_S_2 to H using H0. clear H.
+ lapply add_gen_S_2 to H as H0. clear H.
  decompose H0.
  rewrite > H1. clear H1. clear r.
  auto.
 qed.
 
-theorem add_gen_O_1: \forall q,r. add O q r \to q = r.
- intros. auto.
-qed.
-
-theorem add_gen_S_1: \forall p,q,r. add (S p) q r \to 
-                     \exists s. r = (S s) \land add p q s.
- intros. auto.
-qed.
-
 theorem add_shift_S_dx: \forall p,q,r. add (S p) q r \to add p (S q) r.
  intros.
- lapply add_gen_S_1 to H using H0. clear H.
+ lapply add_gen_S_1 to H as H0. clear H.
  decompose H0.
  rewrite > H1. clear H1. clear r.
  auto.
@@ -74,45 +60,46 @@ theorem add_trans_1: \forall p,q1,r1. add p q1 r1 \to
                      \forall q2,r2. add r1 q2 r2 \to
                      \exists q. add q1 q2 q \land add p q r2.
  intros 2; elim q1; clear q1; intros;
- [ lapply add_gen_O_2 to H using H0. clear H.
+ [ lapply add_gen_O_2 to H as H0. clear H.
    rewrite > H0. clear H0. clear p
- | lapply add_gen_S_2 to H1 using H0. clear H1.
+ | lapply add_gen_S_2 to H1 as H0. clear H1.
    decompose H0.
    rewrite > H3. rewrite > H3 in H2. clear H3. clear r1.
-   lapply add_gen_S_1 to H2 using H0. clear H2.
+   lapply add_gen_S_1 to H2 as H0. clear H2.
    decompose H0.
    rewrite > H2. clear H2. clear r2.
-   lapply H to H4, H3 using H0. clear H. clear H4. clear H3.
+   lapply H to H4, H3 as H0. clear H. clear H4. clear H3.
    decompose H0.
- ]; apply ex_intro; [| auto || auto ].
+ ]; apply ex_intro; [| auto || auto ]. (**)
 qed.
 
 theorem add_trans_2: \forall p1,q,r1. add p1 q r1 \to 
                      \forall p2,r2. add p2 r1 r2 \to
                      \exists p. add p1 p2 p \land add p q r2.
  intros 2; elim q; clear q; intros;
- [ lapply add_gen_O_2 to H using H0. clear H.
+ [ lapply add_gen_O_2 to H as H0. clear H.
    rewrite > H0. clear H0. clear p1
- | lapply add_gen_S_2 to H1 using H0. clear H1.
+ | lapply add_gen_S_2 to H1 as H0. clear H1.
    decompose H0.
    rewrite > H3. rewrite > H3 in H2. clear H3. clear r1.
-   lapply add_gen_S_2 to H2 using H0. clear H2.
+   lapply add_gen_S_2 to H2 as H0. clear H2.
    decompose H0.
    rewrite > H2. clear H2. clear r2.
-   lapply H to H4, H3 using H0. clear H. clear H4. clear H3. 
+   lapply H to H4, H3 as H0. clear H. clear H4. clear H3. 
    decompose H0.
- ]; apply ex_intro; [| auto || auto ].
+ ]; apply ex_intro; [| auto || auto ]. (**)
 qed.
 
 theorem add_conf: \forall p,q,r1. add p q r1 \to 
                   \forall r2. add p q r2 \to r1 = r2.
  intros 2. elim q; clear q; intros;
- [ lapply add_gen_O_2 to H using H0. clear H.
+ [ lapply add_gen_O_2 to H as H0. clear H.
    rewrite > H0 in H1. clear H0. clear p
- | lapply add_gen_S_2 to H1 using H0. clear H1.
+ | lapply add_gen_S_2 to H1 as H0. clear H1.
    decompose H0.
    rewrite > H3. clear H3. clear r1.
-   lapply add_gen_S_2 to H2 using H0. clear H2.
+   lapply add_gen_S_2 to H2 as H0. clear H2.
    decompose H0.
    rewrite > H2. clear H2. clear r2.
  ]; auto.
+qed.