X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Flibrary%2Fdatatypes%2Fconstructors.ma;h=dd2a1760b9c640c7853fafbeb33babe2d7670ad2;hb=c445ba5534cccde19016c92660ab52777af221c0;hp=3f74db5ad85cfb8b7e9ce99d414471fe53f88f3b;hpb=68a2f8d0a8c34cb7ea0438c7db9222a853a38826;p=helm.git

diff --git a/helm/software/matita/library/datatypes/constructors.ma b/helm/software/matita/library/datatypes/constructors.ma
index 3f74db5ad..dd2a1760b 100644
--- a/helm/software/matita/library/datatypes/constructors.ma
+++ b/helm/software/matita/library/datatypes/constructors.ma
@@ -17,33 +17,55 @@ include "logic/equality.ma".
 
 inductive void : Set \def.
 
-inductive Prod (A,B:Set) : Set \def
+inductive unit : Set ≝ something: unit.
+
+inductive Prod (A,B:Type) : Type \def
 pair : A \to B \to Prod A B.
 
-definition fst \def \lambda A,B:Set.\lambda p: Prod A B.
+interpretation "Pair construction" 'pair x y =
+ (cic:/matita/datatypes/constructors/Prod.ind#xpointer(1/1/1) _ _ x y).
+
+notation "hvbox(\langle x break , y \rangle )" with precedence 89
+for @{ 'pair $x $y}.
+
+interpretation "Product" 'product x y =
+ (cic:/matita/datatypes/constructors/Prod.ind#xpointer(1/1) x y).
+
+notation "hvbox(x break \times y)" with precedence 89
+for @{ 'product $x $y}.
+
+definition fst \def \lambda A,B:Type.\lambda p: Prod A B.
 match p with
 [(pair a b) \Rightarrow a]. 
 
-definition snd \def \lambda A,B:Set.\lambda p: Prod A B.
+definition snd \def \lambda A,B:Type.\lambda p: Prod A B.
 match p with
 [(pair a b) \Rightarrow b].
 
-theorem eq_pair_fst_snd: \forall A,B:Set.\forall p: Prod A B.
-p = pair A B (fst A B p) (snd A B p).
+interpretation "First projection" 'fst x =
+ (cic:/matita/datatypes/constructors/fst.con _ _ x).
+
+notation "\fst x" with precedence 89
+for @{ 'fst $x}.
+
+interpretation "Second projection" 'snd x =
+ (cic:/matita/datatypes/constructors/snd.con _ _ x).
+
+notation "\snd x" with precedence 89
+for @{ 'snd $x}.
+
+theorem eq_pair_fst_snd: \forall A,B:Type.\forall p:Prod A B.
+p = 〈 (\fst p), (\snd p) 〉.
 intros.elim p.simplify.reflexivity.
 qed.
 
-inductive Sum (A,B:Set) : Set \def
+inductive Sum (A,B:Type) : Type \def
   inl : A \to Sum A B
 | inr : B \to Sum A B.
 
-inductive ProdT (A,B:Type) : Type \def
-pairT : A \to B \to ProdT A B.
+interpretation "Disjoint union" 'plus A B =
+ (cic:/matita/datatypes/constructors/Sum.ind#xpointer(1/1) A B).
 
-definition fstT \def \lambda A,B:Type.\lambda p: ProdT A B.
-match p with
-[(pairT a b) \Rightarrow a]. 
-
-definition sndT \def \lambda A,B:Type.\lambda p: ProdT A B.
-match p with
-[(pairT a b) \Rightarrow b].
\ No newline at end of file
+inductive option (A:Type) : Type ≝
+   None : option A
+ | Some : A → option A.
\ No newline at end of file