Commit c654a73e authored by Ralf Jung's avatar Ralf Jung
Browse files

use primitive projections for our mixins

parent dcf697b4
...@@ -39,6 +39,7 @@ Notation "x ≼{ n } y" := (includedN n x y) ...@@ -39,6 +39,7 @@ Notation "x ≼{ n } y" := (includedN n x y)
Instance: Params (@includedN) 4. Instance: Params (@includedN) 4.
Hint Extern 0 (_ {_} _) => reflexivity. Hint Extern 0 (_ {_} _) => reflexivity.
Set Primitive Projections.
Record CMRAMixin A `{Dist A, Equiv A, PCore A, Op A, Valid A, ValidN A} := { Record CMRAMixin A `{Dist A, Equiv A, PCore A, Op A, Valid A, ValidN A} := {
(* setoids *) (* setoids *)
mixin_cmra_op_ne (x : A) : NonExpansive (op x); mixin_cmra_op_ne (x : A) : NonExpansive (op x);
...@@ -60,6 +61,7 @@ Record CMRAMixin A `{Dist A, Equiv A, PCore A, Op A, Valid A, ValidN A} := { ...@@ -60,6 +61,7 @@ Record CMRAMixin A `{Dist A, Equiv A, PCore A, Op A, Valid A, ValidN A} := {
{n} x x {n} y1 y2 {n} x x {n} y1 y2
z1 z2, x z1 z2 z1 {n} y1 z2 {n} y2 z1 z2, x z1 z2 z1 {n} y1 z2 {n} y2
}. }.
Unset Primitive Projections.
(** Bundeled version *) (** Bundeled version *)
Structure cmraT := CMRAT' { Structure cmraT := CMRAT' {
......
...@@ -33,11 +33,13 @@ Tactic Notation "ofe_subst" := ...@@ -33,11 +33,13 @@ Tactic Notation "ofe_subst" :=
| H:@dist ?A ?d ?n _ ?x |- _ => symmetry in H;setoid_subst_aux (@dist A d n) x | H:@dist ?A ?d ?n _ ?x |- _ => symmetry in H;setoid_subst_aux (@dist A d n) x
end. end.
Set Primitive Projections.
Record OfeMixin A `{Equiv A, Dist A} := { Record OfeMixin A `{Equiv A, Dist A} := {
mixin_equiv_dist x y : x y n, x {n} y; mixin_equiv_dist x y : x y n, x {n} y;
mixin_dist_equivalence n : Equivalence (dist n); mixin_dist_equivalence n : Equivalence (dist n);
mixin_dist_S n x y : x {S n} y x {n} y mixin_dist_S n x y : x {S n} y x {n} y
}. }.
Unset Primitive Projections.
(** Bundeled version *) (** Bundeled version *)
Structure ofeT := OfeT' { Structure ofeT := OfeT' {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment