Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions test-suite/bugs/bug_1448.v
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ Axiom Req_refl : reflexive _ Req.
Axiom Req_sym : symmetric _ Req.
Axiom Req_trans : transitive _ Req.

Add Relation R Req
reflexivity proved by Req_refl
symmetry proved by Req_sym
transitivity proved by Req_trans
as Req_rel.
#[global] Instance Req_rel : @Equivalence R Req := {
Equivalence_Reflexive := Req_refl;
Equivalence_Symmetric := Req_sym;
Equivalence_Transitive := Req_trans }.

Add Ring my_ring : my_ring_theory (abstract).
11 changes: 5 additions & 6 deletions test-suite/bugs/bug_1738.v
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ Module SomeSetoids (Import M:FSetInterface.S).
Lemma Equal_refl : forall s, s[=]s.
Proof. red; split; auto. Qed.

Add Relation t Equal
reflexivity proved by Equal_refl
symmetry proved by eq_sym
transitivity proved by eq_trans
as EqualSetoid.
#[global] Instance EqualSetoid : @Equivalence t Equal := {
Equivalence_Reflexive := Equal_refl;
Equivalence_Symmetric := eq_sym;
Equivalence_Transitive := eq_trans }.

Add Morphism Empty with signature Equal ==> iff as Empty_m.
#[global] Instance Empty_m : Proper (Equal ==> iff) Empty.
Proof.
unfold Equal, Empty; firstorder.
Qed.
Expand Down
20 changes: 7 additions & 13 deletions test-suite/bugs/bug_2830.v
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,10 @@ Coercion ob : Category >-> Sortclass.

Open Scope category_scope.

Add Parametric Relation `(C:Category Ob Hom) (a b : Ob) : (hom a b) (eqv a b)
reflexivity proved by (@Equivalence_Reflexive _ _ (eqv_equivalence a b))
symmetry proved by (@Equivalence_Symmetric _ _ (eqv_equivalence a b))
transitivity proved by (@Equivalence_Transitive _ _ (eqv_equivalence a b))
as parametric_relation_eqv.

Add Parametric Morphism `(C:Category Ob Hom) (c b a : Ob) : (comp c b a)
with signature (eqv _ _ ==> eqv _ _ ==> eqv _ _) as parametric_morphism_comp.
#[global] Instance parametric_relation_eqv `(C:Category Ob Hom) (a b : Ob) : @Equivalence (hom a b) (eqv a b) :=
eqv_equivalence a b.

#[global] Instance parametric_morphism_comp `(C:Category Ob Hom) (c b a : Ob) : Proper (eqv _ _ ==> eqv _ _ ==> eqv _ _) (comp c b a).
intros x y Heq x' y'. apply comp_respects. exact Heq.
Defined.

Expand All @@ -172,11 +168,9 @@ Class Functor `(C:Category) `(D:Category) (im : C -> D) := {
Coercion functor_im : Functor >-> Funclass.
Arguments fmap [Object Hom C Object0 Hom0 D im] _ [a b].

Add Parametric Morphism `(C:Category) `(D:Category)
(Im:C->D) (F:Functor C D Im) (a b:C) : (@fmap _ _ C _ _ D Im F a b)
with signature (@eqv C _ C a b ==> @eqv D _ D (Im a) (Im b))
as parametric_morphism_fmap.
intros. apply fmap_respects. assumption. Qed.
#[global] Instance parametric_morphism_fmap `(C:Category) `(D:Category)
(Im:C->D) (F:Functor C D Im) (a b:C) : Proper (@eqv C _ C a b ==> @eqv D _ D (Im a) (Im b)) (@fmap _ _ C _ _ D Im F a b).
intros x y H. apply fmap_respects. assumption. Qed.

(* HERE IS THE PROBLEMATIC INSTANCE. If we change this to a regular Definition,
then the problem goes away. *)
Expand Down
8 changes: 2 additions & 6 deletions test-suite/bugs/bug_3258.v
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,8 @@ Axiom refine : forall {A} (old : Comp A) (new : Comp A), Prop.

#[global] Instance refine_PreOrder A : PreOrder (@refine A).
Admitted.
Add Parametric Morphism A
: (@Pick A)
with signature
(pointwise_relation _ (flip impl))
==> (@refine A)
as refine_flip_impl_Pick.
#[global] Instance refine_flip_impl_Pick A
: Proper ((pointwise_relation _ (flip impl)) ==> (@refine A)) (@Pick A).
admit.
Defined.
Definition remove_forall_eq' A x B (P : A -> B -> Prop) : pointwise_relation _ impl (P x) (fun z => forall y : A, y = x -> P y z).
Expand Down
16 changes: 8 additions & 8 deletions test-suite/success/setoid_ring_module.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From Stdlib Require Import Setoid Ring Ring_theory.
From Stdlib Require Import Setoid Morphisms Ring Ring_theory.

Module abs_ring.

Expand All @@ -11,18 +11,18 @@ Parameters (Coef:Set)(c0 c1 : Coef)
(ceq_refl : forall x, ceq x x).


Add Relation Coef ceq
reflexivity proved by ceq_refl symmetry proved by ceq_sym
transitivity proved by ceq_trans
as ceq_relation.
#[global] Instance ceq_relation : @Equivalence Coef ceq := {
Equivalence_Reflexive := ceq_refl;
Equivalence_Symmetric := ceq_sym;
Equivalence_Transitive := ceq_trans }.

Add Morphism cadd with signature ceq ==> ceq ==> ceq as cadd_Morphism.
#[global] Instance cadd_Morphism : Proper (ceq ==> ceq ==> ceq) cadd.
Admitted.

Add Morphism cmul with signature ceq ==> ceq ==> ceq as cmul_Morphism.
#[global] Instance cmul_Morphism : Proper (ceq ==> ceq ==> ceq) cmul.
Admitted.

Add Morphism copp with signature ceq ==> ceq as copp_Morphism.
#[global] Instance copp_Morphism : Proper (ceq ==> ceq) copp.
Admitted.

Definition cRth : ring_theory c0 c1 cadd cmul csub copp ceq.
Expand Down
124 changes: 80 additions & 44 deletions theories/FSets/FMapFacts.v
Original file line number Diff line number Diff line change
Expand Up @@ -648,88 +648,112 @@ Proof.
constructor; red; [apply Equal_refl | apply Equal_sym | apply Equal_trans].
Qed.

Add Relation key E.eq
reflexivity proved by E.eq_refl
symmetry proved by E.eq_sym
transitivity proved by E.eq_trans
as KeySetoid.
#[global] Instance KeySetoid_relation : @RewriteRelation key E.eq := {}.
#[global] Instance KeySetoid_Reflexive : @Reflexive key E.eq := E.eq_refl.
#[global] Instance KeySetoid_Symmetric : @Symmetric key E.eq := E.eq_sym.
#[global] Instance KeySetoid_Transitive : @Transitive key E.eq := E.eq_trans.
#[global] Instance KeySetoid : @Equivalence key E.eq := {
Equivalence_Reflexive := E.eq_refl;
Equivalence_Symmetric := E.eq_sym;
Equivalence_Transitive := E.eq_trans }.

Arguments Equal {elt} m m'.

Add Parametric Relation (elt : Type) : (t elt) Equal
reflexivity proved by (@Equal_refl elt)
symmetry proved by (@Equal_sym elt)
transitivity proved by (@Equal_trans elt)
as EqualSetoid.
#[global] Instance EqualSetoid_relation (elt : Type) : @RewriteRelation (t elt) Equal := {}.
#[global] Instance EqualSetoid_Reflexive (elt : Type) : @Reflexive (t elt) Equal := @Equal_refl elt.
#[global] Instance EqualSetoid_Symmetric (elt : Type) : @Symmetric (t elt) Equal := @Equal_sym elt.
#[global] Instance EqualSetoid_Transitive (elt : Type) : @Transitive (t elt) Equal := @Equal_trans elt.
#[global] Instance EqualSetoid (elt : Type) : @Equivalence (t elt) Equal := {
Equivalence_Reflexive := (@Equal_refl elt);
Equivalence_Symmetric := (@Equal_sym elt);
Equivalence_Transitive := (@Equal_trans elt) }.

Add Parametric Morphism elt : (@In elt)
with signature E.eq ==> Equal ==> iff as In_m.
#[global] Instance In_m_Proper elt : Proper (E.eq ==> Equal ==> iff) (@In elt).
Proof.
unfold Equal; intros k k' Hk m m' Hm.
rewrite (In_iff m Hk), in_find_iff, in_find_iff, Hm; intuition.
Qed.
Definition In_m elt :
forall x y, E.eq x y -> forall x0 y0, Equal x0 y0 -> iff (@In elt x x0) (@In elt y y0) :=
@proper_prf _ _ _ (@In_m_Proper elt).

Add Parametric Morphism elt : (@MapsTo elt)
with signature E.eq ==> eq ==> Equal ==> iff as MapsTo_m.
#[global] Instance MapsTo_m_Proper elt : Proper (E.eq ==> eq ==> Equal ==> iff) (@MapsTo elt).
Proof.
unfold Equal; intros k k' Hk e m m' Hm.
unfold Equal; intros k k' Hk e ? <- m m' Hm.
rewrite (MapsTo_iff m e Hk), find_mapsto_iff, find_mapsto_iff, Hm;
intuition.
Qed.
Definition MapsTo_m elt :
forall x y, E.eq x y -> forall x0 y0, eq x0 y0 -> forall x1 y1, Equal x1 y1 -> iff (@MapsTo elt x x0 x1) (@MapsTo elt y y0 y1) :=
@proper_prf _ _ _ (@MapsTo_m_Proper elt).

Add Parametric Morphism elt : (@Empty elt)
with signature Equal ==> iff as Empty_m.
#[global] Instance Empty_m_Proper elt : Proper (Equal ==> iff) (@Empty elt).
Proof.
unfold Empty; intros m m' Hm. split; intros; intro.
- rewrite <-Hm in H0; eapply H, H0.
- rewrite Hm in H0; eapply H, H0.
Qed.
Definition Empty_m elt :
forall x y, Equal x y -> iff (@Empty elt x) (@Empty elt y) :=
@proper_prf _ _ _ (@Empty_m_Proper elt).

Add Parametric Morphism elt : (@is_empty elt)
with signature Equal ==> eq as is_empty_m.
#[global] Instance is_empty_m_Proper elt : Proper (Equal ==> eq) (@is_empty elt).
Proof.
intros m m' Hm.
rewrite eq_bool_alt, <-is_empty_iff, <-is_empty_iff, Hm; intuition.
Qed.
Definition is_empty_m elt :
forall x y, Equal x y -> eq (@is_empty elt x) (@is_empty elt y) :=
@proper_prf _ _ _ (@is_empty_m_Proper elt).

Add Parametric Morphism elt : (@mem elt)
with signature E.eq ==> Equal ==> eq as mem_m.
#[global] Instance mem_m_Proper elt : Proper (E.eq ==> Equal ==> eq) (@mem elt).
Proof.
intros k k' Hk m m' Hm.
rewrite eq_bool_alt, <- mem_in_iff, <-mem_in_iff, Hk, Hm; intuition.
Qed.
Definition mem_m elt :
forall x y, E.eq x y -> forall x0 y0, Equal x0 y0 -> eq (@mem elt x x0) (@mem elt y y0) :=
@proper_prf _ _ _ (@mem_m_Proper elt).

Add Parametric Morphism elt : (@find elt)
with signature E.eq ==> Equal ==> eq as find_m.
#[global] Instance find_m_Proper elt : Proper (E.eq ==> Equal ==> eq) (@find elt).
Proof.
intros k k' Hk m m' Hm. rewrite eq_option_alt. intro e.
rewrite <- 2 find_mapsto_iff, Hk, Hm. split; auto.
Qed.
Definition find_m elt :
forall x y, E.eq x y -> forall x0 y0, Equal x0 y0 -> eq (@find elt x x0) (@find elt y y0) :=
@proper_prf _ _ _ (@find_m_Proper elt).

Add Parametric Morphism elt : (@add elt)
with signature E.eq ==> eq ==> Equal ==> Equal as add_m.
#[global] Instance add_m_Proper elt : Proper (E.eq ==> eq ==> Equal ==> Equal) (@add elt).
Proof.
intros k k' Hk e m m' Hm y.
intros k k' Hk e ? <- m m' Hm y.
rewrite add_o, add_o; do 2 destruct eq_dec as [|?Hnot]; auto.
- elim Hnot; rewrite <-Hk; auto.
- elim Hnot; rewrite Hk; auto.
Qed.
Definition add_m elt :
forall x y, E.eq x y -> forall x0 y0, eq x0 y0 -> forall x1 y1, Equal x1 y1 -> Equal (@add elt x x0 x1) (@add elt y y0 y1) :=
@proper_prf _ _ _ (@add_m_Proper elt).

Add Parametric Morphism elt : (@remove elt)
with signature E.eq ==> Equal ==> Equal as remove_m.
#[global] Instance remove_m_Proper elt : Proper (E.eq ==> Equal ==> Equal) (@remove elt).
Proof.
intros k k' Hk m m' Hm y.
rewrite remove_o, remove_o; do 2 destruct eq_dec as [|?Hnot]; auto.
- elim Hnot; rewrite <-Hk; auto.
- elim Hnot; rewrite Hk; auto.
Qed.
Definition remove_m elt :
forall x y, E.eq x y -> forall x0 y0, Equal x0 y0 -> Equal (@remove elt x x0) (@remove elt y y0) :=
@proper_prf _ _ _ (@remove_m_Proper elt).

Add Parametric Morphism elt elt' : (@map elt elt')
with signature eq ==> Equal ==> Equal as map_m.
#[global] Instance map_m_Proper elt elt' : Proper (eq ==> Equal ==> Equal) (@map elt elt').
Proof.
intros f m m' Hm y.
intros f ? <- m m' Hm y.
rewrite map_o, map_o, Hm; auto.
Qed.
Definition map_m elt elt' :
forall x y, eq x y -> forall x0 y0, Equal x0 y0 -> Equal (@map elt elt' x x0) (@map elt elt' y y0) :=
@proper_prf _ _ _ (@map_m_Proper elt elt').

(* Later: Add Morphism cardinal *)

Expand Down Expand Up @@ -1770,30 +1794,35 @@ Module WProperties_fun (E:DecidableType)(M:WSfun E).

End Elt.

Add Parametric Morphism elt : (@cardinal elt)
with signature Equal ==> eq as cardinal_m.
Proof. intros; apply Equal_cardinal; auto. Qed.
#[global] Instance cardinal_m_Proper elt : Proper (Equal ==> eq) (@cardinal elt).
Proof. intros x y H; apply Equal_cardinal; auto. Qed.
Definition cardinal_m elt :
forall x y, Equal x y -> eq (@cardinal elt x) (@cardinal elt y) :=
@proper_prf _ _ _ (@cardinal_m_Proper elt).

Add Parametric Morphism elt : (@Disjoint elt)
with signature Equal ==> Equal ==> iff as Disjoint_m.
#[global] Instance Disjoint_m_Proper elt : Proper (Equal ==> Equal ==> iff) (@Disjoint elt).
Proof.
intros m1 m1' Hm1 m2 m2' Hm2. unfold Disjoint. split; intros.
- rewrite <- Hm1, <- Hm2; auto.
- rewrite Hm1, Hm2; auto.
Qed.
Definition Disjoint_m elt :
forall x y, Equal x y -> forall x0 y0, Equal x0 y0 -> iff (@Disjoint elt x x0) (@Disjoint elt y y0) :=
@proper_prf _ _ _ (@Disjoint_m_Proper elt).

Add Parametric Morphism elt : (@Partition elt)
with signature Equal ==> Equal ==> Equal ==> iff as Partition_m.
#[global] Instance Partition_m_Proper elt : Proper (Equal ==> Equal ==> Equal ==> iff) (@Partition elt).
Proof.
intros m1 m1' Hm1 m2 m2' Hm2 m3 m3' Hm3. unfold Partition.
rewrite <- Hm2, <- Hm3.
split; intros (H,H'); split; auto; intros.
- rewrite <- Hm1, <- Hm2, <- Hm3; auto.
- rewrite Hm1, Hm2, Hm3; auto.
Qed.
Definition Partition_m elt :
forall x y, Equal x y -> forall x0 y0, Equal x0 y0 -> forall x1 y1, Equal x1 y1 -> iff (@Partition elt x x0 x1) (@Partition elt y y0 y1) :=
@proper_prf _ _ _ (@Partition_m_Proper elt).

Add Parametric Morphism elt : (@update elt)
with signature Equal ==> Equal ==> Equal as update_m.
#[global] Instance update_m_Proper elt : Proper (Equal ==> Equal ==> Equal) (@update elt).
Proof.
intros m1 m1' Hm1 m2 m2' Hm2.
setoid_replace (update m1 m2) with (update m1' m2); unfold update.
Expand All @@ -1804,9 +1833,11 @@ Module WProperties_fun (E:DecidableType)(M:WSfun E).
- apply fold_init with (eqA:=Equal); auto.
intros k k' Hk e e' He m m' Hm; rewrite Hk,He,Hm; red; auto.
Qed.
Definition update_m elt :
forall x y, Equal x y -> forall x0 y0, Equal x0 y0 -> Equal (@update elt x x0) (@update elt y y0) :=
@proper_prf _ _ _ (@update_m_Proper elt).

Add Parametric Morphism elt : (@restrict elt)
with signature Equal ==> Equal ==> Equal as restrict_m.
#[global] Instance restrict_m_Proper elt : Proper (Equal ==> Equal ==> Equal) (@restrict elt).
Proof.
intros m1 m1' Hm1 m2 m2' Hm2.
setoid_replace (restrict m1 m2) with (restrict m1' m2);
Expand All @@ -1823,9 +1854,11 @@ Module WProperties_fun (E:DecidableType)(M:WSfun E).
case_eq (mem k m2); case_eq (mem k' m2); intros; auto.
rewrite !add_o; do 2 destruct eq_dec; auto. elim Hneq; eauto.
Qed.
Definition restrict_m elt :
forall x y, Equal x y -> forall x0 y0, Equal x0 y0 -> Equal (@restrict elt x x0) (@restrict elt y y0) :=
@proper_prf _ _ _ (@restrict_m_Proper elt).

Add Parametric Morphism elt : (@diff elt)
with signature Equal ==> Equal ==> Equal as diff_m.
#[global] Instance diff_m_Proper elt : Proper (Equal ==> Equal ==> Equal) (@diff elt).
Proof.
intros m1 m1' Hm1 m2 m2' Hm2.
setoid_replace (diff m1 m2) with (diff m1' m2);
Expand All @@ -1842,6 +1875,9 @@ Module WProperties_fun (E:DecidableType)(M:WSfun E).
case_eq (mem k m2); case_eq (mem k' m2); intros; simpl; auto.
rewrite !add_o; do 2 destruct eq_dec; auto. elim Hneq; eauto.
Qed.
Definition diff_m elt :
forall x y, Equal x y -> forall x0 y0, Equal x0 y0 -> Equal (@diff elt x x0) (@diff elt y y0) :=
@proper_prf _ _ _ (@diff_m_Proper elt).

End WProperties_fun.

Expand Down
Loading
Loading