+++ /dev/null
-(**************************************************************************)
-(* ___ *)
-(* ||M|| *)
-(* ||A|| A project by Andrea Asperti *)
-(* ||T|| *)
-(* ||I|| Developers: *)
-(* ||T|| The HELM team. *)
-(* ||A|| http://helm.cs.unibo.it *)
-(* \ / *)
-(* \ / This file is distributed under the terms of the *)
-(* v GNU General Public License Version 2 *)
-(* *)
-(**************************************************************************)
-
-set "baseuri" "cic:/matita/RELATIONAL/Bool/defs".
-
-inductive Bool: Set \def
- | false: Bool
- | true: Bool
-.
+++ /dev/null
-(**************************************************************************)
-(* ___ *)
-(* ||M|| *)
-(* ||A|| A project by Andrea Asperti *)
-(* ||T|| *)
-(* ||I|| Developers: *)
-(* ||T|| The HELM team. *)
-(* ||A|| http://helm.cs.unibo.it *)
-(* \ / *)
-(* \ / This file is distributed under the terms of the *)
-(* v GNU General Public License Version 2 *)
-(* *)
-(**************************************************************************)
-
-set "baseuri" "cic:/matita/RELATIONAL/List/defs".
-
-inductive List (A:Set): Set \def
- | nil: List A
- | cons: List A \to A \to List A
-.
-
-(*CSC: the URI must disappear: there is a bug now *)
-interpretation "nil" 'nil =
- (cic:/matita/RELATIONAL/List/defs/List.ind#xpointer(1/1) _).
-
-notation "hvbox([])"
- non associative with precedence 95
-for @{ 'nil }.
-
-(*CSC: the URI must disappear: there is a bug now *)
-interpretation "right cons" 'rcons x y =
- (cic:/matita/RELATIONAL/List/defs/List.ind#xpointer(1/2) _ x y).
-
-notation "hvbox([a break @ b])"
- non associative with precedence 95
-for @{ 'rcons $a $b}.
-
+++ /dev/null
-(**************************************************************************)
-(* ___ *)
-(* ||M|| *)
-(* ||A|| A project by Andrea Asperti *)
-(* ||T|| *)
-(* ||I|| Developers: *)
-(* ||T|| The HELM team. *)
-(* ||A|| http://helm.cs.unibo.it *)
-(* \ / *)
-(* \ / This file is distributed under the terms of the *)
-(* v GNU General Public License Version 2 *)
-(* *)
-(**************************************************************************)
-
-set "baseuri" "cic:/matita/RELATIONAL/NLE/dec".
-
-include "NLE/props.ma".
-
-theorem nat_dec_lt_ge: \forall x,y. x < y \lor y <= x.
- intros 2; elim y; clear y;
- [ auto
- | decompose;
- [ lapply linear nle_inv_succ_1 to H1. decompose.
- subst. auto depth=4
- | lapply linear nle_lt_or_eq to H1; decompose;
- subst; auto
- ]
- ].
-qed.
| nle_nplus: \forall p. (p + q == r) \to NLE q r.
(*CSC: the URI must disappear: there is a bug now *)
-interpretation "natural 'less or equal to'" 'leq x y =
+interpretation "natural 'greater or equal to'" 'geq y x=
(cic:/matita/RELATIONAL/NLE/defs/NLE.ind#xpointer(1/1) x y).
(*CSC: the URI must disappear: there is a bug now *)
-interpretation "natural 'less than'" 'lt x y =
+interpretation "natural 'greater than'" 'gt y x =
(cic:/matita/RELATIONAL/NLE/defs/NLE.ind#xpointer(1/1)
- (cic:/matita/RELATIONAL/Nat/defs/Nat.ind#xpointer(1/1/2) x) y).
+ (cic:/matita/RELATIONAL/datatypes/Nat/Nat.ind#xpointer(1/1/2) x) y).
(*CSC: the URI must disappear: there is a bug now *)
-interpretation "natural 'greater or equal to'" 'geq y x=
+interpretation "natural 'less or equal to'" 'leq x y =
(cic:/matita/RELATIONAL/NLE/defs/NLE.ind#xpointer(1/1) x y).
(*CSC: the URI must disappear: there is a bug now *)
-interpretation "natural 'greater than'" 'gt y x =
+interpretation "natural 'less than'" 'lt x y =
(cic:/matita/RELATIONAL/NLE/defs/NLE.ind#xpointer(1/1)
- (cic:/matita/RELATIONAL/Nat/defs/Nat.ind#xpointer(1/1/2) x) y).
+ (cic:/matita/RELATIONAL/datatypes/Nat/Nat.ind#xpointer(1/1/2) x) y).
+++ /dev/null
-(**************************************************************************)
-(* ___ *)
-(* ||M|| *)
-(* ||A|| A project by Andrea Asperti *)
-(* ||T|| *)
-(* ||I|| Developers: *)
-(* ||T|| The HELM team. *)
-(* ||A|| http://helm.cs.unibo.it *)
-(* \ / *)
-(* \ / This file is distributed under the terms of the *)
-(* v GNU General Public License Version 2 *)
-(* *)
-(**************************************************************************)
-
-set "baseuri" "cic:/matita/RELATIONAL/NLE/fwd".
-
-include "logic/connectives.ma".
-
-include "NPlus/fwd.ma".
-include "NLE/defs.ma".
-
-theorem nle_inv_succ_1: \forall x,y. x < y \to
- \exists z. y = succ z \land x <= z.
- intros. elim H.
- lapply linear nplus_gen_succ_2 to H1.
- decompose. subst. auto depth = 4.
-qed.
-
-theorem nle_inv_succ_succ: \forall x,y. x < succ y \to x <= y.
- intros.
- lapply linear nle_inv_succ_1 to H. decompose.
- lapply linear eq_gen_succ_succ to H1. subst.
- auto.
-qed.
-
-theorem nle_inv_succ_zero: \forall x. x < zero \to False.
- intros.
- lapply linear nle_inv_succ_1 to H. decompose.
- lapply linear eq_gen_zero_succ to H1. decompose.
-qed.
-
-theorem nle_inv_zero_2: \forall x. x <= zero \to x = zero.
- intros 1. elim x; clear x; intros;
- [ auto
- | lapply linear nle_inv_succ_zero to H1. decompose.
- ].
-qed.
-
-theorem nle_inv_succ_2: \forall y,x. x <= succ y \to
- x = zero \lor \exists z. x = succ z \land z <= y.
- intros 2; elim x; clear x; intros;
- [ auto
- | lapply linear nle_inv_succ_succ to H1.
- auto depth = 4.
- ].
-qed.
--- /dev/null
+(**************************************************************************)
+(* ___ *)
+(* ||M|| *)
+(* ||A|| A project by Andrea Asperti *)
+(* ||T|| *)
+(* ||I|| Developers: *)
+(* ||T|| The HELM team. *)
+(* ||A|| http://helm.cs.unibo.it *)
+(* \ / *)
+(* \ / This file is distributed under the terms of the *)
+(* v GNU General Public License Version 2 *)
+(* *)
+(**************************************************************************)
+
+set "baseuri" "cic:/matita/RELATIONAL/NLE/inv".
+
+include "NPlus/inv.ma".
+include "NLE/defs.ma".
+
+theorem nle_inv_succ_1: \forall x,y. x < y \to
+ \exists z. y = succ z \land x <= z.
+ intros. elim H.
+ lapply linear nplus_gen_succ_2 to H1.
+ decompose. subst. auto depth = 4.
+qed.
+
+theorem nle_inv_succ_succ: \forall x,y. x < succ y \to x <= y.
+ intros.
+ lapply linear nle_inv_succ_1 to H. decompose.
+ destruct H1. clear H1. subst.
+ auto.
+qed.
+
+theorem nle_inv_succ_zero: \forall x. x < zero \to False.
+ intros.
+ lapply linear nle_inv_succ_1 to H. decompose.
+ destruct H1.
+qed.
+
+theorem nle_inv_zero_2: \forall x. x <= zero \to x = zero.
+ intros 1. elim x; clear x; intros;
+ [ auto
+ | lapply linear nle_inv_succ_zero to H1. decompose.
+ ].
+qed.
+
+theorem nle_inv_succ_2: \forall y,x. x <= succ y \to
+ x = zero \lor \exists z. x = succ z \land z <= y.
+ intros 2; elim x; clear x; intros;
+ [ auto
+ | lapply linear nle_inv_succ_succ to H1.
+ auto depth = 4.
+ ].
+qed.
include "NLE/defs.ma".
-axiom pippo: \forall x1, x2, x3. (x1 + x2 == x3) \to
- \forall y1, y2, y3. (y1 + y2 == y3) \to
- x1 <= y1 \to x2 < y2 \to x3 < y3.
+axiom nle_nplus_comp: \forall x1, x2, x3. (x1 + x2 == x3) \to
+ \forall y1, y2, y3. (y1 + y2 == y3) \to
+ x1 <= y1 \to x2 <= y2 \to x3 <= y3.
+
+axiom nle_nplus_comp_lt_2: \forall x1, x2, x3. (x1 + x2 == x3) \to
+ \forall y1, y2, y3. (y1 + y2 == y3) \to
+ x1 <= y1 \to x2 < y2 \to x3 < y3.
set "baseuri" "cic:/matita/RELATIONAL/NLE/props".
-include "NLE/fwd.ma".
+include "NLE/inv.ma".
theorem nle_zero_1: \forall q. zero <= q.
intros. auto.
| decompose; subst; auto
].
qed.
+
+theorem nat_dec_lt_ge: \forall x,y. x < y \lor y <= x.
+ intros 2; elim y; clear y;
+ [ auto
+ | decompose;
+ [ lapply linear nle_inv_succ_1 to H1. decompose.
+ subst. auto depth=4
+ | lapply linear nle_lt_or_eq to H1; decompose;
+ subst; auto
+ ]
+ ].
+qed.
set "baseuri" "cic:/matita/RELATIONAL/NPlus/defs".
-include "logic/equality.ma".
-include "Nat/defs.ma".
+include "datatypes/defs.ma".
inductive NPlus (p:Nat): Nat \to Nat \to Prop \def
| nplus_zero_2: NPlus p zero p
+++ /dev/null
-(**************************************************************************)
-(* ___ *)
-(* ||M|| *)
-(* ||A|| A project by Andrea Asperti *)
-(* ||T|| *)
-(* ||I|| Developers: *)
-(* ||T|| The HELM team. *)
-(* ||A|| http://helm.cs.unibo.it *)
-(* \ / *)
-(* \ / This file is distributed under the terms of the *)
-(* v GNU General Public License Version 2 *)
-(* *)
-(**************************************************************************)
-
-set "baseuri" "cic:/matita/RELATIONAL/NPlus/fwd".
-
-include "Nat/fwd.ma".
-include "NPlus/defs.ma".
-
-(* primitive generation lemmas proved by elimination and inversion *)
-
-theorem nplus_gen_zero_1: \forall q,r. (zero + q == r) \to q = r.
- intros. elim H; clear H q r; intros;
- [ reflexivity
- | clear H1. auto new timeout=30
- ].
-qed.
-
-theorem nplus_gen_succ_1: \forall p,q,r. ((succ p) + q == r) \to
- \exists s. r = (succ s) \land p + q == s.
- intros. elim H; clear H q r; intros;
- [
- | clear H1.
- decompose.
- subst.
- ]; apply ex_intro; [| auto new timeout=30 || auto new timeout=30 ]. (**)
-qed.
-
-theorem nplus_gen_zero_2: \forall p,r. (p + zero == r) \to p = r.
- intros. inversion H; clear H; intros;
- [ auto new timeout=30
- | clear H H1.
- lapply eq_gen_zero_succ to H2 as H0. decompose.
- ].
-qed.
-
-theorem nplus_gen_succ_2: \forall p,q,r. (p + (succ q) == r) \to
- \exists s. r = (succ s) \land p + q == s.
- intros. inversion H; clear H; intros;
- [ lapply eq_gen_succ_zero to H as H0. decompose.
- | clear H1 H3 r.
- lapply linear eq_gen_succ_succ to H2 as H0.
- subst.
- apply ex_intro; [| auto new timeout=30 ] (**)
- ].
-qed.
-
-theorem nplus_gen_zero_3: \forall p,q. (p + q == zero) \to
- p = zero \land q = zero.
- intros. inversion H; clear H; intros;
- [ subst. auto new timeout=30
- | clear H H1.
- lapply eq_gen_zero_succ to H3 as H0. decompose.
- ].
-qed.
-
-theorem nplus_gen_succ_3: \forall p,q,r. (p + q == (succ r)) \to
- \exists s. p = succ s \land (s + q == r) \lor
- q = succ s \land p + s == r.
- intros. inversion H; clear H; intros;
- [ subst.
- | clear H1.
- lapply linear eq_gen_succ_succ to H3 as H0.
- subst.
- ]; apply ex_intro; [| auto new timeout=30 || auto new timeout=30 ] (**)
-qed.
-(*
-(* alternative proofs invoking nplus_gen_2 *)
-
-variant nplus_gen_zero_3_alt: \forall p,q. (p + q == zero) \to
- p = zero \land q = zero.
- intros 2. elim q; clear q; intros;
- [ lapply linear nplus_gen_zero_2 to H as H0.
- subst. auto new timeout=30
- | clear H.
- lapply linear nplus_gen_succ_2 to H1 as H0.
- decompose.
- lapply linear eq_gen_zero_succ to H1 as H0. apply H0
- ].
-qed.
-
-variant nplus_gen_succ_3_alt: \forall p,q,r. (p + q == (succ r)) \to
- \exists s. p = succ s \land (s + q == r) \lor
- q = succ s \land p + s == r.
- intros 2. elim q; clear q; intros;
- [ lapply linear nplus_gen_zero_2 to H as H0.
- subst
- | clear H.
- lapply linear nplus_gen_succ_2 to H1 as H0.
- decompose.
- lapply linear eq_gen_succ_succ to H1 as H0.
- subst
- ]; apply ex_intro; [| auto new timeout=30 || auto new timeout=30 ]. (**)
-qed.
-*)
-(* other simplification lemmas *)
-
-theorem nplus_gen_eq_2_3: \forall p,q. (p + q == q) \to p = zero.
- intros 2. elim q; clear q; intros;
- [ lapply linear nplus_gen_zero_2 to H as H0.
- subst
- | lapply linear nplus_gen_succ_2 to H1 as H0.
- decompose.
- lapply linear eq_gen_succ_succ to H2 as H0.
- subst
- ]; auto new timeout=30.
-qed.
-
-theorem nplus_gen_eq_1_3: \forall p,q. (p + q == p) \to q = zero.
- intros 1. elim p; clear p; intros;
- [ lapply linear nplus_gen_zero_1 to H as H0.
- subst
- | lapply linear nplus_gen_succ_1 to H1 as H0.
- decompose.
- lapply linear eq_gen_succ_succ to H2 as H0.
- subst
- ]; auto new timeout=30.
-qed.
--- /dev/null
+(**************************************************************************)
+(* ___ *)
+(* ||M|| *)
+(* ||A|| A project by Andrea Asperti *)
+(* ||T|| *)
+(* ||I|| Developers: *)
+(* ||T|| The HELM team. *)
+(* ||A|| http://helm.cs.unibo.it *)
+(* \ / *)
+(* \ / This file is distributed under the terms of the *)
+(* v GNU General Public License Version 2 *)
+(* *)
+(**************************************************************************)
+
+set "baseuri" "cic:/matita/RELATIONAL/NPlus/inv".
+
+include "NPlus/defs.ma".
+
+(* primitive generation lemmas proved by elimination and inversion *)
+
+theorem nplus_gen_zero_1: \forall q,r. (zero + q == r) \to q = r.
+ intros. elim H; clear H q r; intros;
+ [ reflexivity
+ | clear H1. auto new timeout=30
+ ].
+qed.
+
+theorem nplus_gen_succ_1: \forall p,q,r. ((succ p) + q == r) \to
+ \exists s. r = (succ s) \land p + q == s.
+ intros. elim H; clear H q r; intros;
+ [
+ | clear H1.
+ decompose.
+ subst.
+ ]; apply ex_intro; [| auto new timeout=30 || auto new timeout=30 ]. (**)
+qed.
+
+theorem nplus_gen_zero_2: \forall p,r. (p + zero == r) \to p = r.
+ intros. inversion H; clear H; intros;
+ [ auto new timeout=30
+ | clear H H1.
+ destruct H2.
+ ].
+qed.
+
+theorem nplus_gen_succ_2: \forall p,q,r. (p + (succ q) == r) \to
+ \exists s. r = (succ s) \land p + q == s.
+ intros. inversion H; clear H; intros;
+ [ destruct H.
+ | clear H1 H3 r.
+ destruct H2; clear H2.
+ subst.
+ apply ex_intro; [| auto new timeout=30 ] (**)
+ ].
+qed.
+
+theorem nplus_gen_zero_3: \forall p,q. (p + q == zero) \to
+ p = zero \land q = zero.
+ intros. inversion H; clear H; intros;
+ [ subst. auto new timeout=30
+ | clear H H1.
+ destruct H3.
+ ].
+qed.
+
+theorem nplus_gen_succ_3: \forall p,q,r. (p + q == (succ r)) \to
+ \exists s. p = succ s \land (s + q == r) \lor
+ q = succ s \land p + s == r.
+ intros. inversion H; clear H; intros;
+ [ subst.
+ | clear H1.
+ destruct H3. clear H3.
+ subst.
+ ]; apply ex_intro; [| auto new timeout=30 || auto new timeout=30 ] (**)
+qed.
+(*
+(* alternative proofs invoking nplus_gen_2 *)
+
+variant nplus_gen_zero_3_alt: \forall p,q. (p + q == zero) \to
+ p = zero \land q = zero.
+ intros 2. elim q; clear q; intros;
+ [ lapply linear nplus_gen_zero_2 to H as H0.
+ subst. auto new timeout=30
+ | clear H.
+ lapply linear nplus_gen_succ_2 to H1 as H0.
+ decompose.
+ lapply linear eq_gen_zero_succ to H1 as H0. apply H0
+ ].
+qed.
+
+variant nplus_gen_succ_3_alt: \forall p,q,r. (p + q == (succ r)) \to
+ \exists s. p = succ s \land (s + q == r) \lor
+ q = succ s \land p + s == r.
+ intros 2. elim q; clear q; intros;
+ [ lapply linear nplus_gen_zero_2 to H as H0.
+ subst
+ | clear H.
+ lapply linear nplus_gen_succ_2 to H1 as H0.
+ decompose.
+ lapply linear eq_gen_succ_succ to H1 as H0.
+ subst
+ ]; apply ex_intro; [| auto new timeout=30 || auto new timeout=30 ]. (**)
+qed.
+*)
+(* other simplification lemmas *)
+
+theorem nplus_gen_eq_2_3: \forall p,q. (p + q == q) \to p = zero.
+ intros 2. elim q; clear q; intros;
+ [ lapply linear nplus_gen_zero_2 to H as H0.
+ subst
+ | lapply linear nplus_gen_succ_2 to H1 as H0.
+ decompose.
+ destruct H2. clear H2.
+ subst
+ ]; auto new timeout=30.
+qed.
+
+theorem nplus_gen_eq_1_3: \forall p,q. (p + q == p) \to q = zero.
+ intros 1. elim p; clear p; intros;
+ [ lapply linear nplus_gen_zero_1 to H as H0.
+ subst
+ | lapply linear nplus_gen_succ_1 to H1 as H0.
+ decompose.
+ destruct H2. clear H2.
+ subst
+ ]; auto new timeout=30.
+qed.
set "baseuri" "cic:/matita/RELATIONAL/NPlus/props".
-include "NPlus/fwd.ma".
+include "NPlus/inv.ma".
theorem nplus_zero_1: \forall q. zero + q == q.
intros. elim q; clear q; auto new timeout=100.
set "baseuri" "cic:/matita/RELATIONAL/NPlusList/defs".
-include "List/defs.ma".
+include "datatypes/List.ma".
include "NPlus/defs.ma".
+++ /dev/null
-(**************************************************************************)
-(* ___ *)
-(* ||M|| *)
-(* ||A|| A project by Andrea Asperti *)
-(* ||T|| *)
-(* ||I|| Developers: *)
-(* ||T|| The HELM team. *)
-(* ||A|| http://helm.cs.unibo.it *)
-(* \ / *)
-(* \ / This file is distributed under the terms of the *)
-(* v GNU General Public License Version 2 *)
-(* *)
-(**************************************************************************)
-
-set "baseuri" "cic:/matita/RELATIONAL/Nat/defs".
-
-inductive Nat: Set \def
- | zero: Nat
- | succ: Nat \to Nat
-.
+++ /dev/null
-(**************************************************************************)
-(* ___ *)
-(* ||M|| *)
-(* ||A|| A project by Andrea Asperti *)
-(* ||T|| *)
-(* ||I|| Developers: *)
-(* ||T|| The HELM team. *)
-(* ||A|| http://helm.cs.unibo.it *)
-(* \ / *)
-(* \ / This file is distributed under the terms of the *)
-(* v GNU General Public License Version 2 *)
-(* *)
-(**************************************************************************)
-
-set "baseuri" "cic:/matita/RELATIONAL/Nat/fwd".
-
-include "logic/equality.ma".
-
-include "Nat/defs.ma".
-
-theorem eq_gen_zero_succ: \forall m2. zero = succ m2 \to False.
- intros. destruct H.
-qed.
-
-theorem eq_gen_succ_zero: \forall m1. succ m1 = zero \to False.
- intros. destruct H.
-qed.
-
-theorem eq_gen_succ_succ: \forall m1,m2. succ m1 = succ m2 \to m1 = m2.
- intros. destruct H. assumption.
-qed.
--- /dev/null
+(**************************************************************************)
+(* ___ *)
+(* ||M|| *)
+(* ||A|| A project by Andrea Asperti *)
+(* ||T|| *)
+(* ||I|| Developers: *)
+(* ||T|| The HELM team. *)
+(* ||A|| http://helm.cs.unibo.it *)
+(* \ / *)
+(* \ / This file is distributed under the terms of the *)
+(* v GNU General Public License Version 2 *)
+(* *)
+(**************************************************************************)
+
+set "baseuri" "cic:/matita/RELATIONAL/datatypes/Bool".
+
+include "preamble.ma".
+
+inductive Bool: Set \def
+ | false: Bool
+ | true : Bool
+.
--- /dev/null
+(**************************************************************************)
+(* ___ *)
+(* ||M|| *)
+(* ||A|| A project by Andrea Asperti *)
+(* ||T|| *)
+(* ||I|| Developers: *)
+(* ||T|| The HELM team. *)
+(* ||A|| http://helm.cs.unibo.it *)
+(* \ / *)
+(* \ / This file is distributed under the terms of the *)
+(* v GNU General Public License Version 2 *)
+(* *)
+(**************************************************************************)
+
+set "baseuri" "cic:/matita/RELATIONAL/datatypes/List".
+
+include "preamble.ma".
+
+inductive List (A:Set): Set \def
+ | nil: List A
+ | cons: List A \to A \to List A
+.
+
+(*CSC: the URI must disappear: there is a bug now *)
+interpretation "nil" 'nil =
+ (cic:/matita/RELATIONAL/datatypes/List/List.ind#xpointer(1/1) _).
+
+notation "hvbox([])"
+ non associative with precedence 95
+for @{ 'nil }.
+
+(*CSC: the URI must disappear: there is a bug now *)
+interpretation "right cons" 'rcons x y =
+ (cic:/matita/RELATIONAL/datatypes/List/List.ind#xpointer(1/2) _ x y).
+
+notation "hvbox([a break @ b])"
+ non associative with precedence 95
+for @{ 'rcons $a $b}.
+
--- /dev/null
+(**************************************************************************)
+(* ___ *)
+(* ||M|| *)
+(* ||A|| A project by Andrea Asperti *)
+(* ||T|| *)
+(* ||I|| Developers: *)
+(* ||T|| The HELM team. *)
+(* ||A|| http://helm.cs.unibo.it *)
+(* \ / *)
+(* \ / This file is distributed under the terms of the *)
+(* v GNU General Public License Version 2 *)
+(* *)
+(**************************************************************************)
+
+set "baseuri" "cic:/matita/RELATIONAL/datatypes/Nat".
+
+include "preamble.ma".
+
+inductive Nat: Set \def
+ | zero: Nat
+ | succ: Nat \to Nat
+.
--- /dev/null
+(**************************************************************************)
+(* ___ *)
+(* ||M|| *)
+(* ||A|| A project by Andrea Asperti *)
+(* ||T|| *)
+(* ||I|| Developers: *)
+(* ||T|| The HELM team. *)
+(* ||A|| http://helm.cs.unibo.it *)
+(* \ / *)
+(* \ / This file is distributed under the terms of the *)
+(* v GNU General Public License Version 2 *)
+(* *)
+(**************************************************************************)
+
+set "baseuri" "cic:/matita/RELATIONAL/preamble".
+
+include "logic/equality.ma".
+include "logic/connectives.ma".