X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Flibrary%2Flist%2Flist.ma;h=f214ff3efa11b6b2559bfa302f2d5dfb4174495d;hb=ccf5bef29f42897a28ee7cc797c3d5698adfcb1d;hp=ffa2c8ef9ac106c007f701cef1cf21b589f51a19;hpb=7f2444c2670cadafddd8785b687ef312158376b0;p=helm.git

diff --git a/matita/library/list/list.ma b/matita/library/list/list.ma
index ffa2c8ef9..f214ff3ef 100644
--- a/matita/library/list/list.ma
+++ b/matita/library/list/list.ma
@@ -16,7 +16,7 @@ set "baseuri" "cic:/matita/list/".
 include "logic/equality.ma".
 include "higher_order_defs/functions.ma".
 
-inductive list (A:Set) : Set :=
+inductive list (A:Type) : Type :=
   | nil: list A
   | cons: A -> list A -> list A.
 
@@ -39,12 +39,12 @@ interpretation "cons" 'cons hd tl =
 (* theorem test_notation: [O; S O; S (S O)] = O :: S O :: S (S O) :: []. *)
 
 theorem nil_cons:
-  \forall A:Set.\forall l:list A.\forall a:A.
+  \forall A:Type.\forall l:list A.\forall a:A.
     a::l <> [].
   intros;
   unfold Not;
   intros;
-  discriminate H.
+  destruct H.
 qed.
 
 let rec id_list A (l: list A) on l :=
@@ -57,14 +57,14 @@ let rec append A (l1: list A) l2 on l1 :=
   [ nil => l2
   | (cons hd tl) => hd :: append A tl l2 ].
 
-definition tail := \lambda A:Set. \lambda l: list A.
+definition tail := \lambda A:Type. \lambda l: list A.
   match l with
   [ nil => []
   | (cons hd tl) => tl].
 
 interpretation "append" 'append l1 l2 = (cic:/matita/list/append.con _ l1 l2).
 
-theorem append_nil: \forall A:Set.\forall l:list A.l @ [] = l.
+theorem append_nil: \forall A:Type.\forall l:list A.l @ [] = l.
   intros;
   elim l;
   [ reflexivity;
@@ -74,7 +74,7 @@ theorem append_nil: \forall A:Set.\forall l:list A.l @ [] = l.
   ]
 qed.
 
-theorem associative_append: \forall A:Set.associative (list A) (append A).
+theorem associative_append: \forall A:Type.associative (list A) (append A).
   intros; unfold; intros;
   elim x;
   [ simplify;
@@ -86,15 +86,38 @@ theorem associative_append: \forall A:Set.associative (list A) (append A).
 qed.
 
 theorem cons_append_commute:
-  \forall A:Set.\forall l1,l2:list A.\forall a:A.
+  \forall A:Type.\forall l1,l2:list A.\forall a:A.
     a :: (l1 @ l2) = (a :: l1) @ l2.
   intros;
   reflexivity;
 qed.
 
+inductive permutation (A:Type) : list A -> list A -> Prop \def
+  | refl : \forall l:list A. permutation ? l l
+  | swap : \forall l:list A. \forall x,y:A. 
+              permutation ? (x :: y :: l) (y :: x :: l)
+  | trans : \forall l1,l2,l3:list A.
+              permutation ? l1 l2 -> permut1 ? l2 l3 -> permutation ? l1 l3
+with permut1 : list A -> list A -> Prop \def
+  | step : \forall l1,l2:list A. \forall x,y:A. 
+      permut1 ? (l1 @ (x :: y :: l2)) (l1 @ (y :: x :: l2)).
+
+include "nat/nat.ma".  
+   
+definition x1 \def S O.
+definition x2 \def S x1.
+definition x3 \def S x2.
+   
+theorem tmp : permutation nat (x1 :: x2 :: x3 :: []) (x1 :: x3 :: x2 :: []).
+  apply (trans ? (x1 :: x2 :: x3 :: []) (x1 :: x2 :: x3 :: []) ?).
+  apply refl.
+  apply (step ? (x1::[]) [] x2 x3).
+  qed. 
+
+
 (*
 theorem nil_append_nil_both:
-  \forall A:Set.\forall l1,l2:list A.
+  \forall A:Type.\forall l1,l2:list A.
     l1 @ l2 = [] \to l1 = [] \land l2 = [].
 *)