diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2000-12-28 05:02:43 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2000-12-28 05:02:43 +0000 |
| commit | 447c79eadec7db87abc782735c5b06ed4fd020e4 (patch) | |
| tree | af61ce9dacb5809541aad99488a1beaf92c537cb /otherlibs/labltk/browser | |
| parent | bb1bce2d4d1f7fecea366cd4eb569c294b261c77 (diff) | |
deplace expand_directory dans Misc, pour generaliser -I +package
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3358 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/labltk/browser')
| -rw-r--r-- | otherlibs/labltk/browser/main.ml | 4 | ||||
| -rw-r--r-- | otherlibs/labltk/browser/searchpos.ml | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/otherlibs/labltk/browser/main.ml b/otherlibs/labltk/browser/main.ml index 1a0cb2788..6e0b4618b 100644 --- a/otherlibs/labltk/browser/main.ml +++ b/otherlibs/labltk/browser/main.ml @@ -38,7 +38,9 @@ let _ = \032 default setting is A (all warnings enabled)"] ~others:(fun name -> raise(Arg.Bad("don't know what to do with " ^ name))) ~errmsg:"ocamlbrowser :"; - Config.load_path := List.rev !path @ [Config.standard_library]; + Config.load_path := + List.rev_map ~f:(Misc.expand_directory Config.standard_library) !path + @ [Config.standard_library]; Warnings.parse_options ~iserror:false !Shell.warnings; Unix.putenv "TERM" "noterminal"; begin diff --git a/otherlibs/labltk/browser/searchpos.ml b/otherlibs/labltk/browser/searchpos.ml index c224c5fbe..3950e2b25 100644 --- a/otherlibs/labltk/browser/searchpos.ml +++ b/otherlibs/labltk/browser/searchpos.ml @@ -612,6 +612,7 @@ let rec search_pos_structure ~pos str = | Tstr_class l -> List.iter l ~f:(fun (id, _, _, cl) -> search_pos_class_expr cl ~pos) | Tstr_cltype _ -> () + | Tstr_include (m, _) -> search_pos_module_expr m ~pos end and search_pos_class_expr ~pos cl = @@ -731,6 +732,9 @@ and search_pos_expr ~pos exp = | Texp_letmodule (id, modexp, exp) -> search_pos_module_expr modexp ~pos; search_pos_expr exp ~pos + | Texp_assertfalse -> () + | Texp_assert exp -> + search_pos_expr exp ~pos end; raise (Found_str (`Exp(`Expr, exp.exp_type), exp.exp_env)) end |