Reformat middle_end/flambda2/ (#230)

Author: mshinwell

middle_end/flambda2/backend_intf/flambda2_backend_impl.ml

@@ -25,8 +25,7 @@ module Compilation_unit = struct
   let of_flambda1_compilation_unit comp_unit =
     let ident = Flambda1_compilation_unit.get_persistent_ident comp_unit in
     let linkage_name =
-      comp_unit
-      |> Flambda1_compilation_unit.get_linkage_name
+      comp_unit |> Flambda1_compilation_unit.get_linkage_name
       |> Flambda1_linkage_name.to_string
       |> Flambda2_compilenv_deps.Linkage_name.create
     in
@@ -43,30 +42,28 @@ let symbol_for_module_block id =
     Compilenv.unit_for_global id
     |> Compilation_unit.of_flambda1_compilation_unit
   in
-  Symbol.unsafe_create
-    comp_unit
+  Symbol.unsafe_create comp_unit
     (Linkage_name.create (Compilenv.symbol_for_global id))
 
 let symbol_for_global' ?comp_unit id =
-  if Ident.global id && not (Ident.is_predef id) then
-    symbol_for_module_block id
+  if Ident.global id && not (Ident.is_predef id)
+  then symbol_for_module_block id
   else
     let comp_unit =
       match comp_unit with
       | Some comp_unit -> comp_unit
       | None ->
-        if Ident.is_predef id then Compilation_unit.predefined_exception ()
+        if Ident.is_predef id
+        then Compilation_unit.predefined_exception ()
         else Compilation_unit.get_current_exn ()
     in
-    Symbol.unsafe_create
-      comp_unit
+    Symbol.unsafe_create comp_unit
       (Linkage_name.create (Compilenv.symbol_for_global id))
 
 let find_predef_exn name =
   let matches ident = String.equal (Ident.name ident) name in
   match List.find matches Predef.all_predef_exns with
-  | exception Not_found ->
-    Misc.fatal_errorf "Cannot find predef exn '%s'" name
+  | exception Not_found -> Misc.fatal_errorf "Cannot find predef exn '%s'" name
   | ident -> ident
 
 let division_by_zero =
@@ -82,8 +79,9 @@ let invalid_argument =
 let all_predefined_exception_symbols =
   Predef.all_predef_exns
   |> List.map (fun ident ->
-    symbol_for_global' ~comp_unit:(Compilation_unit.predefined_exception ())
-      ident)
+         symbol_for_global'
+           ~comp_unit:(Compilation_unit.predefined_exception ())
+           ident)
   |> Symbol.Set.of_list
 
 let () =
@@ -93,34 +91,37 @@ let () =
 let symbol_for_global' id : Symbol.t = symbol_for_global' id
 
 let size_int = Arch.size_int
+
 let big_endian = Arch.big_endian
 
-let max_sensible_number_of_arguments =
-  Proc.max_arguments_for_tailcalls - 1
+let max_sensible_number_of_arguments = Proc.max_arguments_for_tailcalls - 1
 
 let set_global_info info = Compilenv.flambda2_set_export_info info
 
 let get_global_info comp_unit =
-  (* The Flambda simplifier should have returned the typing information
-     for the predefined exception compilation unit before getting here. *)
+  (* The Flambda simplifier should have returned the typing information for the
+     predefined exception compilation unit before getting here. *)
   assert (not (Compilation_unit.is_predefined_exception comp_unit));
-  if Compilation_unit.is_external_symbols comp_unit then None
+  if Compilation_unit.is_external_symbols comp_unit
+  then None
   else
     let id =
-      (* CR mshinwell: Unsure how to construct this properly.  Also see CR
-         in Closure_conversion about the linkage names of module blocks *)
+      (* CR mshinwell: Unsure how to construct this properly. Also see CR in
+         Closure_conversion about the linkage names of module blocks *)
       Compilation_unit.get_persistent_ident comp_unit
     in
     match Compilenv.get_global_info' id with
     | None | Some (Flambda2 None) -> None
     | Some (Flambda2 (Some info)) -> Some info
     | Some (Clambda _) ->
-      (* CR mshinwell: This should be a user error, not a fatal error.
-         Same below. *)
-      Misc.fatal_errorf "The .cmx file for unit %a was compiled with \
-          the Closure middle-end, not Flambda 2, and cannot be loaded"
+      (* CR mshinwell: This should be a user error, not a fatal error. Same
+         below. *)
+      Misc.fatal_errorf
+        "The .cmx file for unit %a was compiled with the Closure middle-end, \
+         not Flambda 2, and cannot be loaded"
         Compilation_unit.print comp_unit
     | Some (Flambda1 _) ->
-      Misc.fatal_errorf "The .cmx file for unit %a was compiled with \
-          the Flambda 1 middle-end, not Flambda 2, and cannot be loaded"
+      Misc.fatal_errorf
+        "The .cmx file for unit %a was compiled with the Flambda 1 middle-end, \
+         not Flambda 2, and cannot be loaded"
         Compilation_unit.print comp_unit

middle_end/flambda2/basic/closure_id.ml

@@ -16,26 +16,28 @@
 
 [@@@ocaml.warning "+a-4-9-30-40-41-42"]
 
-type t = {
-  compilation_unit : Compilation_unit.t;
-  name : string;
-  name_stamp : int;
-  (** [name_stamp]s are unique within any given compilation unit. *)
-}
+type t =
+  { compilation_unit : Compilation_unit.t;
+    name : string;
+    name_stamp : int
+        (** [name_stamp]s are unique within any given compilation unit. *)
+  }
 
 module Self = Container_types.Make (struct
   type nonrec t = t
 
   let compare t1 t2 =
-    if t1 == t2 then 0
+    if t1 == t2
+    then 0
     else
       let c = t1.name_stamp - t2.name_stamp in
-      if c <> 0 then c
+      if c <> 0
+      then c
       else Compilation_unit.compare t1.compilation_unit t2.compilation_unit
 
-  let equal t1 t2 = (compare t1 t2 = 0)
+  let equal t1 t2 = compare t1 t2 = 0
 
-  let hash t = t.name_stamp lxor (Compilation_unit.hash t.compilation_unit)
+  let hash t = t.name_stamp lxor Compilation_unit.hash t.compilation_unit
 
   let [@ocamlformat "disable"] print ppf t =
     Format.fprintf ppf "@<0>%s" (Flambda_colours.closure_element ());
@@ -51,14 +53,14 @@ module Self = Container_types.Make (struct
     end;
     Format.fprintf ppf "@<0>%s" (Flambda_colours.normal ())
 
-  let output chan t =
-    print (Format.formatter_of_out_channel chan) t
+  let output chan t = print (Format.formatter_of_out_channel chan) t
 end)
 
 include Self
 
-module Lmap = Lmap.Make(struct
+module Lmap = Lmap.Make (struct
   type nonrec t = t
+
   include Self
 end)
 
@@ -69,26 +71,20 @@ let get_next_stamp () =
   incr next_stamp;
   stamp
 
-let in_compilation_unit t cu =
-  Compilation_unit.equal cu t.compilation_unit
+let in_compilation_unit t cu = Compilation_unit.equal cu t.compilation_unit
 
 let get_compilation_unit t = t.compilation_unit
 
-let to_string t =
-  t.name ^ "_" ^ (string_of_int t.name_stamp)
+let to_string t = t.name ^ "_" ^ string_of_int t.name_stamp
 
-let name t =
-  t.name
+let name t = t.name
 
-let rename t =
-  { t with
-    name_stamp = get_next_stamp ();
-  }
+let rename t = { t with name_stamp = get_next_stamp () }
 
 let unwrap t = Variable.create (to_string t)
 
 let wrap compilation_unit var =
   { compilation_unit;
     name = Variable.raw_name var;
-    name_stamp = get_next_stamp ();
+    name_stamp = get_next_stamp ()
   }

middle_end/flambda2/basic/closure_id.mli

@@ -16,14 +16,14 @@
 
 [@@@ocaml.warning "+a-4-9-30-40-41-42"]
 
-(* CR lwhite: "Closure_id" is quite a generic name.  I wonder
-   whether something like "Closure_label" would better capture that it is
-   the label of a projection. *)
+(* CR lwhite: "Closure_id" is quite a generic name. I wonder whether something
+   like "Closure_label" would better capture that it is the label of a
+   projection. *)
 
 (* CR mshinwell: update comment *)
 (** An identifier, unique across the whole program (not just one compilation
-    unit), that identifies a closure within a particular set of closures
-    (viz. [Project_closure]). *)
+    unit), that identifies a closure within a particular set of closures (viz.
+    [Project_closure]). *)
 
 include Container_types.S
 
@@ -34,6 +34,7 @@ val wrap : Compilation_unit.t -> Variable.t -> t
 val unwrap : t -> Variable.t
 
 val in_compilation_unit : t -> Compilation_unit.t -> bool
+
 val get_compilation_unit : t -> Compilation_unit.t
 
 val to_string : t -> string

middle_end/flambda2/basic/closure_origin.ml

@@ -19,4 +19,5 @@
 include Closure_id
 
 let create t = t
+
 let rename f t = f t

middle_end/flambda2/basic/closure_origin.mli

@@ -19,4 +19,5 @@ include Container_types.S
 val create : Closure_id.t -> t
 
 val get_compilation_unit : t -> Compilation_unit.t
+
 val rename : (Closure_id.t -> Closure_id.t) -> t -> t

middle_end/flambda2/basic/code_id.ml

@@ -14,19 +14,19 @@
 (*                                                                        *)
 (**************************************************************************)
 
-(* CR mshinwell: Move to Reg_width_things so we can then do
-   Code_id_or_symbol for free *)
+(* CR mshinwell: Move to Reg_width_things so we can then do Code_id_or_symbol
+   for free *)
 
 [@@@ocaml.warning "+a-30-40-41-42"]
 
 module Id = Table_by_int_id.Id
 
 module Code_id_data = struct
-  type t = {
-    compilation_unit : Compilation_unit.t;
-    name : string;
-    linkage_name : Linkage_name.t;
-  }
+  type t =
+    { compilation_unit : Compilation_unit.t;
+      name : string;
+      linkage_name : Linkage_name.t
+    }
 
   let flags = 0
 
@@ -40,34 +40,39 @@ module Code_id_data = struct
       name
       Linkage_name.print linkage_name
 
-  let hash { compilation_unit; name = _; linkage_name; } =
-    Hashtbl.hash (Compilation_unit.hash compilation_unit,
-                  Linkage_name.hash linkage_name)
+  let hash { compilation_unit; name = _; linkage_name } =
+    Hashtbl.hash
+      (Compilation_unit.hash compilation_unit, Linkage_name.hash linkage_name)
 
   let equal
-      { compilation_unit = compilation_unit1; name = _;
-        linkage_name = linkage_name1; }
-      { compilation_unit = compilation_unit2; name = _;
-        linkage_name = linkage_name2; }
-      =
+      { compilation_unit = compilation_unit1;
+        name = _;
+        linkage_name = linkage_name1
+      }
+      { compilation_unit = compilation_unit2;
+        name = _;
+        linkage_name = linkage_name2
+      } =
     Linkage_name.equal linkage_name1 linkage_name2
-      && Compilation_unit.equal compilation_unit1 compilation_unit2
+    && Compilation_unit.equal compilation_unit1 compilation_unit2
 end
 
 type t = Id.t
 
 type exported = Code_id_data.t
 
 module Table = Table_by_int_id.Make (Code_id_data)
+
 let grand_table_of_code_ids = ref (Table.create ())
 
-let initialise () =
-  grand_table_of_code_ids := Table.create ()
+let initialise () = grand_table_of_code_ids := Table.create ()
 
 let find_data t = Table.find !grand_table_of_code_ids t
 
 let get_compilation_unit t = (find_data t).compilation_unit
+
 let linkage_name t = (find_data t).linkage_name
+
 let name t = (find_data t).name
 
 let previous_name_stamp = ref (-1)
@@ -86,12 +91,7 @@ let create ~name compilation_unit =
     in
     Linkage_name.create (unit_linkage_name ^ "__" ^ unique_name ^ "_code")
   in
-  let data : Code_id_data.t =
-    { compilation_unit;
-      name;
-      linkage_name;
-    }
-  in
+  let data : Code_id_data.t = { compilation_unit; name; linkage_name } in
   Table.add !grand_table_of_code_ids data
 
 let rename t = create ~name:(name t) (Compilation_unit.get_current_exn ())
@@ -105,7 +105,9 @@ let code_symbol t =
 
 module T0 = struct
   let compare = Id.compare
+
   let equal = Id.equal
+
   let hash = Id.hash
 
   let [@ocamlformat "disable"] print ppf t =
@@ -118,27 +120,35 @@ module T0 = struct
 end
 
 include T0
+
 module T = struct
   type nonrec t = t
+
   include T0
 end
 
-module Set = Patricia_tree.Make_set (struct let print = print end)
-module Map = Patricia_tree.Make_map (struct let print = print end) (Set)
+module Set = Patricia_tree.Make_set (struct
+  let print = print
+end)
+
+module Map =
+  Patricia_tree.Make_map
+    (struct
+      let print = print
+    end)
+    (Set)
+
 module Tbl = Container_types.Make_tbl (Numeric_types.Int) (Map)
-module Lmap = Lmap.Make(T)
+module Lmap = Lmap.Make (T)
 
 let invert_map map =
-  Map.fold (fun older newer invert_map ->
-      Map.add newer older invert_map)
-    map
-    Map.empty
+  Map.fold
+    (fun older newer invert_map -> Map.add newer older invert_map)
+    map Map.empty
 
 let export t = find_data t
 
-let import (data : exported) =
-  Table.add !grand_table_of_code_ids data
+let import (data : exported) = Table.add !grand_table_of_code_ids data
 
 let map_compilation_unit f (data : exported) : exported =
-  { data with compilation_unit = f data.compilation_unit;
-  }
+  { data with compilation_unit = f data.compilation_unit }