From 39db249e97bcb30f66f468825d20d6e754e7c06e Mon Sep 17 00:00:00 2001 From: msozeau Date: Mon, 14 Apr 2008 15:08:52 +0000 Subject: Renamings to avoid clashes with definitions in Relation_Definitions, now projections are of the form "equivalence_reflexive" and instance names too. As they are (almost) never used directly, it does not hurt to have long explicit names. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10787 85f007b7-540e-0410-9357-904b9bb8a0f7 --- tactics/class_tactics.ml4 | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'tactics') diff --git a/tactics/class_tactics.ml4 b/tactics/class_tactics.ml4 index 5388bf2073..6b322675c5 100644 --- a/tactics/class_tactics.ml4 +++ b/tactics/class_tactics.ml4 @@ -508,11 +508,11 @@ let coq_relation = lazy (gen_constant ["Relations";"Relation_Definitions"] "rela let mk_relation a = mkApp (Lazy.force coq_relation, [| a |]) let coq_relationT = lazy (gen_constant ["Classes";"Relations"] "relationT") -let setoid_refl_proj = lazy (gen_constant ["Classes"; "SetoidClass"] "equiv_refl") +let setoid_refl_proj = lazy (gen_constant ["Classes"; "SetoidClass"] "equivalence_reflexive") let setoid_equiv = lazy (gen_constant ["Classes"; "SetoidClass"] "equiv") let setoid_morphism = lazy (gen_constant ["Classes"; "SetoidClass"] "setoid_morphism") -let setoid_refl_proj = lazy (gen_constant ["Classes"; "SetoidClass"] "equiv_refl") +let setoid_refl_proj = lazy (gen_constant ["Classes"; "SetoidClass"] "equivalence_reflexive") let arrow_morphism a b = if isprop a && isprop b then @@ -1124,17 +1124,17 @@ let init_setoid () = check_required_library ["Coq";"Setoids";"Setoid"] let declare_instance_refl binders a aeq n lemma = - let instance = declare_instance a aeq (add_suffix n "_refl") "Coq.Classes.RelationClasses.Reflexive" + let instance = declare_instance a aeq (add_suffix n "_reflexive") "Coq.Classes.RelationClasses.Reflexive" in anew_instance binders instance [((dummy_loc,id_of_string "reflexivity"),[],lemma)] let declare_instance_sym binders a aeq n lemma = - let instance = declare_instance a aeq (add_suffix n "_sym") "Coq.Classes.RelationClasses.Symmetric" + let instance = declare_instance a aeq (add_suffix n "_symmetric") "Coq.Classes.RelationClasses.Symmetric" in anew_instance binders instance [((dummy_loc,id_of_string "symmetry"),[],lemma)] let declare_instance_trans binders a aeq n lemma = - let instance = declare_instance a aeq (add_suffix n "_trans") "Coq.Classes.RelationClasses.Transitive" + let instance = declare_instance a aeq (add_suffix n "_transitive") "Coq.Classes.RelationClasses.Transitive" in anew_instance binders instance [((dummy_loc,id_of_string "transitivity"),[],lemma)] @@ -1161,16 +1161,16 @@ let declare_relation ?(binders=[]) a aeq n refl symm trans = let instance = declare_instance a aeq n "Coq.Classes.RelationClasses.PreOrder" in ignore( anew_instance binders instance - [((dummy_loc,id_of_string "preorder_refl"), [], mkIdentC lemma_refl); - ((dummy_loc,id_of_string "preorder_trans"),[], mkIdentC lemma_trans)]) + [((dummy_loc,id_of_string "preorder_reflexive"), [], mkIdentC lemma_refl); + ((dummy_loc,id_of_string "preorder_transitive"),[], mkIdentC lemma_trans)]) | (None, Some lemma2, Some lemma3) -> let lemma_sym = declare_instance_sym binders a aeq n lemma2 in let lemma_trans = declare_instance_trans binders a aeq n lemma3 in let instance = declare_instance a aeq n "Coq.Classes.RelationClasses.PER" in ignore( anew_instance binders instance - [((dummy_loc,id_of_string "per_sym"), [], mkIdentC lemma_sym); - ((dummy_loc,id_of_string "per_trans"),[], mkIdentC lemma_trans)]) + [((dummy_loc,id_of_string "per_symmetric"), [], mkIdentC lemma_sym); + ((dummy_loc,id_of_string "per_transitive"),[], mkIdentC lemma_trans)]) | (Some lemma1, Some lemma2, Some lemma3) -> let lemma_refl = declare_instance_refl binders a aeq n lemma1 in let lemma_sym = declare_instance_sym binders a aeq n lemma2 in @@ -1178,9 +1178,9 @@ let declare_relation ?(binders=[]) a aeq n refl symm trans = let instance = declare_instance a aeq n "Coq.Classes.RelationClasses.Equivalence" in ignore( anew_instance binders instance - [((dummy_loc,id_of_string "equiv_refl"), [], mkIdentC lemma_refl); - ((dummy_loc,id_of_string "equiv_sym"), [], mkIdentC lemma_sym); - ((dummy_loc,id_of_string "equiv_trans"),[], mkIdentC lemma_trans)]) + [((dummy_loc,id_of_string "equivalence_reflexive"), [], mkIdentC lemma_refl); + ((dummy_loc,id_of_string "equivalence_symmetric"), [], mkIdentC lemma_sym); + ((dummy_loc,id_of_string "equivalence_transitive"),[], mkIdentC lemma_trans)]) type 'a binders_let_argtype = (local_binder list, 'a) Genarg.abstract_argument_type @@ -1355,9 +1355,9 @@ let add_setoid binders a aeq t n = let instance = declare_instance a aeq n "Coq.Classes.RelationClasses.Equivalence" in ignore( anew_instance binders instance - [((dummy_loc,id_of_string "equiv_refl"), [], mkIdentC lemma_refl); - ((dummy_loc,id_of_string "equiv_sym"), [], mkIdentC lemma_sym); - ((dummy_loc,id_of_string "equiv_trans"),[], mkIdentC lemma_trans)]) + [((dummy_loc,id_of_string "equivalence_reflexive"), [], mkIdentC lemma_refl); + ((dummy_loc,id_of_string "equivalence_symmetric"), [], mkIdentC lemma_sym); + ((dummy_loc,id_of_string "equivalence_transitive"),[], mkIdentC lemma_trans)]) let add_morphism_infer m n = init_setoid (); -- cgit v1.2.3