Parcourir la source

Removed autoendline at end of messages and adapt

Leo il y a 10 ans
Parent
commit
c1dfd0a444
3 fichiers modifiés avec 14 ajouts et 11 suppressions
  1. 1 1
      src/list_rc.ml
  2. 12 9
      src/messages.ml
  3. 1 1
      src/state.ml

+ 1 - 1
src/list_rc.ml

@@ -42,7 +42,7 @@ open Core.Std;;
 let disp_cmd_num current_number number command =
 let disp_cmd_num current_number number command =
     (* If number is the global current one print a '*' *)
     (* If number is the global current one print a '*' *)
     let prepend = (if current_number = number then "* " else "  ") in
     let prepend = (if current_number = number then "* " else "  ") in
-    sprintf "%s%i: %s\n" prepend number command
+    sprintf "%s%i: %s" prepend number command
     |> (fun concatenated_msg ->
     |> (fun concatenated_msg ->
             match prepend with
             match prepend with
             | "* " -> Messages.ok concatenated_msg
             | "* " -> Messages.ok concatenated_msg

+ 12 - 9
src/messages.ml

@@ -80,24 +80,27 @@ let print ~color ~style message =
 ;;
 ;;
 
 
 (* Print debugging, information, important... messages *)
 (* Print debugging, information, important... messages *)
-(* XXX Partial applications *)
 let debug message =
 let debug message =
     let mess = (Time.now()|> Time.to_string) ^ " " ^ message ^ "\n" in
     let mess = (Time.now()|> Time.to_string) ^ " " ^ message ^ "\n" in
     print ~color:White ~style:Bold mess
     print ~color:White ~style:Bold mess
 ;;
 ;;
 
 
-let info =
-    print ~color:White ~style:Normal
+let info message =
+    let mess = message ^ "\n" in
+    print ~color:White ~style:Normal mess
 ;;
 ;;
 
 
-let warning =
-    print ~color:Red ~style:Bold
+let warning message =
+    let mess = message ^ "\n" in
+    print ~color:Red ~style:Bold mess
 ;;
 ;;
 
 
-let ok =
-    print ~color:Green ~style:Bold
+let ok message =
+    let mess = message ^ "\n" in
+    print ~color:Green ~style:Bold mess
 ;;
 ;;
 
 
-let tips =
-    print ~color:Yellow ~style:Normal
+let tips message =
+    let mess = message ^ "\n" in
+    print ~color:Yellow ~style:Normal mess
 ;;
 ;;

+ 1 - 1
src/state.ml

@@ -49,6 +49,6 @@ let get_current () =
 (* Display current number *)
 (* Display current number *)
 let print_current () =
 let print_current () =
     (* Display the number *)
     (* Display the number *)
-    sprintf "Current state: %i\n" (get_current ())
+    sprintf "Current state: %i" (get_current ())
     |> Messages.ok
     |> Messages.ok
 ;;
 ;;