diff options
| author |  herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2009-07-01 11:58:59 +0000 |
|---|---|---|
| committer | herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2009-07-01 11:58:59 +0000 |
| commit | 4a3450a90d1037340acddccdc9e462bed5bd2164 (patch) | |
| tree | 56a5d271423e324eee2eeb8941517d415d81aea5 | |
| parent | fa7e44d2b1a71fd8662ee720efdde2295679975b (diff) | |
Support for binding Coq root read-only in -R option
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12220 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | library/library.ml | 8 | ||||
| -rw-r--r-- | library/library.mli | 3 | ||||
| -rw-r--r-- | toplevel/coqtop.ml | 2 |
4 files changed, 6 insertions, 8 deletions
@@ -30,6 +30,7 @@ Vernacular commands - New command "Timeout <n> <command>." interprets a command and a timeout interrupts the interpretation after <n> seconds. +- Option -R now supports binding Coq root read-only Tools diff --git a/library/library.ml b/library/library.ml index c812819a2..abca3c7e7 100644 --- a/library/library.ml +++ b/library/library.ml @@ -601,18 +601,20 @@ let import_module export (loc,qid) = (************************************************************************) (*s Initializing the compilation of a library. *) -let check_coq_overwriting p = +let check_coq_overwriting p id = let l = repr_dirpath p in if not !Flags.boot && l <> [] && string_of_id (list_last l) = "Coq" then - errorlabstrm "" (strbrk ("Name "^string_of_dirpath p^" starts with prefix \"Coq\" which is reserved for the Coq library.")) + errorlabstrm "" + (strbrk ("Cannot build module "^string_of_dirpath p^"."^string_of_id id^ + ": it starts with prefix \"Coq\" which is reserved for the Coq library.")) let start_library f = let paths = get_load_paths () in let _,longf = System.find_file_in_path ~warn:(Flags.is_verbose()) paths (f^".v") in let ldir0 = find_logical_path (Filename.dirname longf) in - check_coq_overwriting ldir0; let id = id_of_string (Filename.basename f) in + check_coq_overwriting ldir0 id; let ldir = extend_dirpath ldir0 id in Declaremods.start_library ldir; ldir,longf diff --git a/library/library.mli b/library/library.mli index 2b7ecc664..c6bd8fe0b 100644 --- a/library/library.mli +++ b/library/library.mli @@ -79,8 +79,5 @@ val locate_qualified_library : bool -> qualid -> library_location * dir_path * System.physical_path val try_locate_qualified_library : qualid located -> dir_path * string -(* Reserve Coq prefix for the standard library *) -val check_coq_overwriting : dir_path -> unit - (*s Statistics: display the memory use of a library. *) val mem : dir_path -> Pp.std_ppcmds diff --git a/toplevel/coqtop.ml b/toplevel/coqtop.ml index da63382bf..696ce1282 100644 --- a/toplevel/coqtop.ml +++ b/toplevel/coqtop.ml @@ -74,11 +74,9 @@ let outputstate () = if !outputstate <> "" then extern_state !outputstate let set_default_include d = push_include (d,Nameops.default_root_prefix) let set_include d p = let p = dirpath_of_string p in - Library.check_coq_overwriting p; push_include (d,p) let set_rec_include d p = let p = dirpath_of_string p in - Library.check_coq_overwriting p; push_rec_include(d,p) let load_vernacular_list = ref ([] : (string * bool) list) |