diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2013-01-29 14:21:12 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2013-01-29 14:21:12 +0000 |
| commit | 26e1ff7138c3e90e845fb278fc6283a166f1871f (patch) | |
| tree | d02a34c8baf030ed23102619fe541c888f85bf76 /otherlibs/labltk/browser/searchid.ml | |
| parent | d327f16c33093540f99738cf195d51b736f5581c (diff) | |
| parent | 1430e90e89240309b1aea3a7ddd0270bb16707b8 (diff) | |
Merge short-paths into a fresh branch of trunk.
Also fix a bit unification and subtyping errors.
You now need the flag -short-path to activate short paths.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths-4.01@13285 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/labltk/browser/searchid.ml')
| -rw-r--r-- | otherlibs/labltk/browser/searchid.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/otherlibs/labltk/browser/searchid.ml b/otherlibs/labltk/browser/searchid.ml index ab66f0f03..0cad8ffc7 100644 --- a/otherlibs/labltk/browser/searchid.ml +++ b/otherlibs/labltk/browser/searchid.ml @@ -294,11 +294,11 @@ let search_string_type text ~mode = end in try (Typemod.transl_signature env sexp).sig_type with Env.Error err -> [] - | Typemod.Error (l,_) -> + | Typemod.Error (l,_,_) -> let start_c = l.loc_start.Lexing.pos_cnum in let end_c = l.loc_end.Lexing.pos_cnum in raise (Error (start_c - 8, end_c - 8)) - | Typetexp.Error (l,_) -> + | Typetexp.Error (l,_,_) -> let start_c = l.loc_start.Lexing.pos_cnum in let end_c = l.loc_end.Lexing.pos_cnum in raise (Error (start_c - 8, end_c - 8)) |