Fix toplevel/*.ml (#293)

Author: mshinwell

toplevel/byte/topeval.ml

@@ -47,51 +47,16 @@ module EvalBase = struct
 
   let eval_compilation_unit cu =
     try
-      Symtable.get_global_value
-        (cu |> Compilation_unit.to_global_ident_for_bytecode)
-    with Symtable.Error (Undefined_global name) ->
-      raise (Undefined_global name)
+      Symtable.get_global_value (Symtable.Global.of_compilation_unit cu)
+    with Symtable.Error (Undefined_global global) ->
+      raise (Undefined_global (Symtable.Global.name global))
 
   let eval_ident id =
-<<<<<<< HEAD
     let name = Translmod.toplevel_name id in
     try
       String.Map.find name !toplevel_value_bindings
     with Not_found ->
       raise (Undefined_global name)
-||||||| 121bedcfd2
-    if Ident.persistent id || Ident.global id then begin
-      try
-        Symtable.get_global_value id
-      with Symtable.Error (Undefined_global name) ->
-        raise (Undefined_global name)
-    end else begin
-      let name = Translmod.toplevel_name id in
-      try
-        String.Map.find name !toplevel_value_bindings
-      with Not_found ->
-        raise (Undefined_global name)
-    end
-=======
-    if Ident.global id then begin
-      let name = Ident.name id in
-      let global =
-        if Ident.persistent id
-        then Symtable.Global.Glob_compunit (Cmo_format.Compunit name)
-        else Symtable.Global.Glob_predef (Cmo_format.Predef_exn name)
-      in
-      try
-        Symtable.get_global_value global
-      with Symtable.Error (Undefined_global _) ->
-        raise (Undefined_global name)
-    end else begin
-      let name = Translmod.toplevel_name id in
-      try
-        String.Map.find name !toplevel_value_bindings
-      with Not_found ->
-        raise (Undefined_global name)
-    end
->>>>>>> 5.2.0
 
 end
 
@@ -304,8 +269,11 @@ and really_load_file recursive ppf name filename ic =
             | Reloc_getcompunit cu
               when not (Symtable.is_global_defined
                 (Symtable.Global.Glob_compunit cu)) ->
-                let file = (Symtable.Compunit.name cu) ^ ".cmo" in
-                begin match Load_path.find_normalized file with
+                let file =
+                  (Compilation_unit.Name.to_string (Compilation_unit.name cu))
+                  ^ ".cmo"
+                in
+                begin match Load_path.find_uncap file with
                 | exception Not_found -> ()
                 | file ->
                     if not (load_file recursive ppf file) then raise Load_failed

toplevel/expunge.ml

@@ -17,40 +17,36 @@
    Usage: expunge <source file> <dest file> <names of modules to keep> *)
 
 open Misc
-module String = Misc.Stdlib.String
 
-let to_keep = ref String.Set.empty
+let to_keep = ref Compilation_unit.Name.Set.empty
 
 let negate = Sys.argv.(3) = "-v"
 
+let keep0 name =
+  if negate then not (Compilation_unit.Name.Set.mem name !to_keep)
+  else (Compilation_unit.Name.Set.mem name !to_keep)
+
 let keep = function
   | Symtable.Global.Glob_predef _ -> true
-  | Symtable.Global.Glob_compunit (Cmo_format.Compunit name) ->
-    if negate then not (String.Set.mem name !to_keep)
-    else (String.Set.mem name !to_keep)
+  | Symtable.Global.Glob_compunit cu ->
+    let name = Compilation_unit.name cu in
+    keep0 name
 
 let expunge_map tbl =
   Symtable.filter_global_map keep tbl
 
 let expunge_crcs tbl =
-<<<<<<< HEAD
   Array.to_list tbl
-  |> List.filter
-    (fun import ->
-      keep (Import_info.name import |> Compilation_unit.Name.to_string))
+  |> List.filter (fun import -> keep0 (Import_info.name import))
   |> Array.of_list
-||||||| 121bedcfd2
-  List.filter (fun (unit, _crc) -> keep unit) tbl
-=======
-  List.filter (fun (compunit, _crc) ->
-    keep (Symtable.Global.Glob_compunit (Cmo_format.Compunit compunit))) tbl
->>>>>>> 5.2.0
 
 let main () =
   let input_name = Sys.argv.(1) in
   let output_name = Sys.argv.(2) in
   for i = (if negate then 4 else 3) to Array.length Sys.argv - 1 do
-    to_keep := String.Set.add (Unit_info.modulize Sys.argv.(i)) !to_keep
+    let modname = Unit_info.modulize Sys.argv.(i) in
+    let cu_name = Compilation_unit.Name.of_string modname in
+    to_keep := Compilation_unit.Name.Set.add cu_name !to_keep
   done;
   let ic = open_in_bin input_name in
   let toc = Bytesections.read_toc ic in

toplevel/topcommon.ml

@@ -408,10 +408,13 @@ let try_run_directive ppf dir_name pdir_arg =
 (* Overriding exception printers with toplevel-specific ones *)
 
 let loading_hint_printer ppf cu =
-  let global = Symtable.Global.Glob_compunit (Cmo_format.Compunit cu) in
+  let global = Symtable.Global.Glob_compunit cu in
   Symtable.report_error ppf (Symtable.Undefined_global global);
   let find_with_ext ext =
-    try Some (Load_path.find_normalized (cu ^ ext)) with Not_found -> None
+    let leafname =
+      (Compilation_unit.Name.to_string (Compilation_unit.name cu)) ^ ext
+    in
+    try Some (Load_path.find_uncap leafname) with Not_found -> None
   in
   fprintf ppf
     "@.Hint: @[\
@@ -441,8 +444,7 @@ let () =
   Location.register_error_of_exn
     (function
       | Symtable.Error
-        (Symtable.Undefined_global (Symtable.Global.Glob_compunit
-          (Cmo_format.Compunit cu))) ->
+        (Symtable.Undefined_global (Symtable.Global.Glob_compunit cu)) ->
           Some (Location.error_of_printer_file loading_hint_printer cu)
       | _ -> None
     )

toplevel/topdirs.ml

@@ -95,7 +95,7 @@ let _ = add_directive "directory" (Directive_string dir_directory)
 let dir_remove_directory s =
   let d = expand_directory Config.standard_library s in
   let keep id =
-    match Load_path.find_normalized (Ident.name id ^ ".cmi") with
+    match Load_path.find_uncap (Ident.name id ^ ".cmi") with
     | exception Not_found -> true
     | fn -> Filename.dirname fn <> d
   in