diff options
| author |  Emilio Jesus Gallego Arias <e+git@x80.org> | 2017-06-15 11:54:45 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias <e+git@x80.org> | 2017-10-06 17:21:46 +0200 |
| commit | b0b9ec7c16c38dabc7c4279dbe4d578b74e91c19 (patch) | |
| tree | 2dbacaa7d6e91c61f29946f38befc05e310d1a59 /toplevel | |
| parent | f1598b00219a951e94036cb7f48a8fe1309025f1 (diff) | |
[coqtop] Don't reset coqinit internal variables after initialization.
We remove `init_library_roots` as there is no point in resetting this
internal variable. Its only user is `init_load_path` and this function
is not meant (and is not) idempotent now.
Diffstat (limited to 'toplevel')
| -rw-r--r-- | toplevel/coqinit.ml | 3 | ||||
| -rw-r--r-- | toplevel/coqinit.mli | 1 | ||||
| -rw-r--r-- | toplevel/coqtop.ml | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/toplevel/coqinit.ml b/toplevel/coqinit.ml index 5ca886965..1d5406770 100644 --- a/toplevel/coqinit.ml +++ b/toplevel/coqinit.ml @@ -114,9 +114,6 @@ let init_load_path () = (* additional ml directories, given with option -I *) List.iter Mltop.add_ml_dir (List.rev !ml_includes) -let init_library_roots () = - includes := [] - (* Initialises the Ocaml toplevel before launching it, so that it can find the "include" file in the *source* directory *) let init_ocaml_path () = diff --git a/toplevel/coqinit.mli b/toplevel/coqinit.mli index 3432e79cc..1f7fd6ed9 100644 --- a/toplevel/coqinit.mli +++ b/toplevel/coqinit.mli @@ -21,6 +21,5 @@ val push_include : string -> Names.DirPath.t -> bool -> unit val push_ml_include : string -> unit val init_load_path : unit -> unit -val init_library_roots : unit -> unit val init_ocaml_path : unit -> unit diff --git a/toplevel/coqtop.ml b/toplevel/coqtop.ml index db7bcb76b..c159a1c6a 100644 --- a/toplevel/coqtop.ml +++ b/toplevel/coqtop.ml @@ -630,7 +630,6 @@ let init_toplevel arglist = if (not !Flags.batch_mode || CList.is_empty !compile_list) && Global.env_is_initial () then Declaremods.start_library !toplevel_name; - init_library_roots (); load_vernac_obj (); require (); (* XXX: This is incorrect in batch mode, as we will initialize |