6 files changed, 52 insertions, 50 deletions
diff --git a/otherlibs/labltk/browser/.depend b/otherlibs/labltk/browser/.depend
index 558ccdd26..491201163 100644
--- a/otherlibs/labltk/browser/.depend
+++ b/otherlibs/labltk/browser/.depend
@@ -1,19 +1,19 @@
-editor.cmo: fileselect.cmi jg_bind.cmi jg_button.cmo jg_menu.cmo \
-    jg_message.cmi jg_text.cmi jg_tk.cmo jg_toplevel.cmo lexical.cmi \
-    mytypes.cmi searchid.cmi searchpos.cmi setpath.cmi shell.cmi \
-    typecheck.cmi viewer.cmi editor.cmi 
-editor.cmx: fileselect.cmx jg_bind.cmx jg_button.cmx jg_menu.cmx \
-    jg_message.cmx jg_text.cmx jg_tk.cmx jg_toplevel.cmx lexical.cmx \
-    mytypes.cmi searchid.cmx searchpos.cmx setpath.cmx shell.cmx \
-    typecheck.cmx viewer.cmx editor.cmi 
-fileselect.cmo: jg_box.cmo jg_entry.cmo jg_memo.cmi jg_toplevel.cmo list2.cmo \
-    setpath.cmi useunix.cmi fileselect.cmi 
-fileselect.cmx: jg_box.cmx jg_entry.cmx jg_memo.cmx jg_toplevel.cmx list2.cmx \
-    setpath.cmx useunix.cmx fileselect.cmi 
+editor.cmo: viewer.cmi typecheck.cmi shell.cmi setpath.cmi searchpos.cmi \
+    searchid.cmi mytypes.cmi lexical.cmi jg_toplevel.cmo jg_tk.cmo \
+    jg_text.cmi jg_message.cmi jg_menu.cmo jg_button.cmo jg_bind.cmi \
+    fileselect.cmi editor.cmi 
+editor.cmx: viewer.cmx typecheck.cmx shell.cmx setpath.cmx searchpos.cmx \
+    searchid.cmx mytypes.cmi lexical.cmx jg_toplevel.cmx jg_tk.cmx \
+    jg_text.cmx jg_message.cmx jg_menu.cmx jg_button.cmx jg_bind.cmx \
+    fileselect.cmx editor.cmi 
+fileselect.cmo: useunix.cmi setpath.cmi list2.cmo jg_toplevel.cmo jg_memo.cmi \
+    jg_entry.cmo jg_box.cmo fileselect.cmi 
+fileselect.cmx: useunix.cmx setpath.cmx list2.cmx jg_toplevel.cmx jg_memo.cmx \
+    jg_entry.cmx jg_box.cmx fileselect.cmi 
 jg_bind.cmo: jg_bind.cmi 
 jg_bind.cmx: jg_bind.cmi 
-jg_box.cmo: jg_bind.cmi jg_completion.cmi 
-jg_box.cmx: jg_bind.cmx jg_completion.cmx 
+jg_box.cmo: jg_completion.cmi jg_bind.cmi 
+jg_box.cmx: jg_completion.cmx jg_bind.cmx 
 jg_completion.cmo: jg_completion.cmi 
 jg_completion.cmx: jg_completion.cmi 
 jg_config.cmo: jg_tk.cmo jg_config.cmi 
@@ -22,45 +22,45 @@ jg_entry.cmo: jg_bind.cmi
 jg_entry.cmx: jg_bind.cmx 
 jg_memo.cmo: jg_memo.cmi 
 jg_memo.cmx: jg_memo.cmi 
-jg_message.cmo: jg_bind.cmi jg_text.cmi jg_tk.cmo jg_toplevel.cmo \
+jg_message.cmo: jg_toplevel.cmo jg_tk.cmo jg_text.cmi jg_bind.cmi \
     jg_message.cmi 
-jg_message.cmx: jg_bind.cmx jg_text.cmx jg_tk.cmx jg_toplevel.cmx \
+jg_message.cmx: jg_toplevel.cmx jg_tk.cmx jg_text.cmx jg_bind.cmx \
     jg_message.cmi 
-jg_multibox.cmo: jg_bind.cmi jg_completion.cmi jg_multibox.cmi 
-jg_multibox.cmx: jg_bind.cmx jg_completion.cmx jg_multibox.cmi 
-jg_text.cmo: jg_bind.cmi jg_button.cmo jg_tk.cmo jg_toplevel.cmo jg_text.cmi 
-jg_text.cmx: jg_bind.cmx jg_button.cmx jg_tk.cmx jg_toplevel.cmx jg_text.cmi 
+jg_multibox.cmo: jg_completion.cmi jg_bind.cmi jg_multibox.cmi 
+jg_multibox.cmx: jg_completion.cmx jg_bind.cmx jg_multibox.cmi 
+jg_text.cmo: jg_toplevel.cmo jg_tk.cmo jg_button.cmo jg_bind.cmi jg_text.cmi 
+jg_text.cmx: jg_toplevel.cmx jg_tk.cmx jg_button.cmx jg_bind.cmx jg_text.cmi 
 lexical.cmo: jg_tk.cmo lexical.cmi 
 lexical.cmx: jg_tk.cmx lexical.cmi 
-main.cmo: editor.cmi jg_config.cmi searchid.cmi searchpos.cmi shell.cmi \
-    viewer.cmi 
-main.cmx: editor.cmx jg_config.cmx searchid.cmx searchpos.cmx shell.cmx \
-    viewer.cmx 
+main.cmo: viewer.cmi shell.cmi searchpos.cmi searchid.cmi jg_config.cmi \
+    editor.cmi 
+main.cmx: viewer.cmx shell.cmx searchpos.cmx searchid.cmx jg_config.cmx \
+    editor.cmx 
 searchid.cmo: list2.cmo searchid.cmi 
 searchid.cmx: list2.cmx searchid.cmi 
-searchpos.cmo: jg_bind.cmi jg_memo.cmi jg_message.cmi jg_text.cmi jg_tk.cmo \
-    lexical.cmi searchid.cmi searchpos.cmi 
-searchpos.cmx: jg_bind.cmx jg_memo.cmx jg_message.cmx jg_text.cmx jg_tk.cmx \
-    lexical.cmx searchid.cmx searchpos.cmi 
-setpath.cmo: jg_bind.cmi jg_box.cmo jg_button.cmo jg_toplevel.cmo list2.cmo \
-    useunix.cmi setpath.cmi 
-setpath.cmx: jg_bind.cmx jg_box.cmx jg_button.cmx jg_toplevel.cmx list2.cmx \
-    useunix.cmx setpath.cmi 
-shell.cmo: dummy.cmi fileselect.cmi jg_memo.cmi jg_menu.cmo jg_message.cmi \
-    jg_text.cmi jg_tk.cmo jg_toplevel.cmo lexical.cmi list2.cmo shell.cmi 
-shell.cmx: dummy.cmi fileselect.cmx jg_memo.cmx jg_menu.cmx jg_message.cmx \
-    jg_text.cmx jg_tk.cmx jg_toplevel.cmx lexical.cmx list2.cmx shell.cmi 
-typecheck.cmo: jg_message.cmi jg_text.cmi jg_tk.cmo mytypes.cmi typecheck.cmi 
-typecheck.cmx: jg_message.cmx jg_text.cmx jg_tk.cmx mytypes.cmi typecheck.cmi 
+searchpos.cmo: searchid.cmi lexical.cmi jg_tk.cmo jg_text.cmi jg_message.cmi \
+    jg_memo.cmi jg_bind.cmi searchpos.cmi 
+searchpos.cmx: searchid.cmx lexical.cmx jg_tk.cmx jg_text.cmx jg_message.cmx \
+    jg_memo.cmx jg_bind.cmx searchpos.cmi 
+setpath.cmo: useunix.cmi list2.cmo jg_toplevel.cmo jg_button.cmo jg_box.cmo \
+    jg_bind.cmi setpath.cmi 
+setpath.cmx: useunix.cmx list2.cmx jg_toplevel.cmx jg_button.cmx jg_box.cmx \
+    jg_bind.cmx setpath.cmi 
+shell.cmo: list2.cmo lexical.cmi jg_toplevel.cmo jg_tk.cmo jg_text.cmi \
+    jg_message.cmi jg_menu.cmo jg_memo.cmi fileselect.cmi dummy.cmi shell.cmi 
+shell.cmx: list2.cmx lexical.cmx jg_toplevel.cmx jg_tk.cmx jg_text.cmx \
+    jg_message.cmx jg_menu.cmx jg_memo.cmx fileselect.cmx dummy.cmi shell.cmi 
+typecheck.cmo: mytypes.cmi jg_tk.cmo jg_text.cmi jg_message.cmi typecheck.cmi 
+typecheck.cmx: mytypes.cmi jg_tk.cmx jg_text.cmx jg_message.cmx typecheck.cmi 
 useunix.cmo: useunix.cmi 
 useunix.cmx: useunix.cmi 
-viewer.cmo: help.cmo jg_bind.cmi jg_box.cmo jg_button.cmo jg_completion.cmi \
-    jg_entry.cmo jg_menu.cmo jg_message.cmi jg_multibox.cmi jg_text.cmi \
-    jg_tk.cmo jg_toplevel.cmo mytypes.cmi searchid.cmi searchpos.cmi \
-    setpath.cmi shell.cmi useunix.cmi viewer.cmi 
-viewer.cmx: help.cmx jg_bind.cmx jg_box.cmx jg_button.cmx jg_completion.cmx \
-    jg_entry.cmx jg_menu.cmx jg_message.cmx jg_multibox.cmx jg_text.cmx \
-    jg_tk.cmx jg_toplevel.cmx mytypes.cmi searchid.cmx searchpos.cmx \
-    setpath.cmx shell.cmx useunix.cmx viewer.cmi 
+viewer.cmo: useunix.cmi shell.cmi setpath.cmi searchpos.cmi searchid.cmi \
+    mytypes.cmi jg_toplevel.cmo jg_tk.cmo jg_text.cmi jg_multibox.cmi \
+    jg_message.cmi jg_menu.cmo jg_entry.cmo jg_completion.cmi jg_button.cmo \
+    jg_box.cmo jg_bind.cmi help.cmo viewer.cmi 
+viewer.cmx: useunix.cmx shell.cmx setpath.cmx searchpos.cmx searchid.cmx \
+    mytypes.cmi jg_toplevel.cmx jg_tk.cmx jg_text.cmx jg_multibox.cmx \
+    jg_message.cmx jg_menu.cmx jg_entry.cmx jg_completion.cmx jg_button.cmx \
+    jg_box.cmx jg_bind.cmx help.cmx viewer.cmi 
 mytypes.cmi: shell.cmi 
 typecheck.cmi: mytypes.cmi 
diff --git a/otherlibs/labltk/browser/Makefile b/otherlibs/labltk/browser/Makefile
index c1daed946..b611622a2 100644
--- a/otherlibs/labltk/browser/Makefile
+++ b/otherlibs/labltk/browser/Makefile
@@ -60,5 +60,6 @@ dummy.mli:
 	ln -s dummyUnix.mli $@
 shell.cmo: dummy.cmi
 setpath.cmo fileselect.cmo lexical.cmi searchid.cmi typecheck.cmi: $(TOPDIR)/toplevel/toplevellib.cma
+mytypes.cmi searchpos.cmi searchpos.cmo typecheck.cmo: $(TOPDIR)/typing/stypes.cmi
 
 include	.depend
diff --git a/otherlibs/labltk/browser/mytypes.mli b/otherlibs/labltk/browser/mytypes.mli
index 6703ff101..6db120adc 100644
--- a/otherlibs/labltk/browser/mytypes.mli
+++ b/otherlibs/labltk/browser/mytypes.mli
@@ -23,7 +23,7 @@ type edit_window =
     modified: Textvariable.textVariable;
     mutable shell: (string * Shell.shell) option;
     mutable structure: Typedtree.structure;
-    mutable type_info: Stypes.type_info list;
+    mutable type_info: Stypes.annotation list;
     mutable signature: Types.signature;
     mutable psignature: Parsetree.signature;
     number: string }
diff --git a/otherlibs/labltk/browser/searchpos.ml b/otherlibs/labltk/browser/searchpos.ml
index 7cadb4eda..e9c1ffad0 100644
--- a/otherlibs/labltk/browser/searchpos.ml
+++ b/otherlibs/labltk/browser/searchpos.ml
@@ -871,6 +871,7 @@ let search_pos_ti ~pos = function
   | Ti_expr e  -> search_pos_expr ~pos e
   | Ti_class c -> search_pos_class_expr ~pos c
   | Ti_mod m   -> search_pos_module_expr ~pos m
+  | _ -> ()
 
 let rec search_pos_info ~pos = function
     [] -> []
diff --git a/otherlibs/labltk/browser/searchpos.mli b/otherlibs/labltk/browser/searchpos.mli
index 1da1a877a..cea3b4602 100644
--- a/otherlibs/labltk/browser/searchpos.mli
+++ b/otherlibs/labltk/browser/searchpos.mli
@@ -67,7 +67,7 @@ val search_pos_structure :
     pos:int -> Typedtree.structure_item list ->
     (fkind * Env.t * Location.t) list
 val search_pos_info :
-    pos:int -> Stypes.type_info list -> (fkind * Env.t * Location.t) list
+    pos:int -> Stypes.annotation list -> (fkind * Env.t * Location.t) list
 val view_type : fkind -> env:Env.t -> unit
 val view_type_menu : fkind -> env:Env.t -> parent:'a widget -> menu widget
 
diff --git a/otherlibs/labltk/browser/typecheck.ml b/otherlibs/labltk/browser/typecheck.ml
index 8199e4610..89366baa1 100644
--- a/otherlibs/labltk/browser/typecheck.ml
+++ b/otherlibs/labltk/browser/typecheck.ml
@@ -92,7 +92,7 @@ let f txt =
   txt.signature <- [];
   txt.psignature <- [];
   ignore (Stypes.get_info ());
-  Clflags.save_types := true;
+  Clflags.annotations := true;
 
   begin try
 
@@ -109,7 +109,7 @@ let f txt =
     List.iter psl ~f:
     begin function
       Ptop_def pstr ->
-        let str, sign, env' = Typemod.type_structure !env pstr in
+        let str, sign, env' = Typemod.type_structure !env pstr Location.none in
         txt.structure <- txt.structure @ str;
         txt.signature <- txt.signature @ sign;
         env := env'