Révision de l'impression à l'aide de format: utilisation de printf

pour condenser les programmes et aussi préparer une future (éventuelle)
internationalisation d'Objective Caml.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2796 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

Author: pierreweis

asmcomp/alpha/arch.ml

@@ -55,11 +55,11 @@ let num_args_addressing = function
 let print_addressing printreg addr arg =
   match addr with
     Ibased(s, n) ->
-      print_string "\""; print_string s; print_string "\"";
-      if n <> 0 then begin print_string " + "; print_int n end
+      printf "\"%s\"" s;
+      if n <> 0 then printf " + %i" n
   | Iindexed n ->
       printreg arg.(0);
-      if n <> 0 then begin print_string " + "; print_int n end
+      if n <> 0 then printf " + %i" n
 
 let print_specific_operation printreg op arg =
   match op with

asmcomp/arm/arch.ml

@@ -61,7 +61,7 @@ let print_addressing printreg addr arg =
   match addr with
     Iindexed n ->
       printreg arg.(0);
-      if n <> 0 then begin print_string " + "; print_int n end
+      if n <> 0 then printf " + %i" n end
 
 let print_specific_operation printreg op arg =
   match op with
@@ -74,12 +74,12 @@ let print_specific_operation printreg op arg =
       end;
       printreg arg.(1);
       if shift >= 0
-      then begin print_string " << "; print_int shift end
-      else begin print_string " >> "; print_int (-shift) end
+      then printf " << %i" shift
+      else printf " >> %i" (-shift)
   | Ishiftcheckbound n ->
       print_string "check ";
       printreg arg.(0);
-      print_string " >> "; print_int n; print_string " > ";
+      print_string " >> %i > " n;
       printreg arg.(1)
   | Irevsubimm n ->
       print_int n; print_string " - "; printreg arg.(0)

asmcomp/asmgen.ml

@@ -35,7 +35,7 @@ let pass_dump_if flag message phrase =
 
 let pass_dump_linear_if flag message phrase =
   if !flag then begin
-    print_string "*** "; print_string message; print_newline();
+    printf "*** %s@." message;
     Printlinear.fundecl phrase; print_newline()
   end;
   phrase
@@ -113,5 +113,4 @@ let compile_implementation prefixname (size, lam) =
 
 let report_error = function
     Assembler_error file ->
-      print_string "Assembler error, input left in file ";
-      print_string file
+      printf "Assembler error, input left in file %s" file

asmcomp/asmlibrarian.ml

@@ -60,8 +60,7 @@ open Formatmsg
 
 let report_error = function
     File_not_found name ->
-      print_string "Cannot find file "; print_string name
+      printf "Cannot find file %s" name
   | Archiver_error name ->
-      print_string "Error while creating the library ";
-      print_string name
+      printf "Error while creating the library %s" name
 

asmcomp/asmlink.ml

@@ -278,31 +278,24 @@ open Formatmsg
 
 let report_error = function
     File_not_found name ->
-      print_string "Cannot find file "; print_string name
+      printf "Cannot find file %s" name
   | Not_an_object_file name ->
-      print_string "The file "; print_string name;
-      print_string " is not a compilation unit description"
+      printf "The file %s is not a compilation unit description" name
   | Missing_implementations l ->
-      open_box 0;
-      print_string
-        "No implementation(s) provided for the following module(s):";
-      List.iter (fun s -> print_space(); print_string s) l;
-      close_box()
+      printf
+       "@[No implementation(s) provided for the following module(s):%a@]"
+       (fun fmt -> List.iter (fun s -> Format.fprintf fmt "@ %s" s)) l
   | Inconsistent_interface(intf, file1, file2) ->
-      open_hvbox 0;
-      print_string "Files "; print_string file1; print_string " and ";
-      print_string file2; print_space();
-      print_string "make inconsistent assumptions over interface ";
-      print_string intf;
-      close_box()
+      printf
+       "@[<hv>Files %s@ and %s@ make inconsistent assumptions \
+              over interface %s@]"
+       file1 file2 intf
   | Inconsistent_implementation(intf, file1, file2) ->
-      open_hvbox 0;
-      print_string "Files "; print_string file1; print_string " and ";
-      print_string file2; print_space();
-      print_string "make inconsistent assumptions over implementation ";
-      print_string intf;
-      close_box()
+      printf
+       "@[<hv>Files %s@ and %s@ make inconsistent assumptions \
+              over implementation %s@]"
+       file1 file2 intf
   | Assembler_error file ->
-      print_string "Error while assembling "; print_string file
+      printf "Error while assembling %s" file
   | Linking_error ->
       print_string "Error during linking"

asmcomp/codegen.ml

@@ -45,7 +45,7 @@ let rec regalloc fd =
 
 let fundecl fd_cmm =
   if !dump_cmm then begin
-    print_string "*** C-- code"; print_newline();
+    printf "*** C-- code@.";
     Printcmm.fundecl fd_cmm; print_newline()
   end;
   Reg.reset();
@@ -65,7 +65,7 @@ let fundecl fd_cmm =
   let fd_reload = regalloc fd_split in
   let fd_linear = Linearize.fundecl fd_reload in
   if !dump_linear then begin
-    print_string "*** Linearized code"; print_newline();
+    printf "*** Linearized code@.";
     Printlinear.fundecl fd_linear; print_newline()
   end;
   Emit.fundecl fd_linear

asmcomp/compilenv.ml

@@ -147,13 +147,9 @@ open Formatmsg
 
 let report_error = function
     Not_a_unit_info filename ->
-      print_string filename; print_space();
-      print_string "is not a compilation unit description."
+      printf "%s@ is not a compilation unit description." filename
   | Corrupted_unit_info filename ->
-      print_string "Corrupted compilation unit description"; print_space();
-      print_string filename
+      printf "Corrupted compilation unit description@ %s" filename
   | Illegal_renaming(modname, filename) ->
-      print_string filename; print_space();
-      print_string "contains the description for unit"; print_space();
-      print_string modname
+      printf "%s@ contains the description for unit@ %s" filename modname
 

asmcomp/hppa/arch.ml

@@ -53,11 +53,11 @@ let num_args_addressing = function
 let print_addressing printreg addr arg =
   match addr with
     Ibased(s, n) ->
-      print_string "\""; print_string s; print_string "\"";
-      if n <> 0 then begin print_string " + "; print_int n end
+      printf "\"%s\"" s;
+      if n <> 0 then printf " + %i" n
   | Iindexed n ->
       printreg arg.(0);
-      if n <> 0 then begin print_string " + "; print_int n end
+      if n <> 0 then printf " + %i" n
 
 let print_specific_operation printreg op arg =
   match op with

asmcomp/i386/arch.ml

@@ -71,22 +71,22 @@ open Formatmsg
 let print_addressing printreg addr arg =
   match addr with
     Ibased(s, 0) ->
-      print_string "\""; print_string s; print_string "\""
+      printf "\"%s\"" s
   | Ibased(s, n) ->
-      print_string "\""; print_string s; print_string "\" + "; print_int n
+      printf "\"%s\" + %i" s n
   | Iindexed n ->
       printreg arg.(0);
-      if n <> 0 then begin print_string " + "; print_int n end
+      if n <> 0 then printf " + %i" n
   | Iindexed2 n ->
       printreg arg.(0); print_string " + "; printreg arg.(1);
-      if n <> 0 then begin print_string " + "; print_int n end
+      if n <> 0 then printf " + %i" n
   | Iscaled(scale, n) ->
-      printreg arg.(0); print_string " * "; print_int scale;
-      if n <> 0 then begin print_string " + "; print_int n end
+      printreg arg.(0); printf " * %i" scale;
+      if n <> 0 then printf " + %i" n
   | Iindexed2scaled(scale, n) ->
       printreg arg.(0); print_string " + "; printreg arg.(1);
-      print_string " * "; print_int scale;
-      if n <> 0 then begin print_string " + "; print_int n end
+      printf " * %i" scale;
+      if n <> 0 then printf " + %i" n
 
 let print_specific_operation printreg op arg =
   match op with
@@ -107,9 +107,9 @@ let print_specific_operation printreg op arg =
         printreg arg.(i)
       done
   | Ipush_int n ->
-      print_string "push "; print_string (Nativeint.to_string n)
+      printf "push %s" (Nativeint.to_string n)
   | Ipush_symbol s ->
-      print_string "push \""; print_string s; print_string "\""
+      print_string "push \"%s\"" s
   | Ipush_load addr ->
       print_string "push ["; print_addressing printreg addr arg;
       print_string "]"

asmcomp/mips/arch.ml

@@ -57,11 +57,11 @@ let num_args_addressing = function
 let print_addressing printreg addr arg =
   match addr with
     Ibased(s, n) ->
-      print_string "\""; print_string s; print_string "\"";
-      if n <> 0 then begin print_string " + "; print_int n end
+      printf "\"%s\"" s;
+      if n <> 0 then printf " + %i" n
   | Iindexed n ->
       printreg arg.(0);
-      if n <> 0 then begin print_string " + "; print_int n end
+      if n <> 0 then printf " + %i" n
 
 let print_specific_operation printreg op arg =
   fatal_error "Arch_mips.print_specific_operation"

asmcomp/power/arch.ml

@@ -55,11 +55,11 @@ let num_args_addressing = function
 let print_addressing printreg addr arg =
   match addr with
     Ibased(s, n) ->
-      print_string "\""; print_string s; print_string "\"";
-      if n <> 0 then begin print_string " + "; print_int n end
+      printf "\"%s\"" s;
+      if n <> 0 then printf " + %i" n
   | Iindexed n ->
       printreg arg.(0);
-      if n <> 0 then begin print_string " + "; print_int n end
+      if n <> 0 then printf " + %i" n
   | Iindexed2 ->
       printreg arg.(0); print_string " + "; printreg arg.(1)