Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug dans l'initialisation de load_path au toplevel (PR#1770,1775) 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5736 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Xavier Leroy 2003-07-25 12:17:19 +00:00
parent ed53ef381a
commit 5385770407
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
driver/compile.ml
View File

@ -37,8 +37,9 @@ let init_path () =
(* Return the initial environment in which compilation proceeds. *)
(* Note: do not do init_path() in initial_env, this breaks
toplevel initialization (PR#1775) *)
let initial_env () =
init_path();
Ident.reinit();
try
if !Clflags.nopervasives
@ -50,6 +51,7 @@ let initial_env () =
(* Compile a .mli file *)
let interface ppf sourcefile =
init_path();
let prefixname = chop_extension_if_any sourcefile in
let modulename = String.capitalize(Filename.basename prefixname) in
let inputfile = Pparse.preprocess sourcefile in
@ -78,6 +80,7 @@ let print_if ppf flag printer arg =
let (++) x f = f x
let implementation ppf sourcefile =
init_path();
let prefixname = chop_extension_if_any sourcefile in
let modulename = String.capitalize(Filename.basename prefixname) in
let inputfile = Pparse.preprocess sourcefile in

3
driver/optcompile.ml
View File

@ -37,7 +37,6 @@ let init_path () =
(* Return the initial environment in which compilation proceeds. *)
let initial_env () =
init_path();
Ident.reinit();
try
if !Clflags.nopervasives
@ -49,6 +48,7 @@ let initial_env () =
(* Compile a .mli file *)
let interface ppf sourcefile =
init_path();
let prefixname = Misc.chop_extension_if_any sourcefile in
let modulename = String.capitalize(Filename.basename prefixname) in
let inputfile = Pparse.preprocess sourcefile in
@ -78,6 +78,7 @@ let (++) x f = f x
let (+++) (x, y) f = (x, f y)
let implementation ppf sourcefile =
init_path();
let prefixname = Misc.chop_extension_if_any sourcefile in
let modulename = String.capitalize(Filename.basename prefixname) in
let inputfile = Pparse.preprocess sourcefile in