diff options
| author | msozeau | 2008-09-13 19:01:08 +0000 |
|---|---|---|
| committer | msozeau | 2008-09-13 19:01:08 +0000 |
| commit | 047037ecc6494efa77bde400bdf5e77b16daa5e0 (patch) | |
| tree | 2d91e23c9e35f375ed9b81d2f9b4de6416ac16ad | |
| parent | cdb783158991ab7139e55f8a2e85d409e1ac8493 (diff) | |
Remove redefinition of id in Program.Basics, just add maximal implicits.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11401 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | tactics/class_tactics.ml4 | 2 | ||||
| -rw-r--r-- | theories/Classes/SetoidClass.v | 2 | ||||
| -rw-r--r-- | theories/Program/Basics.v | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tactics/class_tactics.ml4 b/tactics/class_tactics.ml4 index f5b0355f5a..ba090c5336 100644 --- a/tactics/class_tactics.ml4 +++ b/tactics/class_tactics.ml4 @@ -557,7 +557,7 @@ let iff = lazy (gen_constant ["Init"; "Logic"] "iff") let coq_all = lazy (gen_constant ["Init"; "Logic"] "all") let impl = lazy (gen_constant ["Program"; "Basics"] "impl") let arrow = lazy (gen_constant ["Program"; "Basics"] "arrow") -let coq_id = lazy (gen_constant ["Program"; "Basics"] "id") +let coq_id = lazy (gen_constant ["Init"; "Datatypes"] "id") let reflexive_type = lazy (try_find_reference ["Classes"; "RelationClasses"] "Reflexive") let reflexive_proof_global = lazy (try_find_global_reference ["Classes"; "RelationClasses"] "reflexivity") diff --git a/theories/Classes/SetoidClass.v b/theories/Classes/SetoidClass.v index adeb38d490..f2ce4fe126 100644 --- a/theories/Classes/SetoidClass.v +++ b/theories/Classes/SetoidClass.v @@ -148,7 +148,7 @@ Ltac obligation_tactic ::= morphism_tac. using [iff_impl_id_morphism] if the proof is in [Prop] and [eq_arrow_id_morphism] if it is in Type. *) -Program Instance iff_impl_id_morphism : Morphism (iff ++> impl) Basics.id. +Program Instance iff_impl_id_morphism : Morphism (iff ++> impl) id. (* Program Instance eq_arrow_id_morphism : ? Morphism (eq +++> arrow) id. *) diff --git a/theories/Program/Basics.v b/theories/Program/Basics.v index 6a61a16d45..d304b651f2 100644 --- a/theories/Program/Basics.v +++ b/theories/Program/Basics.v @@ -15,9 +15,9 @@ (* $Id$ *) -(** The polymorphic identity function. *) +(** The polymorphic identity function is defined in [Datatypes]. *) -Definition id {A} := fun x : A => x. +Implicit Arguments id [[A]]. (** Function composition. *) |