diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2014-05-12 12:02:26 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2014-05-12 12:02:26 +0000 |
| commit | 77cf8b999eeec9f9f7787aab82886155dee89c98 (patch) | |
| tree | 0be5c1feab4aa17cfd747e23a2457ac75197f9c0 /driver | |
| parent | 68ae2cc74b5871079ae618f34649ec0bcb1a47f5 (diff) | |
| download | ocaml-77cf8b999eeec9f9f7787aab82886155dee89c98.tar.gz | |
* split Typetexp.lookup_module and Typetexp.find_module
* fix semantics of -open by using Typemod.type_open_
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14795 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/compmisc.ml | 8 | ||||
| -rw-r--r-- | driver/main_args.ml | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/driver/compmisc.ml b/driver/compmisc.ml index b3283fa86f..dfd0b13ad6 100644 --- a/driver/compmisc.ml +++ b/driver/compmisc.ml @@ -40,10 +40,10 @@ let init_path native = toplevel initialization (PR#1775) *) let open_implicit_module m env = - try - Env.open_pers_signature m env - with Not_found -> - Misc.fatal_error (Printf.sprintf "cannot open implicit module %S" m) + let open Asttypes in + let lid = {loc = Location.in_file "command line"; + txt = Longident.Lident m } in + snd (Typemod.type_open_ Override env lid.loc lid) let initial_env () = Ident.reinit(); diff --git a/driver/main_args.ml b/driver/main_args.ml index 12a7ba6ff6..22b5ef049a 100644 --- a/driver/main_args.ml +++ b/driver/main_args.ml @@ -685,6 +685,7 @@ struct mk_noprompt F._noprompt; mk_nopromptcont F._nopromptcont; mk_nostdlib F._nostdlib; + mk_open F._open; mk_ppx F._ppx; mk_principal F._principal; mk_rectypes F._rectypes; @@ -811,6 +812,7 @@ module Make_opttop_options (F : Opttop_options) = struct mk_noprompt F._noprompt; mk_nopromptcont F._nopromptcont; mk_nostdlib F._nostdlib; + mk_open F._open; mk_ppx F._ppx; mk_principal F._principal; mk_rectypes F._rectypes; |