improve alignment in output

Author: E-Sh4rk

Boxes/boxes.ml

@@ -290,8 +290,8 @@ let fit_codes_into_hex_boxes ?(exit=None) codes =
 let pp_boxes_names fmt lst =
   let pp_box i codes =
     let chars = Name.codes_to_chars codes in
-    Format.fprintf fmt "Box %2i: %a\t[%a]@." (i+1)
-      Name.pp_chars chars Name.pp_chars_raw chars
+    Format.fprintf fmt "Box %2i: %a   [%a]@." (i+1)
+      (Name.pp_chars ~pad:name_size) chars Name.pp_chars_raw chars
   in
   List.iteri pp_box lst
 

Charset/name.ml

@@ -39,7 +39,8 @@ let codes_to_chars c =
 let chars_for_command v =
   codes_for_command v |> codes_to_chars
 
-let pp_chars fmt lst =
+let pp_chars ~pad fmt lst =
+  let lst = lst@(List.init (pad - (List.length lst) |> Int.max 0) (fun _ -> " ")) in
   lst |> List.iteri (fun i str ->
     Format.fprintf fmt "%s%s" (if i = 0 then "" else " ") str
   )

Charset/name.mli

@@ -6,7 +6,7 @@ val codes_for_command : int32 -> int list (* Bytes are reversed *)
 val command_for_codes : int list -> int32 (* Bytes are reversed *)
 val chars_for_command : int32 -> string list
 val codes_to_chars : int list -> string list
-val pp_chars : Format.formatter -> string list -> unit
+val pp_chars : pad:int -> Format.formatter -> string list -> unit
 val pp_chars_raw : Format.formatter -> string list -> unit
 
 val is_code_writable : int list -> bool

Main/ace_common.ml

@@ -6,9 +6,9 @@ let treat_command fmt arm =
   let code = Name.preferred_code codes in
   let hex = Name.command_for_codes code in
   let chars = Name.codes_to_chars code in
-  Format.fprintf fmt "%a \t%a\t%a@."
-    Name.pp_chars chars
+  Format.fprintf fmt "0x%a   ;   %a   %a@."
     Arm_printer.pp_hex hex
+    (Name.pp_chars ~pad:4) chars
     Arm_printer.pp_arm arm ;
   (code, (hex, arm))
 
@@ -20,15 +20,15 @@ let compare_and_print_commands fmt data descr exit =
       Format.fprintf fmt "%a@." Arm_printer.pp_arm arm ;
       aux data descr is_exit (i+4)
     | (_, true)::data, (_, arm)::descr ->
-      Format.fprintf fmt "%a \t\t\t; (altered)@." Arm_printer.pp_arm arm ;
+      Format.fprintf fmt "%a\t\t\t; (altered)@." Arm_printer.pp_arm arm ;
       aux data descr is_exit (i+4)
     | _, [] when not is_exit && exit <> None ->
       let exit = Option.get exit in
       Format.fprintf fmt "; ======== EXIT CODE ========@." ;
       aux data (Exit.get_preferred_descr exit i |> snd) true i
     | (_, true)::_, [] -> assert false
     | (d, false)::data, _ ->
-      Format.fprintf fmt "%a \t\t\t; (filler)@." Arm_printer.pp_arm (Arm.Custom d) ;
+      Format.fprintf fmt "%a\t\t\t; (filler)@." Arm_printer.pp_arm (Arm.Custom d) ;
       aux data descr is_exit (i+4)
   in
   aux data descr false 0