Merge pull request #322 from emillon/remove-patch-env

Do not use patch_env anymore

Author: Leonidas-from-XIV

CHANGES.md

@@ -8,6 +8,10 @@
 
 #### Fixed
 
+- Use the same output as the normal toplevel. Mdx used to carry an unsafe patch
+  to work around a bug fixed in OCaml 4.06 and that patch would change the
+  printed types in some corner cases. (#322, @emillon)
+
 #### Removed
 
 - Dropped compatibility with older OCaml versions. The minimal supported range

lib/top/mdx_top.ml

@@ -636,35 +636,6 @@ let verbose t =
 let silent t =
   add_directive ~name:"silent" ~doc:"Be silent" (`Bool (fun x -> t.silent <- x))
 
-(* BLACK MAGIC: patch field of a module at runtime *)
-let monkey_patch (type a) (m : a) (type b) (prj : unit -> b) (v : b) =
-  let m = Obj.repr m in
-  let v = Obj.repr v in
-  let v' = Obj.repr (prj ()) in
-  if v' == v then ()
-  else
-    try
-      for i = 0 to Obj.size m - 1 do
-        if Obj.field m i == v' then (
-          Obj.set_field m i v;
-          if Obj.repr (prj ()) == v then raise Exit;
-          Obj.set_field m i v')
-      done;
-      invalid_arg "monkey_patch: field not found"
-    with Exit -> ()
-
-let patch_env () =
-  let module M = struct
-    module type T = module type of Env
-
-    let field () = Env.without_cmis
-
-    let replacement f x = f x
-
-    let () = monkey_patch (module Env : T) field replacement
-  end in
-  ()
-
 let protect f arg =
   try
     let _ = f arg in
@@ -703,7 +674,6 @@ let init ~verbose:v ~silent:s ~verbose_findlib ~directives ~packages ~predicates
   Mdx.Compat.init_path ();
   Toploop.toplevel_env := Compmisc.initial_env ();
   Sys.interactive := false;
-  patch_env ();
   List.iter
     (function
       | Directory path -> Topdirs.dir_directory path