diff options
Diffstat (limited to 'toplevel/mltop.ml4')
| -rw-r--r-- | toplevel/mltop.ml4 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/toplevel/mltop.ml4 b/toplevel/mltop.ml4 index 4da23d42..4e6058be 100644 --- a/toplevel/mltop.ml4 +++ b/toplevel/mltop.ml4 @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* $Id: mltop.ml4,v 1.29.2.3 2004/07/17 13:00:15 herbelin Exp $ *) +(* $Id: mltop.ml4 9397 2006-11-21 21:50:54Z herbelin $ *) open Util open Pp @@ -42,9 +42,8 @@ open Vernacinterp (* This path is where we look for .cmo *) let coq_mlpath_copy = ref ["."] -let keep_copy_mlpath s = - let dir = glob s in - coq_mlpath_copy := dir :: !coq_mlpath_copy +let keep_copy_mlpath path = + coq_mlpath_copy := path :: !coq_mlpath_copy (* If there is a toplevel under Coq *) type toplevel = { @@ -109,7 +108,7 @@ let dir_ml_load s = [Filename.dirname gname] with | Dynlink.Error a -> errorlabstrm "Mltop.load_object" [< str (Dynlink.error_message a) >] - else () + else () | Native -> errorlabstrm "Mltop.no_load_object" [< str"Loading of ML object file forbidden in a native Coq" >] @@ -137,7 +136,7 @@ let add_path ~unix_path:dir ~coq_root:coq_dirpath = if exists_dir dir then begin add_ml_dir dir; - Library.add_load_path_entry (dir,coq_dirpath) + Library.add_load_path (dir,coq_dirpath) end else msg_warning [< str ("Cannot open " ^ dir) >] @@ -160,7 +159,7 @@ let add_rec_path ~unix_path:dir ~coq_root:coq_dirpath = let dirs = map_succeed convert_dirs dirs in begin List.iter (fun lpe -> add_ml_dir (fst lpe)) dirs; - List.iter Library.add_load_path_entry dirs + List.iter Library.add_load_path dirs end else msg_warning [< str ("Cannot open " ^ dir) >] |