Commit 1ce6b83d authored by Pietro Abate's avatar Pietro Abate
Browse files

[r2006-03-17 15:49:43 by afrisch] Empty log message

Original author: afrisch
Date: 2006-03-17 15:49:43+00:00
parent 18e70bd5
......@@ -637,8 +637,8 @@ let make_wrapper fn =
with End_of_file -> ());
let s = gen_wrapper !v in
!Pcaml.print_implem [ s,_loc ];
print_endline "let () = Librarian.obj_path := [";
List.iter (fun s -> Printf.printf " %S;\n" s) !Librarian.obj_path;
print_endline "let () = Location.obj_path := [";
List.iter (fun s -> Printf.printf " %S;\n" s) !Location.obj_path;
print_endline " ];;";
print_endline "let () = Run.main ();;"
......
......@@ -229,12 +229,12 @@ let unsupported s =
raise (Error (Printf.sprintf "Unsupported feature (%s) found in .cmi" s))
let has_cmi name =
Config.load_path := Config.standard_library :: !Librarian.obj_path;
Config.load_path := Config.standard_library :: !Location.obj_path;
try ignore (Misc.find_in_path_uncap !Config.load_path (name ^ ".cmi")); true
with Not_found -> false
let find_value v =
Config.load_path := Config.standard_library :: !Librarian.obj_path;
Config.load_path := Config.standard_library :: !Location.obj_path;
let li = Longident.parse v in
ocaml_env := Env.initial;
let (_,vd) = Env.lookup_value li Env.initial in
......@@ -256,7 +256,7 @@ let values_of_sig name sg =
let load_module name =
Config.load_path := Config.standard_library :: !Librarian.obj_path;
Config.load_path := Config.standard_library :: !Location.obj_path;
let li = Longident.parse name in
ocaml_env := Env.initial;
let (_,mty) = Env.lookup_module li Env.initial in
......@@ -281,7 +281,7 @@ let load_module name =
raise (Loc.Generic s)
let read_cmi name =
Config.load_path := Config.standard_library :: !Librarian.obj_path;
Config.load_path := Config.standard_library :: !Location.obj_path;
let filename = Misc.find_in_path_uncap !Config.load_path (name ^ ".cmi") in
let sg = Env.read_signature name filename in
ocaml_env := Env.add_signature sg Env.initial;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment