diff options
| author | Guillaume Melquiond | 2015-09-28 11:04:59 +0200 |
|---|---|---|
| committer | Guillaume Melquiond | 2015-09-28 11:04:59 +0200 |
| commit | 2cf609c41f7af83d9eaf43308a368fcb7307e6fa (patch) | |
| tree | cdc9a1459d4b753309d7ad729bf41c7f50522adb /toplevel | |
| parent | b6d5a9f47634371aa18c6e3159c6bc24203d229f (diff) | |
Make -load-vernac-object respect the loadpath.
This command-line option was behaving like the old -require, except that
it did not do Import. In other words, it was loading files without
respecting the loadpath. Now it behaves exactly like Require, while
-require now behaves like Require Import.
This patch also removes Library.require_library_from_file and all its
dependencies, since they are no longer used inside Coq.
Diffstat (limited to 'toplevel')
| -rw-r--r-- | toplevel/coqtop.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toplevel/coqtop.ml b/toplevel/coqtop.ml index 32ac9a496d..b7f1e4a197 100644 --- a/toplevel/coqtop.ml +++ b/toplevel/coqtop.ml @@ -171,8 +171,8 @@ let load_vernacular () = let load_vernacular_obj = ref ([] : string list) let add_vernac_obj s = load_vernacular_obj := s :: !load_vernacular_obj let load_vernac_obj () = - List.iter (fun f -> Library.require_library_from_file f None) - (List.rev !load_vernacular_obj) + let map dir = Qualid (Loc.ghost, qualid_of_string dir) in + Vernacentries.vernac_require None None (List.rev_map map !load_vernacular_obj) let require_prelude () = let vo = Envars.coqlib () / "theories/Init/Prelude.vo" in |