diff options
| author | msozeau | 2008-02-28 09:48:46 +0000 |
|---|---|---|
| committer | msozeau | 2008-02-28 09:48:46 +0000 |
| commit | 4d12742262dfc3015823d931cde2d0b060bee009 (patch) | |
| tree | 318c6c214dcd99082609a9b14a15dd63de86489e | |
| parent | 6516f5d73233a15c85c2971853bcca0a1646088f (diff) | |
Do not open type_scope in SetoidClass.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10603 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | theories/Classes/Relations.v | 6 | ||||
| -rw-r--r-- | theories/Classes/SetoidClass.v | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/theories/Classes/Relations.v b/theories/Classes/Relations.v index 0d21985dcf..28f582c3d7 100644 --- a/theories/Classes/Relations.v +++ b/theories/Classes/Relations.v @@ -16,8 +16,8 @@ (* $Id: FSetAVL_prog.v 616 2007-08-08 12:28:10Z msozeau $ *) -Require Import Coq.Program.Program. Require Export Coq.Classes.Init. +Require Import Coq.Program.Program. Set Implicit Arguments. Unset Strict Implicit. @@ -292,10 +292,14 @@ Ltac relation_tac := relation_refl || relation_sym || relation_trans. (** Various combinations of reflexivity, symmetry and transitivity. *) +(** A [PreOrder] is both reflexive and transitive. *) + Class PreOrder A (R : relation A) := preorder_refl :> Reflexive R ; preorder_trans :> Transitive R. +(** A [PreOrder] is both reflexive and transitive. *) + (** The [PER] typeclass. *) Class PER (carrier : Type) (pequiv : relation carrier) := diff --git a/theories/Classes/SetoidClass.v b/theories/Classes/SetoidClass.v index 9ec955bcfe..571f65b627 100644 --- a/theories/Classes/SetoidClass.v +++ b/theories/Classes/SetoidClass.v @@ -102,13 +102,11 @@ Proof. contradiction. Qed. -Open Scope type_scope. - Ltac setoid_simplify_one := match goal with - | [ H : ?x == ?x |- _ ] => clear H - | [ H : ?x == ?y |- _ ] => clsubst H - | [ |- ?x =/= ?y ] => let name:=fresh "Hneq" in intro name + | [ H : (?x == ?x)%type |- _ ] => clear H + | [ H : (?x == ?y)%type |- _ ] => clsubst H + | [ |- (?x =/= ?y)%type ] => let name:=fresh "Hneq" in intro name end. Ltac setoid_simplify := repeat setoid_simplify_one. |