Last changes in type class syntax:

- curly braces mandatory for record class instances
- no mention of the unique method for definitional class instances
Turning a record or definition into a class is mostly a 
matter of changing the keywords to 'Class' and 'Instance' now.
Documentation reflects these changes, and was checked once more 
along with setoid_rewrite's and Program's.


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11797 85f007b7-540e-0410-9357-904b9bb8a0f7

4 files changed, 26 insertions, 29 deletions

diff --git a/theories/Classes/EquivDec.v b/theories/Classes/EquivDec.v
index b85d5d7d24..ff407182df 100644
--- a/theories/Classes/EquivDec.v
+++ b/theories/Classes/EquivDec.v
@@ -9,7 +9,7 @@
 (* Decidable equivalences.
  *
  * Author: Matthieu Sozeau
- * Institution: LRI, CNRS UMR 8623 - UniversitĂcopyright Paris Sud
+ * Institution: LRI, CNRS UMR 8623 - UniversitÃcopyright Paris Sud
  *              91405 Orsay, France *)
 
 (* $Id$ *)
@@ -75,16 +75,13 @@ Require Import Coq.Arith.Peano_dec.
 
 (** The equiv is burried inside the setoid, but we can recover it by specifying which setoid we're talking about. *)
 
-Program Instance nat_eq_eqdec : EqDec nat eq :=
-  equiv_dec := eq_nat_dec.
+Program Instance nat_eq_eqdec : EqDec nat eq := eq_nat_dec.
 
 Require Import Coq.Bool.Bool.
 
-Program Instance bool_eqdec : EqDec bool eq :=
-  equiv_dec := bool_dec.
+Program Instance bool_eqdec : EqDec bool eq := bool_dec.
 
-Program Instance unit_eqdec : EqDec unit eq :=
-  equiv_dec x y := in_left.
+Program Instance unit_eqdec : EqDec unit eq := λ x y, in_left.
 
   Next Obligation.
   Proof.
@@ -94,24 +91,24 @@ Program Instance unit_eqdec : EqDec unit eq :=
 
 Program Instance prod_eqdec `(EqDec A eq, EqDec B eq) :
   ! EqDec (prod A B) eq :=
-  equiv_dec x y := 
+  { equiv_dec x y :=
     let '(x1, x2) := x in 
     let '(y1, y2) := y in 
     if x1 == y1 then 
       if x2 == y2 then in_left
       else in_right
-    else in_right.
+    else in_right }.
 
   Solve Obligations using unfold complement, equiv ; program_simpl.
 
 Program Instance sum_eqdec `(EqDec A eq, EqDec B eq) :
-  EqDec (sum A B) eq :=
+  EqDec (sum A B) eq := {
   equiv_dec x y := 
     match x, y with
       | inl a, inl b => if a == b then in_left else in_right
       | inr a, inr b => if a == b then in_left else in_right
       | inl _, inr _ | inr _, inl _ => in_right
-    end.
+    end }.
 
   Solve Obligations using unfold complement, equiv ; program_simpl.
 
@@ -119,11 +116,11 @@ Program Instance sum_eqdec `(EqDec A eq, EqDec B eq) :
    Proving the reflection requires functional extensionality though. *)
 
 Program Instance bool_function_eqdec `(EqDec A eq) : ! EqDec (bool -> A) eq :=
-  equiv_dec f g := 
+  { equiv_dec f g := 
     if f true == g true then
       if f false == g false then in_left
       else in_right
-    else in_right.
+    else in_right }.
 
   Solve Obligations using try red ; unfold equiv, complement ; program_simpl.
 
@@ -136,7 +133,7 @@ Program Instance bool_function_eqdec `(EqDec A eq) : ! EqDec (bool -> A) eq :=
 Require Import List.
 
 Program Instance list_eqdec `(eqa : EqDec A eq) : ! EqDec (list A) eq :=
-  equiv_dec := 
+  { equiv_dec := 
     fix aux (x : list A) y { struct x } :=
     match x, y with
       | nil, nil => in_left
@@ -145,7 +142,7 @@ Program Instance list_eqdec `(eqa : EqDec A eq) : ! EqDec (list A) eq :=
           if aux tl tl' then in_left else in_right
           else in_right
       | _, _ => in_right
-    end.
+    end }.
 
   Solve Obligations using unfold equiv, complement in * ; program_simpl ; intuition (discriminate || eauto).
 
diff --git a/theories/Classes/RelationClasses.v b/theories/Classes/RelationClasses.v
index b9256bdbc0..659289f889 100644
--- a/theories/Classes/RelationClasses.v
+++ b/theories/Classes/RelationClasses.v
@@ -71,10 +71,10 @@ Hint Extern 4 => solve_relation : relations.
 (** We can already dualize all these properties. *)
 
 Program Instance flip_Reflexive `(Reflexive A R) : Reflexive (flip R) :=
-  reflexivity := reflexivity (R:=R).
+  reflexivity (R:=R).
 
 Program Instance flip_Irreflexive `(Irreflexive A R) : Irreflexive (flip R) :=
-  irreflexivity := irreflexivity (R:=R).
+  irreflexivity (R:=R).
 
 Program Instance flip_Symmetric `(Symmetric A R) : Symmetric (flip R).
 
@@ -168,8 +168,8 @@ Class Equivalence {A} (R : relation A) : Prop := {
 (** An Equivalence is a PER plus reflexivity. *)
 
 Instance Equivalence_PER `(Equivalence A R) : PER R | 10 :=
-  PER_Symmetric := Equivalence_Symmetric ;
-  PER_Transitive := Equivalence_Transitive.
+  { PER_Symmetric := Equivalence_Symmetric ;
+    PER_Transitive := Equivalence_Transitive }.
 
 (** We can now define antisymmetry w.r.t. an equivalence relation on the carrier. *)
 
diff --git a/theories/Classes/SetoidClass.v b/theories/Classes/SetoidClass.v
index 78616a9a42..ae03e28e56 100644
--- a/theories/Classes/SetoidClass.v
+++ b/theories/Classes/SetoidClass.v
@@ -56,7 +56,7 @@ Existing Instance setoid_trans.
 (*   equiv := eq ; setoid_equiv := eq_equivalence. *)
 
 Program Instance iff_setoid : Setoid Prop := 
-  equiv := iff ; setoid_equiv := iff_equivalence.
+  { equiv := iff ; setoid_equiv := iff_equivalence }.
 
 (** Overloaded notations for setoid equivalence and inequivalence. Not to be confused with [eq] and [=]. *)
 
@@ -120,10 +120,10 @@ Ltac setoidify := repeat setoidify_tac.
 (** Every setoid relation gives rise to a morphism, in fact every partial setoid does. *)
 
 Program Instance setoid_morphism `(sa : Setoid A) : Morphism (equiv ++> equiv ++> iff) equiv :=
-  respect := respect.
+  respect.
 
 Program Instance setoid_partial_app_morphism `(sa : Setoid A) (x : A) : Morphism (equiv ++> iff) (equiv x) :=
-  respect := respect.
+  respect.
 
 Ltac morphism_tac := try red ; unfold arrow ; intros ; program_simpl ; try tauto.
 
diff --git a/theories/Classes/SetoidDec.v b/theories/Classes/SetoidDec.v
index 8504a06f43..d68e3fd22b 100644
--- a/theories/Classes/SetoidDec.v
+++ b/theories/Classes/SetoidDec.v
@@ -9,7 +9,7 @@
 (* Decidable setoid equality theory.
  *
  * Author: Matthieu Sozeau
- * Institution: LRI, CNRS UMR 8623 - UniversitĂcopyright Paris Sud
+ * Institution: LRI, CNRS UMR 8623 - UniversitÃcopyright Paris Sud
  *              91405 Orsay, France *)
 
 (* $Id$ *)
@@ -75,18 +75,18 @@ Require Import Coq.Arith.Arith.
 (** The equiv is burried inside the setoid, but we can recover it by specifying which setoid we're talking about. *)
 
 Program Instance eq_setoid A : Setoid A | 10 :=
-  equiv := eq ; setoid_equiv := eq_equivalence.
+  { equiv := eq ; setoid_equiv := eq_equivalence }.
 
 Program Instance nat_eq_eqdec : EqDec (eq_setoid nat) :=
-  equiv_dec := eq_nat_dec.
+  eq_nat_dec.
 
 Require Import Coq.Bool.Bool.
 
 Program Instance bool_eqdec : EqDec (eq_setoid bool) :=
-  equiv_dec := bool_dec.
+  bool_dec.
 
 Program Instance unit_eqdec : EqDec (eq_setoid unit) :=
-  equiv_dec x y := in_left.
+  λ x y, in_left.
 
   Next Obligation.
   Proof.
@@ -95,7 +95,7 @@ Program Instance unit_eqdec : EqDec (eq_setoid unit) :=
   Qed.
 
 Program Instance prod_eqdec `(! EqDec (eq_setoid A), ! EqDec (eq_setoid B)) : EqDec (eq_setoid (prod A B)) :=
-  equiv_dec x y := 
+  λ x y,
     let '(x1, x2) := x in 
     let '(y1, y2) := y in 
     if x1 == y1 then 
@@ -108,7 +108,7 @@ Program Instance prod_eqdec `(! EqDec (eq_setoid A), ! EqDec (eq_setoid B)) : Eq
 (** Objects of function spaces with countable domains like bool have decidable equality. *)
 
 Program Instance bool_function_eqdec `(! EqDec (eq_setoid A)) : EqDec (eq_setoid (bool -> A)) :=
-  equiv_dec f g := 
+  λ f g,
     if f true == g true then
       if f false == g false then in_left
       else in_right