diff options
author | Chantal Keller <Chantal.Keller@lri.fr> | 2021-10-21 16:00:16 +0200 |
---|---|---|
committer | Chantal Keller <Chantal.Keller@lri.fr> | 2021-10-21 16:00:16 +0200 |
commit | daee180471fd88421291b1617148de0a6235360d (patch) | |
tree | 2bfd6f5e72c098b4daf1c7a066a8e1f68a068670 /src/classes/SMT_classes.v | |
parent | 5d38159d419e1c690e455277bf913dd77cb675df (diff) | |
parent | 662bba2a3df268affd2f5821e035387d6e208dc4 (diff) | |
download | smtcoq-daee180471fd88421291b1617148de0a6235360d.tar.gz smtcoq-daee180471fd88421291b1617148de0a6235360d.zip |
Merge remote-tracking branch 'origin/coq-8.12' into coq-8.13
Diffstat (limited to 'src/classes/SMT_classes.v')
-rw-r--r-- | src/classes/SMT_classes.v | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/classes/SMT_classes.v b/src/classes/SMT_classes.v index be16138..1c050c9 100644 --- a/src/classes/SMT_classes.v +++ b/src/classes/SMT_classes.v @@ -156,16 +156,16 @@ Class CompDec T := { }. -Instance eqbtype_of_compdec t `{c: CompDec t} : (EqbType t) := +Global Instance eqbtype_of_compdec {t} `{c: CompDec t} : (EqbType t) := let (_, eqb, _, _, _) := c in eqb. -Instance ord_of_compdec t `{c: CompDec t} : (OrdType t) := +Global Instance ord_of_compdec {t} `{c: CompDec t} : (OrdType t) := let (_, _, ord, _, _) := c in ord. -Instance inh_of_compdec t `{c: CompDec t} : (Inhabited t) := +Global Instance inh_of_compdec {t} `{c: CompDec t} : (Inhabited t) := let (_, _, _, _, inh) := c in inh. -Instance comp_of_compdec t `{c: CompDec t} : @Comparable t (ord_of_compdec t). +Global Instance comp_of_compdec {t} `{c: CompDec t} : @Comparable t (ord_of_compdec (t:=t)). destruct c; trivial. Defined. @@ -173,7 +173,7 @@ Defined. Definition type_compdec {ty:Type} (cd : CompDec ty) := ty. Definition eqb_of_compdec {t} (c : CompDec t) : t -> t -> bool := - match eqbtype_of_compdec t with + match eqbtype_of_compdec (t:=t) with | {| eqb := eqb |} => eqb end. @@ -184,12 +184,6 @@ Proof. intros x y. destruct c as [TY [E HE] O C I]. unfold eqb_of_compdec. simpl. now rewrite HE. Qed. -#[export] Hint Resolve - ord_of_compdec - inh_of_compdec - comp_of_compdec - eqbtype_of_compdec : typeclass_instances. - Record typ_compdec : Type := Typ_compdec { te_carrier : Type; |