summaryrefslogtreecommitdiffstats
path: root/otherlibs/labltk/browser
diff options
context:
space:
mode:
Diffstat (limited to 'otherlibs/labltk/browser')
-rw-r--r--otherlibs/labltk/browser/searchid.ml2
-rw-r--r--otherlibs/labltk/browser/searchpos.ml9
-rw-r--r--otherlibs/labltk/browser/viewer.ml2
3 files changed, 7 insertions, 6 deletions
diff --git a/otherlibs/labltk/browser/searchid.ml b/otherlibs/labltk/browser/searchid.ml
index 0cad8ffc7..5450c8616 100644
--- a/otherlibs/labltk/browser/searchid.ml
+++ b/otherlibs/labltk/browser/searchid.ml
@@ -206,7 +206,7 @@ let mkpath = function
~f:(fun acc x -> Pdot (acc, x, 0))
let get_fields ~prefix ~sign self =
- let env = open_signature (mkpath prefix) sign initial in
+ let env = open_signature Fresh (mkpath prefix) sign initial in
match (expand_head env self).desc with
Tobject (ty_obj, _) ->
let l,_ = flatten_fields ty_obj in l
diff --git a/otherlibs/labltk/browser/searchpos.ml b/otherlibs/labltk/browser/searchpos.ml
index 6ba813c4c..13847e280 100644
--- a/otherlibs/labltk/browser/searchpos.ml
+++ b/otherlibs/labltk/browser/searchpos.ml
@@ -187,10 +187,10 @@ let rec search_pos_signature l ~pos ~env =
List.fold_left l ~init:env ~f:
begin fun env pt ->
let env = match pt.psig_desc with
- Psig_open id ->
+ Psig_open (ovf, id) ->
let path, mt = lookup_module id.txt env in
begin match mt with
- Mty_signature sign -> open_signature path sign env
+ Mty_signature sign -> open_signature ovf path sign env
| _ -> env
end
| sign_item ->
@@ -220,7 +220,8 @@ let rec search_pos_signature l ~pos ~env =
List.iter l
~f:(fun ci -> search_pos_class_type ci.pci_expr ~pos ~env)
(* The last cases should not happen in generated interfaces *)
- | Psig_open lid -> add_found_sig (`Module, lid.txt) ~env ~loc:pt.psig_loc
+ | Psig_open (_, lid) ->
+ add_found_sig (`Module, lid.txt) ~env ~loc:pt.psig_loc
| Psig_include t -> search_pos_module t ~pos ~env
end;
env
@@ -325,7 +326,7 @@ let dummy_item = Sig_modtype (Ident.create "dummy", Modtype_abstract)
let rec view_signature ?title ?path ?(env = !start_env) ?(detach=false) sign =
let env =
match path with None -> env
- | Some path -> Env.open_signature path sign env in
+ | Some path -> Env.open_signature Fresh path sign env in
let title =
match title, path with Some title, _ -> title
| None, Some path -> string_of_path path
diff --git a/otherlibs/labltk/browser/viewer.ml b/otherlibs/labltk/browser/viewer.ml
index 9cd1014d8..600e4650b 100644
--- a/otherlibs/labltk/browser/viewer.ml
+++ b/otherlibs/labltk/browser/viewer.ml
@@ -239,7 +239,7 @@ let view_defined ~env ?(show_all=false) modlid =
in
let l = iter_sign sign [] in
let title = string_of_path path in
- let env = open_signature path sign env in
+ let env = open_signature Asttypes.Fresh path sign env in
!choose_symbol_ref l ~title ~signature:sign ~env ~path;
if show_all then view_signature sign ~title ~env ~path
| _ -> ()