From c1159f736c8d8f5b95bc53af7614a63f2ab9a86b Mon Sep 17 00:00:00 2001
From: letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7>
Date: Thu, 22 Aug 2013 14:29:55 +0000
Subject: Less "Coq" strings everywhere

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16725 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 plugins/cc/cctac.ml             | 2 +-
 plugins/funind/indfun_common.ml | 4 ++--
 plugins/funind/recdef.ml        | 2 +-
 plugins/syntax/nat_syntax.ml    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/cc/cctac.ml b/plugins/cc/cctac.ml
index a7800667f..780a4877a 100644
--- a/plugins/cc/cctac.ml
+++ b/plugins/cc/cctac.ml
@@ -371,7 +371,7 @@ let build_term_to_complete uf meta pac =
     applistc (mkConstruct cinfo.ci_constr) all_args
 
 let cc_tactic depth additionnal_terms gls=
-  Coqlib.check_required_library ["Coq";"Init";"Logic"];
+  Coqlib.check_required_library Coqlib.logic_module_name;
   let _ = debug (Pp.str "Reading subgoal ...") in
   let state = make_prb gls depth additionnal_terms in
   let _ = debug (Pp.str "Problem built, solving ...") in
diff --git a/plugins/funind/indfun_common.ml b/plugins/funind/indfun_common.ml
index 827747c6b..f504b0734 100644
--- a/plugins/funind/indfun_common.ml
+++ b/plugins/funind/indfun_common.ml
@@ -473,13 +473,13 @@ exception ToShow of exn
 
 let jmeq () =
   try
-    Coqlib.check_required_library ["Coq";"Logic";"JMeq"];
+    Coqlib.check_required_library Coqlib.jmeq_module_name;
     Coqlib.gen_constant "Function" ["Logic";"JMeq"] "JMeq"
   with e when Errors.noncritical e -> raise (ToShow e)
 
 let jmeq_refl () =
   try
-    Coqlib.check_required_library ["Coq";"Logic";"JMeq"];
+    Coqlib.check_required_library Coqlib.jmeq_module_name;
     Coqlib.gen_constant "Function" ["Logic";"JMeq"] "JMeq_refl"
   with e when Errors.noncritical e -> raise (ToShow e)
 
diff --git a/plugins/funind/recdef.ml b/plugins/funind/recdef.ml
index d2d5a957f..857e82fc5 100644
--- a/plugins/funind/recdef.ml
+++ b/plugins/funind/recdef.ml
@@ -150,7 +150,7 @@ let coq_S = function () -> (coq_base_constant "S")
 let lt_n_O = function () -> (coq_base_constant "lt_n_O")
 let max_ref = function () -> (find_reference ["Recdef"] "max")
 let max_constr = function () -> (constr_of_global (delayed_force max_ref))
-let coq_conj = function () -> find_reference ["Coq";"Init";"Logic"] "conj"
+let coq_conj = function () -> find_reference Coqlib.logic_module_name "conj"
 
 let f_S t = mkApp(delayed_force coq_S, [|t|]);;
 
diff --git a/plugins/syntax/nat_syntax.ml b/plugins/syntax/nat_syntax.ml
index 24ce7d652..59180be81 100644
--- a/plugins/syntax/nat_syntax.ml
+++ b/plugins/syntax/nat_syntax.ml
@@ -65,6 +65,6 @@ let uninterp_nat p =
 
 let _ =
   Notation.declare_numeral_interpreter "nat_scope"
-    (nat_path,["Coq";"Init";"Datatypes"])
+    (nat_path,datatypes_module_name)
     nat_of_int
     ([GRef (Loc.ghost,glob_S); GRef (Loc.ghost,glob_O)], uninterp_nat, true)
-- 
cgit v1.2.3