aboutsummaryrefslogtreecommitdiff
path: root/stm
diff options
context:
space:
mode:
authorEnrico Tassi2019-02-22 20:52:14 +0100
committerEnrico Tassi2019-02-22 20:52:14 +0100
commitdea9f08178efcf9cfac7ee2970dc21abc2fde308 (patch)
tree515a3caec0fd881b71ac1cdbab743cfb5fd473bf /stm
parent6a289e4fbc1c4327429bb7041e8f39a18bbb0f70 (diff)
parente8419bac30ab98527ec6b15d5a0f5c1035539ca5 (diff)
Merge PR #9576: [library] Remove `-boot` option.
Reviewed-by: SkySkimmer Ack-by: ejgallego Reviewed-by: gares
Diffstat (limited to 'stm')
-rw-r--r--stm/stm.ml18
-rw-r--r--stm/stm.mli4
2 files changed, 1 insertions, 21 deletions
diff --git a/stm/stm.ml b/stm/stm.ml
index b4f26570c6..8af1a2ebd2 100644
--- a/stm/stm.ml
+++ b/stm/stm.ml
@@ -2647,10 +2647,6 @@ type stm_init_options = {
some point. *)
doc_type : stm_doc_type;
- (* Allow compiling modules in the Coq prefix. Irrelevant in
- interactive mode. *)
- allow_coq_overwrite : bool;
-
(* Initial load path in scope for the document. Usually extracted
from -R options / _CoqProject *)
iload_path : Mltop.coq_path list;
@@ -2678,16 +2674,6 @@ let init_core () =
if !cur_opt.async_proofs_mode = APon then Control.enable_thread_delay := true;
State.register_root_state ()
-let check_coq_overwriting ~allow_coq_overwrite p =
- if not allow_coq_overwrite then
- let l = DirPath.repr p in
- let id, l = match l with id::l -> id,l | [] -> assert false in
- let is_empty = match l with [] -> true | _ -> false in
- if not is_empty && Id.equal (CList.last l) Libnames.coq_root then
- user_err
- (str "Cannot build module " ++ DirPath.print p ++ str "." ++ spc () ++
- str "it starts with prefix \"Coq\" which is reserved for the Coq library.")
-
let dirpath_of_file f =
let ldir0 =
try
@@ -2700,7 +2686,7 @@ let dirpath_of_file f =
let ldir = Libnames.add_dirpath_suffix ldir0 id in
ldir
-let new_doc { doc_type ; allow_coq_overwrite; iload_path; require_libs; stm_options } =
+let new_doc { doc_type ; iload_path; require_libs; stm_options } =
let load_objs libs =
let rq_file (dir, from, exp) =
@@ -2735,14 +2721,12 @@ let new_doc { doc_type ; allow_coq_overwrite; iload_path; require_libs; stm_opti
| VoDoc f ->
let ldir = dirpath_of_file f in
- check_coq_overwriting ~allow_coq_overwrite ldir;
let () = Flags.verbosely Declaremods.start_library ldir in
VCS.set_ldir ldir;
set_compilation_hints f
| VioDoc f ->
let ldir = dirpath_of_file f in
- check_coq_overwriting ~allow_coq_overwrite ldir;
let () = Flags.verbosely Declaremods.start_library ldir in
VCS.set_ldir ldir;
set_compilation_hints f
diff --git a/stm/stm.mli b/stm/stm.mli
index 102e832d3e..91651e3534 100644
--- a/stm/stm.mli
+++ b/stm/stm.mli
@@ -67,10 +67,6 @@ type stm_init_options = {
some point. *)
doc_type : stm_doc_type;
- (* Allow compiling modules in the Coq prefix. Irrelevant in
- interactive mode. *)
- allow_coq_overwrite : bool;
-
(* Initial load path in scope for the document. Usually extracted
from -R options / _CoqProject *)
iload_path : Mltop.coq_path list;