Change indentation settings

 + Reindente source file accordingly

.ocp-indent

@@ -1,11 +1,11 @@
 JaneStreet
 base = 2
 type = 2
-in = 2
+in = 0
 with = 0
 match_clause = 2
 ppx_stritem_ext = 2
-max_indent = 3
+max_indent = 7
 strict_with = auto
 strict_else = always
 strict_comments = true

fix-indent.ml

@@ -49,8 +49,8 @@ let ignored =
   " (* The following code prevent strange filename to appear *)
   |> String.split ~on:' '
   |> List.filter_map ~f:(function
-     | "" | " " | "  " | "   " | "    " -> None
-     | path -> Some ("-e " ^ path ^ " "))
+         | "" | " " | "  " | "   " | "    " -> None
+         | path -> Some ("-e " ^ path ^ " "))
   |> String.concat
 ;;
 
@@ -70,11 +70,11 @@ let list_mlfiles path =
 (* Call ocp-indent for indentation *)
 let ocp_indent file =
   let args = "--inplace" in
-    String.concat [ "ocp-indent "; args; " "; file]
-    |> Sys.command
-    |> function
-    | 0 -> printf "File: '%s' ok\n" file
-    | error -> printf "Error with file: '%s'; code: %i\n%!" file error; exit 3
+  String.concat [ "ocp-indent "; args; " "; file]
+  |> Sys.command
+  |> function
+  | 0 -> printf "File: '%s' ok\n" file
+  | error -> printf "Error with file: '%s'; code: %i\n%!" file error; exit 3
 ;;
 
 let () =

src/add_command.ml

@@ -48,7 +48,7 @@ let new_list current_list position new_items =
                * # List.split_n l1 2;;
                * - : int list * int list = ([1; 2], [3; 4; 5; 6]) *)
     let l_begin,l_end = List.split_n current_list n in
-      List.concat [ l_begin ; new_items ; l_end ]
+    List.concat [ l_begin ; new_items ; l_end ]
 ;;
 
 
@@ -60,9 +60,9 @@ let run ~(rc:File_com.t) position =
   let cmd_list = In_channel.input_lines ~fix_win_eol:true In_channel.stdin in
   (* Create an updated rc file *)
   let updated_rc = { rc with Settings_t.progs = (new_list rc.Settings_t.progs position cmd_list)} in
-    File_com.write updated_rc;
-    (* Display the result *)
-    let reread_rc = File_com.init_rc () in
-      List_rc.run ~rc:reread_rc ()
+  File_com.write updated_rc;
+  (* Display the result *)
+  let reread_rc = File_com.init_rc () in
+  List_rc.run ~rc:reread_rc ()
 ;;
 

src/command_def.ml

@@ -48,46 +48,46 @@ type return_arg = {
 (* A set of default arguments, usable with most of the commands *)
 let shared_params =
   let open Param in
-    (* Way to treat common args *)
-    return (fun verbosity no_color rc_file_name handle_signal ->
-       (* Set the level of verbosity *)
-       Const.verbosity := verbosity;
-       (* Do not use color *)
-       Const.no_color := no_color;
-       (* Use given rc file, should run the nth argument if present *)
-       Const.rc_file := (Lazy.return rc_file_name);
-       (* Active signal handling *)
-       if handle_signal then
-         Signals.handle ();
+  (* Way to treat common args *)
+  return (fun verbosity no_color rc_file_name handle_signal ->
+         (* Set the level of verbosity *)
+         Const.verbosity := verbosity;
+         (* Do not use color *)
+         Const.no_color := no_color;
+         (* Use given rc file, should run the nth argument if present *)
+         Const.rc_file := (Lazy.return rc_file_name);
+         (* Active signal handling *)
+         if handle_signal then
+           Signals.handle ();
 
-       (* Debugging *)
-       Messages.debug (sprintf "Verbosity set to %i" !Const.verbosity);
-       Messages.debug (sprintf "Color %s" (match !Const.no_color with true -> "off" | false -> "on"));
-       Messages.debug (sprintf "Configuration file is %s" (Lazy.force !Const.rc_file));
-       Messages.debug (sprintf "Tmp file is %s" Const.tmp_file);
+         (* Debugging *)
+         Messages.debug (sprintf "Verbosity set to %i" !Const.verbosity);
+         Messages.debug (sprintf "Color %s" (match !Const.no_color with true -> "off" | false -> "on"));
+         Messages.debug (sprintf "Configuration file is %s" (Lazy.force !Const.rc_file));
+         Messages.debug (sprintf "Tmp file is %s" Const.tmp_file);
 
-       (* Obtain data from rc_file *)
-       let rc_content = File_com.init_rc () in
+         (* Obtain data from rc_file *)
+         let rc_content = File_com.init_rc () in
          { rc = rc_content } (* We use type for futur use *)
-     )
-    (* Flag to set verbosity level *)
-    <*> flag "-v" (optional_with_default !Const.verbosity int)
-          ~aliases:["--verbose" ; "-verbose"]
-          ~doc:"[n] Set verbosity level. \
-                The higher n is, the most verbose the program is."
-    (* Flag to set colors *)
-    <*> flag "--no-color" no_arg
-          ~aliases:["-no-color"]
-          ~doc:" Use this flag to disable color usage."
-    (* Flag to use different rc file *)
-    <*> flag "-c" (optional_with_default (Lazy.force !Const.rc_file) file)
-          ~aliases:["--rc" ; "-rc"]
-          ~doc:"file Read configuration from the given file and continue parsing."
-    (* Flag to handle signals *)
-    <*> flag "-s" no_arg
-          ~aliases:["--sinals" ; "-signals"]
-          ~doc:"Handle signals. Warning, this is not much tested and not \
-                implemented the best way."
+       )
+  (* Flag to set verbosity level *)
+  <*> flag "-v" (optional_with_default !Const.verbosity int)
+        ~aliases:["--verbose" ; "-verbose"]
+        ~doc:"[n] Set verbosity level. \
+              The higher n is, the most verbose the program is."
+  (* Flag to set colors *)
+  <*> flag "--no-color" no_arg
+        ~aliases:["-no-color"]
+        ~doc:" Use this flag to disable color usage."
+  (* Flag to use different rc file *)
+  <*> flag "-c" (optional_with_default (Lazy.force !Const.rc_file) file)
+        ~aliases:["--rc" ; "-rc"]
+        ~doc:"file Read configuration from the given file and continue parsing."
+  (* Flag to handle signals *)
+  <*> flag "-s" no_arg
+        ~aliases:["--sinals" ; "-signals"]
+        ~doc:"Handle signals. Warning, this is not much tested and not \
+              implemented the best way."
 ;;
 
 
@@ -215,7 +215,7 @@ let edit =
        let position = Option.value
                         ~default:(List.length (rc.Settings_t.progs) - 1) n
        in
-         Edit_command.run ~rc position)
+       Edit_command.run ~rc position)
 ;;
 
 (* To display informations about the licence *)
@@ -230,7 +230,7 @@ let licence =
     )
     (fun _ header () ->
        let cecill = not(header) in (* When cecill is false, it displays the header *)
-         Licencing.print ~cecill
+       Licencing.print ~cecill
     )
 ;;
 
@@ -258,13 +258,13 @@ let run ~version ~build_info () =
       default
       |> run ~version ~build_info
     in
-      match Sys.argv with
-      | [| _ |] -> Result.Ok (run_default ()) (* Program called with nothing *)
-      | _ -> (* Program followed by a number *)
-        Or_error.try_with (fun () ->
-           (* Verify the fist argument is a number, not a subcommand (string) *)
-           ignore (Int.of_string (Sys.argv.(1)));
-           run_default ())
+    match Sys.argv with
+    | [| _ |] -> Result.Ok (run_default ()) (* Program called with nothing *)
+    | _ -> (* Program followed by a number *)
+      Or_error.try_with (fun () ->
+             (* Verify the fist argument is a number, not a subcommand (string) *)
+             ignore (Int.of_string (Sys.argv.(1)));
+             run_default ())
   in
 
   (* Parsing with subcommands *)
@@ -290,8 +290,8 @@ let run ~version ~build_info () =
     match
       hack_parse ()
       |> (function
-           Result.Ok () -> ()
-         | Error _ -> parse_sub ())
+             Result.Ok () -> ()
+           | Error _ -> parse_sub ())
     with
     | () -> `Exit 0
     | exception message ->
@@ -300,9 +300,9 @@ let run ~version ~build_info () =
       `Exit 20
   in
 
-    (* Unlock, should be done before *)
-    Lock.(status ()
-          |> (function
+  (* Unlock, should be done before *)
+  Lock.(status ()
+        |> (function
                Locked ->
                Messages.warning "Removing lockfile, should be removed before. \
                                  It's a bug!"; remove ()
@@ -310,13 +310,13 @@ let run ~version ~build_info () =
              | Error -> Messages.warning "Error with lockfile"
            ));
 
-    (* Display total running time, pretty printing is handled by Time module *)
-    Messages.debug Time.(diff (now ()) start
-                         |> Span.to_string_hum (* Round the value, 3 digits *)
-                         |> sprintf "Duration: %s");
+  (* Display total running time, pretty printing is handled by Time module *)
+  Messages.debug Time.(diff (now ()) start
+                       |> Span.to_string_hum (* Round the value, 3 digits *)
+                       |> sprintf "Duration: %s");
 
-    (* Reset display *)
-    Messages.reset ();
+  (* Reset display *)
+  Messages.reset ();
 
-    exit_code
+  exit_code
 ;;

src/const.ml

@@ -50,9 +50,9 @@ let get_var ?(exp=false) ?default name =
     | true -> failwith (Lazy.force msg)
     | false -> print_endline (Lazy.force msg); ""
   in
-    (* Get the var *)
-    Sys.getenv name
-    |> (function
+  (* Get the var *)
+  Sys.getenv name
+  |> (function
        | Some x -> x
        | None ->
          match default with

src/default.ml

@@ -50,21 +50,21 @@ let run ~rc cmd_number =
   Messages.debug "Locked";
 
   let tmp = Tmp_file.init () in
-    match cmd_number with
-    | None -> begin
-        (* Execute each item (one by one) in config file *)
-        Exec_cmd.what_next ~tmp
-        |> function
-        | None -> (* If no command was found, all has been launched *)
-          Messages.ok "All has been launched!";
-          Messages.tips "You can reset with 'reset' subcommand";
-          Lock.remove ()
-        | Some cmd_to_exec -> Exec_cmd.execute cmd_to_exec;
-      end
-    | Some num -> begin
-        File_com.num_cmd2cmd ~rc num
-        |> function
-        | None -> Messages.warning "Your number is out of bound"
-        | Some cmd_to_exec -> Exec_cmd.execute cmd_to_exec;
-      end
+  match cmd_number with
+  | None -> begin
+      (* Execute each item (one by one) in config file *)
+      Exec_cmd.what_next ~tmp
+      |> function
+      | None -> (* If no command was found, all has been launched *)
+        Messages.ok "All has been launched!";
+        Messages.tips "You can reset with 'reset' subcommand";
+        Lock.remove ()
+      | Some cmd_to_exec -> Exec_cmd.execute cmd_to_exec;
+    end
+  | Some num -> begin
+      File_com.num_cmd2cmd ~rc num
+      |> function
+      | None -> Messages.warning "Your number is out of bound"
+      | Some cmd_to_exec -> Exec_cmd.execute cmd_to_exec;
+    end
 ;;

src/edit_command.ml

@@ -52,7 +52,7 @@ let new_list current_list position new_items =
    * # List.split_n l1 2;;
    * - : int list * int list = ([1; 2], [3; 4; 5; 6]) *)
   let l_begin,l_end = List.split_n current_list position in
-    List.concat [ l_begin ; new_items ; l_end ]
+  List.concat [ l_begin ; new_items ; l_end ]
 ;;
 
 
@@ -61,15 +61,15 @@ let new_list current_list position new_items =
  * If more than one "\nelt1\nelt2\nelt3\n" *)
 let gen_modification items =
   let r = "\n" in
-    epur items
-    |> (function
+  epur items
+  |> (function
        | [] -> ""
        (* Only one element *)
        | element :: [] -> element
        (* The list as more than two elements *)
        | items ->
          let msg = String.concat ~sep:r items in
-           String.concat [ r ; msg ; r ])
+         String.concat [ r ; msg ; r ])
 ;;
 
 (* Function which get the nth element, put it in a file, let the user edit it,
@@ -89,43 +89,43 @@ let rec run ~(rc:File_com.t) position =
   let original_command,shorter_list =
     Remove_command.remove current_list position
   in
-    Out_channel.write_all tmp_edit original_command;
+  Out_channel.write_all tmp_edit original_command;
 
 
-    (* Edit file *)
-    let edit = String.concat [ Lazy.force Const.editor ; " " ; tmp_edit ] in
-      Messages.debug edit;
-      Sys.command edit
-      |> (function
-           0 -> ()
-         | n -> sprintf "Error while running %s: error code %i" edit n
-                |> Messages.warning);
+  (* Edit file *)
+  let edit = String.concat [ Lazy.force Const.editor ; " " ; tmp_edit ] in
+  Messages.debug edit;
+  Sys.command edit
+  |> (function
+         0 -> ()
+       | n -> sprintf "Error while running %s: error code %i" edit n
+              |> Messages.warning);
 
-      (* Reading and applying the result *)
-      let new_commands = In_channel.read_lines tmp_edit |> epur in
-      let cmd_list = new_list shorter_list position new_commands in
-      let updated_rc = { rc with Settings_t.progs = cmd_list} in
-        File_com.write updated_rc;
-        (* Display the result, only if modified *)
-        let new_cmd_mod = gen_modification new_commands in
-          (* We are doing things in this order to avoid multiple listing of rc file
-           * when reediting. *)
-          if ( original_command = new_cmd_mod )
-          then (* Nothing change, try reediting *)
-            begin
-              let open Messages in
-                warning "Nothing changed.";
-                confirm "Do you want to reedit?"
-                |> function
-                | Yes -> run ~rc position
-                | No -> ()
-            end
+  (* Reading and applying the result *)
+  let new_commands = In_channel.read_lines tmp_edit |> epur in
+  let cmd_list = new_list shorter_list position new_commands in
+  let updated_rc = { rc with Settings_t.progs = cmd_list} in
+  File_com.write updated_rc;
+  (* Display the result, only if modified *)
+  let new_cmd_mod = gen_modification new_commands in
+  (* We are doing things in this order to avoid multiple listing of rc file
+   * when reediting. *)
+  if ( original_command = new_cmd_mod )
+  then (* Nothing change, try reediting *)
+    begin
+      let open Messages in
+      warning "Nothing changed.";
+      confirm "Do you want to reedit?"
+      |> function
+      | Yes -> run ~rc position
+      | No -> ()
+    end
 
-          else (* Display summary of changes *)
-            begin
-              sprintf "'%s' -> '%s'\n" original_command new_cmd_mod |> Messages.ok;
-              (* Display new rc file *)
-              let reread_rc = File_com.init_rc () in
-                List_rc.run ~rc:reread_rc ()
-            end;
+  else (* Display summary of changes *)
+    begin
+      sprintf "'%s' -> '%s'\n" original_command new_cmd_mod |> Messages.ok;
+      (* Display new rc file *)
+      let reread_rc = File_com.init_rc () in
+      List_rc.run ~rc:reread_rc ()
+    end;
 ;;

src/exec_cmd.ml

@@ -51,12 +51,12 @@ let less_launched (log : (string * int) list) =
   let max = Const.default_launch in (* Number of launch, maximum *)
   (* Return smallest, n is the smaller key *)
   let entries_by_number = List.Assoc.inverse log  in
-    List.min_elt ~cmp:(fun (n,_) (n',_) -> Int.compare n n') entries_by_number
-    |> (function Some (min,cmd) ->
+  List.min_elt ~cmp:(fun (n,_) (n',_) -> Int.compare n n') entries_by_number
+  |> (function Some (min,cmd) ->
        if min < max
        then Some cmd
        else None
-               | None -> None)
+             | None -> None)
 ;;
 
 (* Function to get the number corresponding to the next command to launch (less
@@ -69,9 +69,9 @@ let less_launched_num log =
   (* Function to return nothing (None) when max launch number is reached, Some
    * number otherwise *)
   |> List.filter_mapi ~f:(fun entry_number ( _, launch_number ) ->
-     if launch_number >= Const.default_launch
-     then None
-     else Some ( entry_number, launch_number ))
+         if launch_number >= Const.default_launch
+         then None
+         else Some ( entry_number, launch_number ))
   (* Find the less launched by sorting and taking the first *)
   |> List.sort ~cmp:(fun ( _, launch_number1 ) ( _, launch_number2 ) -> Int.compare launch_number1 launch_number2)
   |> List.hd

src/file_com.ml

@@ -49,7 +49,7 @@ let write (rc_file:t) =
    * newlines) *)
   let data = (Unify.prettify rc_file |> Settings_j.string_of_rc_file
               |> Yojson.Basic.prettify ~std:true) in
-    Out_channel.write_all (Lazy.force name) ~data
+  Out_channel.write_all (Lazy.force name) ~data
 ;;
 
 (* Return the configuration file template *)
@@ -70,23 +70,23 @@ let create_rc_file ~name =
   let compact_rc_file = Settings_j.string_of_rc_file (rc_template () ()) in
   let readable_rc_file = Yojson.Basic.prettify compact_rc_file in (* Create human readable string for rc file *)
   let out_file = Out_channel.create name in
-    Out_channel.output_string out_file readable_rc_file;
-    Out_channel.close out_file
+  Out_channel.output_string out_file readable_rc_file;
+  Out_channel.close out_file
 ;;
 
 (* Function to read the rc file *)
 let rec init_rc ?(rc=(!Const.rc_file)) () =
   let rc' = Lazy.force rc in
-    (* Verify that file exist *)
-    match (Sys.file_exists rc') with
-    | `No -> create_rc_file ~name:rc'; init_rc ~rc ();
-    | `Unknown -> failwith "Error reading configuration file";
-    | `Yes -> (* Try to read, if there is an error, reset file *)
-      try
-        In_channel.read_all rc' |> Settings_j.rc_file_of_string
-      with
-      | Yojson.Json_error _ -> (* Invalid file, delete, so that it will be reseted
-                                  on next call *) Sys.remove rc'; init_rc ~rc ()
+  (* Verify that file exist *)
+  match (Sys.file_exists rc') with
+  | `No -> create_rc_file ~name:rc'; init_rc ~rc ();
+  | `Unknown -> failwith "Error reading configuration file";
+  | `Yes -> (* Try to read, if there is an error, reset file *)
+    try
+      In_channel.read_all rc' |> Settings_j.rc_file_of_string
+    with
+    | Yojson.Json_error _ -> (* Invalid file, delete, so that it will be reseted
+                                on next call *) Sys.remove rc'; init_rc ~rc ()
 ;;
 
 (* Get the command corresponding to a number *)

src/licencing.ml

@@ -1206,31 +1206,31 @@ let print ~cecill =
 
       (* Spying expression *)
       |> (fun str ->
-         Option.value ~default:"" str |> Messages.debug;
-         str)
+           Option.value ~default:"" str |> Messages.debug;
+           str)
 
       |> (function
-         | Some "en" | Some "En" | Some "EN" -> `En
-         | Some "fr" | Some "Fr" | Some "FR"-> `Fr
-         | None | Some _ -> Messages.warning "Please enter 'Fr' or 'En'"; def_lang ()
-       ))
+           | Some "en" | Some "En" | Some "EN" -> `En
+           | Some "fr" | Some "Fr" | Some "FR"-> `Fr
+           | None | Some _ -> Messages.warning "Please enter 'Fr' or 'En'"; def_lang ()
+         ))
   in
 
-    Messages.info "Choose your language 'Fr' or 'En': ";
-    (* XXX Be sure to show the message *)
-    Out_channel.(flush stdout);
-
-    let ( warn, licence ) =
-      def_lang ()
-      |> function
-      | `En -> ( en_header, en_licence )
-      | `Fr -> ( fr_header, fr_licence )
-    in
-      begin
-        match cecill with
-        | false -> Messages.debug "Choosing warn"; warn
-        | true -> Messages.debug "Choosing licence"; licence
-      end
-      |> print_endline (* XXX Using print_endline to ensure we can't avoid printing
-                          with verbosity parameter *)
+  Messages.info "Choose your language 'Fr' or 'En': ";
+  (* XXX Be sure to show the message *)
+  Out_channel.(flush stdout);
+
+  let ( warn, licence ) =
+    def_lang ()
+    |> function
+    | `En -> ( en_header, en_licence )
+    | `Fr -> ( fr_header, fr_licence )
+  in
+  begin
+    match cecill with
+    | false -> Messages.debug "Choosing warn"; warn
+    | true -> Messages.debug "Choosing licence"; licence
+  end
+  |> print_endline (* XXX Using print_endline to ensure we can't avoid printing
+                      with verbosity parameter *)
 ;;

src/list_rc.ml

@@ -52,18 +52,18 @@ let run ?rc () =
                  |> List.mapi ~f:(fun i item -> ( item, i ))
   in
   let tmp : Tmp_file.t = Tmp_file.init () in
-    Tmp_file.get_accurate_log ~tmp ()
-    (* Generate list to feed the table,
-     * XXX assuming all will be in the right order *)
-    |> List.map ~f:(function
-         ( cmd, number ) ->
-         [ (* Number of a command in rc file, command, number of launch *)
-           (List.Assoc.find_exn rc_numbered cmd |> Int.to_string);
-           cmd;
-           (Int.to_string number)
-         ])
-    |> Textutils.Ascii_table.simple_list_table
-         ~display:Textutils.Ascii_table.Display.column_titles
-         [ "Id" ; "Command" ; "Number of launch" ]
+  Tmp_file.get_accurate_log ~tmp ()
+  (* Generate list to feed the table,
+   * XXX assuming all will be in the right order *)
+  |> List.map ~f:(function
+           ( cmd, number ) ->
+           [ (* Number of a command in rc file, command, number of launch *)
+             (List.Assoc.find_exn rc_numbered cmd |> Int.to_string);
+             cmd;
+             (Int.to_string number)
+           ])
+  |> Textutils.Ascii_table.simple_list_table
+       ~display:Textutils.Ascii_table.Display.column_titles
+       [ "Id" ; "Command" ; "Number of launch" ]
 ;;
 

src/lock.ml

@@ -87,8 +87,8 @@ let wait ?(until=10) ?(delay=1) () =
     | Free -> Some (lock ())
     | Error -> failwith "Problem with lock file"
   in
-    wait_loop 0
-    |> (function
+  wait_loop 0
+  |> (function
          None ->
          Messages.warning "Removing lock file, ran out of patience";
          remove ();

src/messages.ml

@@ -73,29 +73,29 @@ type style =
 let print ~color ~style message =
   (* Alias *)
   let cpcolor = Color_print.color in
-    match !Const.no_color with
-    | true -> printf "%s" message
-    | false -> begin (* Use colors *)
-        (* Log that we used colored messages *)
-        log_already ();
-        (* This code create proper escapement to display text with bold/color... *)
-        color |>
-        (function
-          | Green -> cpcolor ~color:`Green message
-          | Red -> cpcolor ~color:`Red message
-          | Yellow -> cpcolor ~color:`Yellow message
-          | White -> cpcolor ~color:`White message
-          | Plum -> cpcolor ~color:`Plum message
-          | Cyan -> cpcolor ~color:`Cyan message
-        ) |> (* Finaly print escaped string *)
-        (fun colored_msg ->
-           let open Color_print in
-             match style with
-             | Bold -> bold_printf "%s" colored_msg
-             | Underline -> underline_printf "%s" colored_msg
-             | Normal -> printf "%s" colored_msg
-        )
-      end
+  match !Const.no_color with
+  | true -> printf "%s" message
+  | false -> begin (* Use colors *)
+      (* Log that we used colored messages *)
+      log_already ();
+      (* This code create proper escapement to display text with bold/color... *)
+      color |>
+      (function
+        | Green -> cpcolor ~color:`Green message
+        | Red -> cpcolor ~color:`Red message
+        | Yellow -> cpcolor ~color:`Yellow message
+        | White -> cpcolor ~color:`White message
+        | Plum -> cpcolor ~color:`Plum message
+        | Cyan -> cpcolor ~color:`Cyan message
+      ) |> (* Finaly print escaped string *)
+      (fun colored_msg ->
+         let open Color_print in
+         match style with
+         | Bold -> bold_printf "%s" colored_msg
+         | Underline -> underline_printf "%s" colored_msg
+         | Normal -> printf "%s" colored_msg
+      )
+    end
 ;;
 
 (* Behave in a conform way to verbosity
@@ -112,23 +112,23 @@ let check_verbosity ~f function_number =
 (* Print debugging, information, important... messages *)
 let debug message =
   check_verbosity ~f:(fun () ->
-     let mess = (Time.now() |> Time.to_string) ^ " " ^ message ^ "\n" in
-       print ~color:Plum ~style:Underline mess
-   ) 5
+         let mess = (Time.now() |> Time.to_string) ^ " " ^ message ^ "\n" in
+         print ~color:Plum ~style:Underline mess
+       ) 5
 ;;
 
 let info message =
   check_verbosity ~f:(fun () ->
-     let mess = message ^ "\n" in
-       print ~color:White ~style:Normal mess
-   ) 3
+         let mess = message ^ "\n" in
+         print ~color:White ~style:Normal mess
+       ) 3
 ;;
 
 let warning message =
   check_verbosity ~f:(fun () ->
-     let mess = message ^ "\n" in
-       print ~color:Red ~style:Bold mess
-   ) 1
+         let mess = message ^ "\n" in
+         print ~color:Red ~style:Bold mess
+       ) 1
 ;;
 
 (* Type for the answers *)
@@ -155,40 +155,40 @@ let check_assume_yes ~f =
  * test it (display, line return, etc...) *)
 let rec confirm info =
   check_assume_yes ~f:(fun () ->
-     print ~color:Cyan ~style:Normal info;
-     print ~color:Cyan ~style:Normal "\n(Yes/No): ";
-     (* XXX Be sure to show the message *)
-     Out_channel.(flush stdout);
-     let str_answer = In_channel.(input_line ~fix_win_eol:true stdin) in
-       str_answer |> (function
-          | Some "Y" | Some "y" | Some "Yes" | Some "YES" | Some "yes" -> Yes
-          | Some "N" | Some "n" | Some "No" | Some "NO" | Some "no" -> No
-          | Some _ | None ->
-            warning "Please enter 'yes' or 'no' or 'y' or 'n'.";
-            confirm info)
-   )
+         print ~color:Cyan ~style:Normal info;
+         print ~color:Cyan ~style:Normal "\n(Yes/No): ";
+         (* XXX Be sure to show the message *)
+         Out_channel.(flush stdout);
+         let str_answer = In_channel.(input_line ~fix_win_eol:true stdin) in
+         str_answer |> (function
+                | Some "Y" | Some "y" | Some "Yes" | Some "YES" | Some "yes" -> Yes
+                | Some "N" | Some "n" | Some "No" | Some "NO" | Some "no" -> No
+                | Some _ | None ->
+                  warning "Please enter 'yes' or 'no' or 'y' or 'n'.";
+                  confirm info)
+       )
 ;;
 
 let ok message =
   check_verbosity ~f:(fun () ->
-     let mess = message ^ "\n" in
-       print ~color:Green ~style:Bold mess
-   ) 2
+         let mess = message ^ "\n" in
+         print ~color:Green ~style:Bold mess
+       ) 2
 ;;
 
 let tips message =
   check_verbosity ~f:(fun () ->
-     let mess = message ^ "\n" in
-       print ~color:Yellow ~style:Normal mess
-   ) 4
+         let mess = message ^ "\n" in
+         print ~color:Yellow ~style:Normal mess
+       ) 4
 ;;
 
 
 (* Reset printing, to avoid color problem on some terminal (Konsole), the  *)
 let reset () =
   let open Color_print in
-    match !already with
-    | true -> debug "Reseted colors";
-      normal "" |> printf "%s\n"
-    | false -> debug "Not resetted"; ()
+  match !already with
+  | true -> debug "Reseted colors";
+    normal "" |> printf "%s\n"
+  | false -> debug "Not resetted"; ()
 ;;

src/remove_command.ml

@@ -44,18 +44,18 @@ let remove current_list n =
   let removed = ref "" in
   (* The list without the nth item *)
   let new_list = List.filteri current_list ~f:(fun i _ ->
-     if i <> n then
-       (* If it is not nth, return true *)
-       true
-     else
-       begin
-         (* If it is nth, ie the command to be removed, store it and return
-          * false, to remove the corresponding item *)
-         removed := List.nth_exn current_list i;
-         false
-       end
-   ) in
-    ( !removed, new_list )
+         if i <> n then
+           (* If it is not nth, return true *)
+           true
+         else
+           begin
+             (* If it is nth, ie the command to be removed, store it and return
+              * false, to remove the corresponding item *)
+             removed := List.nth_exn current_list i;
+             false
+           end
+       ) in
+  ( !removed, new_list )
 ;;
 
 (* Function which add the commands (one per line) ridden on stdin to the rc
@@ -68,12 +68,12 @@ let run ~(rc:File_com.t) n_to_remove =
               ~default:((List.length actual_list) - 1) in
   (* Remove the nth command, after display it *)
   let removed,new_list = remove actual_list nth in
-    sprintf "Removing: %s\n" removed
-    |> Messages.warning;
-    (* Write new list to rc file *)
-    let updated_rc = { rc with Settings_t.progs = new_list } in
-      File_com.write updated_rc;
-      (* Display the result *)
-      let reread_rc = File_com.init_rc () in
-        List_rc.run ~rc:reread_rc ()
+  sprintf "Removing: %s\n" removed
+  |> Messages.warning;
+  (* Write new list to rc file *)
+  let updated_rc = { rc with Settings_t.progs = new_list } in
+  File_com.write updated_rc;
+  (* Display the result *)
+  let reread_rc = File_com.init_rc () in
+  List_rc.run ~rc:reread_rc ()
 ;;

src/signals.ml

@@ -53,11 +53,11 @@ let handle_sigint () =
              )
   in
   let open Signal in
-    Expert.handle int (fun signal ->
-       if signal = int
-       then
-         launch_next ()
-       else ())
+  Expert.handle int (fun signal ->
+         if signal = int
+         then
+           launch_next ()
+         else ())
 ;;
 
 (* Called from external to activate signal handling *)

src/state.ml

@@ -48,16 +48,16 @@ let print_current ~rc () =
        ~default:"Nothing next"
        ~f:(fun ( num : int ) ->
 
-          (* XXX Debug *)
-          sprintf "Num: %i" num |> Messages.debug;
+            (* XXX Debug *)
+            sprintf "Num: %i" num |> Messages.debug;
 
-          File_com.num_cmd2cmd ~rc num
-          |> (function
-             | Some cmd -> cmd
-             | None -> Messages.warning "Error, should not append, this is a bug";
-               assert false)
-          |> (fun ( cmd : string ) ->
-             Messages.debug cmd; (* TODO Use tools.spy1 *)
-             sprintf "Next: command %i, '%s'" num cmd))
+            File_com.num_cmd2cmd ~rc num
+            |> (function
+                 | Some cmd -> cmd
+                 | None -> Messages.warning "Error, should not append, this is a bug";
+                   assert false)
+            |> (fun ( cmd : string ) ->
+                 Messages.debug cmd; (* TODO Use tools.spy1 *)
+                 sprintf "Next: command %i, '%s'" num cmd))
   |> Messages.ok
 ;;

src/test/ec_t.ml

@@ -42,20 +42,20 @@ open Core.Std;;
 let epur () =
   let current = Edit_command.epur [ "qw" ; "" ; "erty" ; "a" ; "" ; "zerty"] in
   let expected = [ "qw" ; "erty" ; "a" ; "zerty" ] in
-    OUnit.assert_equal current expected
+  OUnit.assert_equal current expected
 ;;
 
 (* Function gen_modification *)
 let gm1 () =
   let current = Edit_command.gen_modification [ "qw" ] in
   let expected = "qw" in
-    OUnit.assert_equal current expected
+  OUnit.assert_equal current expected
 ;;
 
 let gm2 () =
   let current = Edit_command.gen_modification [ "qw" ; "erty" ; "a" ; "zerty"] in
   let expected = "\nqw\nerty\na\nzerty\n" in
-    OUnit.assert_equal current expected
+  OUnit.assert_equal current expected
 ;;
 
 let n_l =

src/test/edit_t.ml

@@ -41,7 +41,7 @@ open Core.Std;;
 (* Function epur ============================= *)
 let epur test solution () =
   let actual = Edit_command.epur test in
-    OUnit.assert_equal actual solution
+  OUnit.assert_equal actual solution
 ;;
 
 (* Data for above test *)
@@ -65,7 +65,7 @@ let llt_l =
 (* Function new_list ========================= *)
 let n_list ( current_list, position, new_items ) solution () =
   let actual = Edit_command.new_list current_list position new_items in
-    OUnit.assert_equal actual solution
+  OUnit.assert_equal actual solution
 ;;
 
 (* Data for above test *)
@@ -96,7 +96,7 @@ let big =
          ((List.nth_exn li pos) = -2) &&
          ((List.nth_exn li (succ pos)) = -1)
        in
-         OUnit.assert_bool "My test" (conformity actual)
+       OUnit.assert_bool "My test" (conformity actual)
     )
   )
 ;;
@@ -110,7 +110,7 @@ let lt_l =
 (* Function gen_modification ================ *)
 let gen_mod test solution () =
   let actual = Edit_command.gen_modification test in
-    OUnit.assert_equal actual solution
+  OUnit.assert_equal actual solution
 ;;
 
 (* Data for above test *)

src/test/exec_t.ml

@@ -41,13 +41,13 @@ open Core.Std;;
 (* Function less_launched *)
 let less_launched test solution () =
   let actual = Exec_cmd.less_launched test in
-    OUnit.assert_equal actual solution
+  OUnit.assert_equal actual solution
 ;;
 
 (* Function less_launched_num *)
 let less_launched_num test solution () =
   let actual = Exec_cmd.less_launched_num test in
-    OUnit.assert_equal actual solution
+  OUnit.assert_equal actual solution
 ;;
 
 (* Maximum number of launch *)
@@ -75,7 +75,7 @@ let common_data =
 (* Add expected result to corresponding to the data provided common set *)
 let add_solutions data expected =
   List.map2_exn data expected ~f:(fun ( log, name ) solution ->
-     ( log, solution, name ))
+         ( log, solution, name ))
 ;;
 
 (* Data customized for the tests *)
@@ -112,16 +112,16 @@ let llt_l =
   let less_launched_suit =
     List.map ll_data ~f:(fun (t, s, name) -> ( (less_launched t s), name))
   in
-    less_launched_suit
-    |> List.map ~f:(fun ( f,name ) -> (name, `Quick, f))
+  less_launched_suit
+  |> List.map ~f:(fun ( f,name ) -> (name, `Quick, f))
 ;;
 
 let llt_l2 =
   let less_launched_num_suit =
     List.map ll_data2 ~f:(fun (t, s, name) -> ( (less_launched_num t s), name))
   in
-    less_launched_num_suit
-    |> List.map ~f:(fun ( f,name ) -> (name, `Quick, f))
+  less_launched_num_suit
+  |> List.map ~f:(fun ( f,name ) -> (name, `Quick, f))
 ;;
 
 (* To be used in test.ml *)

src/test/unify_t.ml

@@ -41,7 +41,7 @@ open Core.Std;;
 (* Function make_uniq ============================= *)
 let make_uniq test solution () =
   let actual = Unify.make_uniq test in
-    OUnit.assert_equal actual solution
+  OUnit.assert_equal actual solution
 ;;
 
 (* Big and sometimes strange list, to be used in test data set.
@@ -51,13 +51,13 @@ let make_uniq test solution () =
 let big_unique length = (* Long list of unique elements *)
   let message = "unique element" in
   let test_case = List.init ~f:(fun i -> Int.to_string i) length in
-    ( test_case, test_case, message )
+  ( test_case, test_case, message )
 ;;
 let big_same length = (* Long list of unique elements *)
   let message = "all the same element" in
   let same_element = "cmd1" in
   let test_case = List.init ~f:(fun i -> same_element) length in
-    ( test_case, [ same_element ], message )
+  ( test_case, [ same_element ], message )
 ;;
 let big_periodic length = (* Long list of unique elements *)
   let message = "periodically the same element" in
@@ -66,19 +66,19 @@ let big_periodic length = (* Long list of unique elements *)
   let dbl = length + 42 |> Int.to_string in
   let sol = ref [] in
   let test_case = List.init ~f:(fun i ->
-     if i mod periode = 0
-     then dbl
-     else Int.to_string i
-          (* Keep for the solution *)
-          |> (fun t -> sol := t :: !sol; t)) length
+         if i mod periode = 0
+         then dbl
+         else Int.to_string i
+              (* Keep for the solution *)
+              |> (fun t -> sol := t :: !sol; t)) length
   in
-    ( test_case, dbl :: !sol, message )
+  ( test_case, dbl :: !sol, message )
 ;;
 let big_long_entry length = (* Long list of unique elements *)
   let message = "long unique element" in
   let test_case = List.init ~f:(fun i -> "Longer entries, numbered thouth. This one is number \
                                           is: " ^ (Int.to_string i)) length in
-    ( test_case, test_case, message )
+  ( test_case, test_case, message )
 ;;
 (* Function packing the preceding *)
 let big_pack ~message length =

src/tmp_file.ml

@@ -44,7 +44,7 @@ let write (tmp_file:t) =
   (* Short name *)
   let name = Const.tmp_file in
   let biniou_tmp = Tmp_biniou_b.string_of_tmp_file tmp_file in
-    Out_channel.write_all name ~data:biniou_tmp
+  Out_channel.write_all name ~data:biniou_tmp
 ;;
 
 (* XXX Using and keyword because each function can call each other *)
@@ -54,18 +54,18 @@ let rec read () =
   let name = Const.tmp_file in
   (* Get the string corresponding to the file *)
   let file_content = In_channel.read_all name in
-    try
-      Tmp_biniou_b.tmp_file_of_string file_content
-    (* In previous version, the JSON format was used, otherwise the file can
-     * have a bad format. In this case, the Ag_ob_run.Error("Read error (1)")
-     * exeption is throw. We catch it here *)
-    with _ ->
-      (* If file is not in the right format, delete it and create a new one.
-       * Then, read it *)
-      Messages.ok "Reinitialises tmp file\n";
-      Sys.remove name;
-      create_tmp_file ();
-      read ()
+  try
+    Tmp_biniou_b.tmp_file_of_string file_content
+  (* In previous version, the JSON format was used, otherwise the file can
+   * have a bad format. In this case, the Ag_ob_run.Error("Read error (1)")
+   * exeption is throw. We catch it here *)
+  with _ ->
+    (* If file is not in the right format, delete it and create a new one.
+     * Then, read it *)
+    Messages.ok "Reinitialises tmp file\n";
+    Sys.remove name;
+    create_tmp_file ();
+    read ()
 
 (* Function to create the tmp file *)
 and create_tmp_file () =
@@ -79,21 +79,21 @@ and create_tmp_file () =
 let rec init () =
   (* If file do not exists, create it *)
   let file_exists = Sys.file_exists Const.tmp_file in
-    match file_exists with
-    | `No -> create_tmp_file ();
+  match file_exists with
+  | `No -> create_tmp_file ();
+    init ()
+  | `Unknown -> begin
+      Sys.remove Const.tmp_file;
       init ()
-    | `Unknown -> begin
-        Sys.remove Const.tmp_file;
-        init ()
-      end
-    | `Yes -> read ()
+    end
+  | `Yes -> read ()
 ;;
 
 (* Get a log of values from the tmp file, like this
  * (cmd,number of launch) list *)
 let get_log ~rc_tmp =
   List.map ~f:(fun { Tmp_biniou_t.commands = (cmd,number) } ->
-     (cmd,number)) rc_tmp
+         (cmd,number)) rc_tmp
 ;;
 
 (* Verify that the value exist *)
@@ -125,9 +125,9 @@ let log ~cmd ?(func= (+) 1 ) () =
     let open List.Assoc in
     (* Only number of launch associated with commands *)
     let l = get_log ~rc_tmp:li in
-      find l cmd
-      |> (function None -> add l cmd Const.default_launch | Some n -> add l cmd (func n))
-      |> List.map ~f:(fun e -> { Tmp_biniou_t.commands = e})
+    find l cmd
+    |> (function None -> add l cmd Const.default_launch | Some n -> add l cmd (func n))
+    |> List.map ~f:(fun e -> { Tmp_biniou_t.commands = e})
   in
   (* Write the file with the new value *)
   let updated_li =
@@ -135,8 +135,8 @@ let log ~cmd ?(func= (+) 1 ) () =
     |> Option.value ~default:[]
     |> new_li
   in
-    write Tmp_biniou_t.{ file with rc = List.Assoc.add file.rc name
-                                          updated_li }
+  write Tmp_biniou_t.{ file with rc = List.Assoc.add file.rc name
+                                        updated_li }
 ;;
 
 (* Return current number *)
@@ -159,10 +159,10 @@ let get_accurate_log ?rc_name ~tmp () =
   let rc_in_tmp = get_log ~rc_tmp:(Assoc.find tmp.Tmp_biniou_t.rc name
                                    |> Option.value ~default:[])
   in
-    map rc.Settings_t.progs ~f:(fun key ->
-       Assoc.find rc_in_tmp key
-       |> Option.value ~default:0
-       |> (function number -> (key,number)))
+  map rc.Settings_t.progs ~f:(fun key ->
+         Assoc.find rc_in_tmp key
+         |> Option.value ~default:0
+         |> (function number -> (key,number)))
 ;;
 
 (* Reset number of launch for a given command
@@ -185,16 +185,16 @@ let reset_cmd ~rc num cmd =
 
   (* Current number of launch for that cmd *)
   let i = List.Assoc.find_exn ac_log cmd_str in
-    sprintf  "Last N for command '%s' was %i"
-      cmd_str
-      i
-    |> Messages.info;
-    sprintf  "Restore with 'oclaunch reset %i %i'" i cmd
-    |> Messages.tips;
-
-    (* Do the work, set the number *)
-    log ~func:(fun _ -> num) ~cmd:cmd_str ();
-    sprintf "Reseted command '%s' to %i successfully" cmd_str num |> Messages.ok
+  sprintf  "Last N for command '%s' was %i"
+    cmd_str
+    i
+  |> Messages.info;
+  sprintf  "Restore with 'oclaunch reset %i %i'" i cmd
+  |> Messages.tips;
+
+  (* Do the work, set the number *)
+  log ~func:(fun _ -> num) ~cmd:cmd_str ();
+  sprintf "Reseted command '%s' to %i successfully" cmd_str num |> Messages.ok
 ;;
 
 (* Reset all commands to a number
@@ -206,9 +206,9 @@ let reset2num ~rc num =
 
   let ac_log = get_accurate_log ~tmp:(init ()) () in
 
-    (* Erase number of launch for each command *)
-    List.iter ac_log ~f:(fun ( cmd, _ ) ->
-       log ~func:(fun _ -> num) ~cmd ())
+  (* Erase number of launch for each command *)
+  List.iter ac_log ~f:(fun ( cmd, _ ) ->
+         log ~func:(fun _ -> num) ~cmd ())
 ;;
 
 (* Reset all command *)
@@ -219,14 +219,14 @@ let reset_all () =
     let tmp = init () in
     (* Get rc_file name *)
     let name = Lazy.force !Const.rc_file in
-      write Tmp_biniou_t.{ tmp with rc = List.Assoc.add tmp.rc name [] }
+    write Tmp_biniou_t.{ tmp with rc = List.Assoc.add tmp.rc name [] }
   in
-    Messages.debug "Asking question";
-    Messages.confirm "You will lose number of launch for every command.\
-                      Are you sure?"
-    |> (fun answer -> sprintf "Answer %s" (Messages.answer2str answer) |> Messages.debug; answer) (* Spy *)
-    |> function
-      Messages.Yes -> reset_without_ask ()
-    | Messages.No -> ()
+  Messages.debug "Asking question";
+  Messages.confirm "You will lose number of launch for every command.\
+                    Are you sure?"
+  |> (fun answer -> sprintf "Answer %s" (Messages.answer2str answer) |> Messages.debug; answer) (* Spy *)
+  |> function
+    Messages.Yes -> reset_without_ask ()
+  | Messages.No -> ()
 ;;
 

src/tools.ml

@@ -55,10 +55,10 @@ let spy1_int i =
 ;;
 let spy1_int_option io =
   let i = io |> (function
-       None -> "None"
-     | Some i -> sprintf "Some %i" i)
+           None -> "None"
+         | Some i -> sprintf "Some %i" i)
   in
-    spy io i
+  spy io i
 ;;
 let spy1_string str =
   spy str str
@@ -69,19 +69,19 @@ let spy1_float f =
 ;;
 let spy1_list ~f list =
   let list_str = List.map list ~f:(fun element ->
-     sprintf "\"%s\"; " (f element))
+         sprintf "\"%s\"; " (f element))
   in
-    "[ " ^ (String.concat list_str) ^ " ]"
-    |> printing;
-    list
+  "[ " ^ (String.concat list_str) ^ " ]"
+  |> printing;
+  list
 ;;
 let spy1_log (log : (string * int) list) =
   let log_str = List.map log ~f:(fun (s, i) ->
-     sprintf "( \"%s\", %i ); " s i)
+         sprintf "( \"%s\", %i ); " s i)
   in
-    "[ " ^ (String.concat log_str) ^ " ]"
-    |> printing;
-    log
+  "[ " ^ (String.concat log_str) ^ " ]"
+  |> printing;
+  log
 ;;
 let spy1_rc rc =
   failwith "Not implemented"

src/unify.ml

@@ -47,12 +47,12 @@ open Core.Std;;
  * internally *)
 let make_uniq dubbled_entries =
   let seen = ref [] in (* Entries already added *)
-    List.(filter dubbled_entries ~f:(fun entry ->
-       (exists !seen ~f:(fun in_seen -> in_seen = entry)) |> function
-       | false -> (* Entry not already seen, keep it *)
-         seen := (entry :: !seen); true
-       (* Already kept, discard *)
-       | true -> false))
+  List.(filter dubbled_entries ~f:(fun entry ->
+         (exists !seen ~f:(fun in_seen -> in_seen = entry)) |> function
+         | false -> (* Entry not already seen, keep it *)
+           seen := (entry :: !seen); true
+         (* Already kept, discard *)
+         | true -> false))
 ;;
 
 (* Remove doubled or void entries in a list. Commands are cleanup (removing
@@ -63,23 +63,23 @@ let prettify_cmd cmds =
     (* Removing line return, and trailing spaces, at the end or
        at the start of a command *)
     List.filter_map cmds ~f:(fun str ->
-       trim str |> function
-       | "" ->
-         Messages.debug "Trimmed command";
-         None
-       | s -> Some s)
+           trim str |> function
+           | "" ->
+             Messages.debug "Trimmed command";
+             None
+           | s -> Some s)
   in
 
   (* Remove doubled entries *)
   let unified_rc = make_uniq without_lr in
 
-    (* Display whether duplicates were found *)
-    if List.(length unified_rc = length without_lr) then
-      Messages.debug "No duplicate found"
-    else
-      Messages.debug "Duplicate found, removed";
+  (* Display whether duplicates were found *)
+  if List.(length unified_rc = length without_lr) then
+    Messages.debug "No duplicate found"
+  else
+    Messages.debug "Duplicate found, removed";
 
-    unified_rc
+  unified_rc
 ;;
 
 (* Removing doubled entries (cmds). We need to remove carriage return before
@@ -88,7 +88,7 @@ let prettify_cmd cmds =
 let prettify rc_file =
   let cmds = rc_file.Settings_v.progs in
   let unique = prettify_cmd cmds in
-    (* Store the deduplicated list in new rc_file *)
-    {rc_file with Settings_v.progs = unique}
+  (* Store the deduplicated list in new rc_file *)
+  {rc_file with Settings_v.progs = unique}
 ;;