aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7>2012-08-24 23:44:25 +0000
committerGravatar letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7>2012-08-24 23:44:25 +0000
commit47804492bd09c8b13b5aac45800d067dbdf04d00 (patch)
treed4deba50ef98837a8acaab58501e8e823157d5ae
parent462c1350ddb2c62de080e17b53fb6f1f00d9e3bf (diff)
Use fully-qualified Coq.Init.Prelude when starting coqtop
This avoids interferences with another Prelude.v around (cf. Orsay/Random) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15765 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--toplevel/coqtop.ml7
1 files changed, 6 insertions, 1 deletions
diff --git a/toplevel/coqtop.ml b/toplevel/coqtop.ml
index cd7da30bb..a5673578f 100644
--- a/toplevel/coqtop.ml
+++ b/toplevel/coqtop.ml
@@ -99,11 +99,16 @@ let load_vernac_obj () =
let load_init = ref true
+let require_prelude () =
+ let q = qualid_of_string "Coq.Init.Prelude" in
+ Library.require_library [Loc.ghost,q] (Some true)
+
let require_list = ref ([] : string list)
let add_require s = require_list := s :: !require_list
let require () =
+ if !load_init then require_prelude ();
List.iter (fun s -> Library.require_library_from_file None s (Some false))
- ((if !load_init then ["Prelude"] else []) @ List.rev !require_list)
+ (List.rev !require_list)
let compile_list = ref ([] : (bool * string) list)
let add_compile verbose s =