petite correction de retour à la ligne

et retour à la normal

src/transform/encoding_arrays.ml

@@ -352,7 +352,7 @@ let create_env env task thpoly tds =
           add_ty_decl task [ts,Tabstract],ts in
     let task,tskey = add_ty task key in
     let task,tselt = add_ty task elt in
-    let ts_name = "bta_"^(Pp.string_of Pretty.print_ty ty) in
+    let ts_name = "bta_"^(Pp.string_of_wnl Pretty.print_ty ty) in
     let ts = create_tysymbol (id_fresh ts_name) [] None in
     let task = add_ty_decl task [ts,Tabstract] in
     let th_inst = create_inst ~ts:[ct,ts; ckey,tskey; celt,tselt] ~ls:[]

src/transform/libencoding.ml

@@ -74,7 +74,7 @@ let ls_of_const ty_base =
   fun t -> match t.t_node with
     | Tconst _ ->
         begin try Hterm.find ht t with Not_found ->
-          let s = "const_" ^ Pp.string_of Pretty.print_term t in
+          let s = "const_" ^ Pp.string_of_wnl Pretty.print_term t in
           let ls = create_fsymbol (id_fresh s) [] ty_base in
           Hterm.add ht t ls;
           ls

src/util/pp.ml

@@ -149,6 +149,13 @@ let rec print_list_opt sep print fmt = function
 
 
 let string_of p x =
+  let b = Buffer.create 100 in
+  let fmt = formatter_of_buffer b in
+  fprintf fmt "%a@?" p x;
+  Buffer.contents b
+
+
+let string_of_wnl p x =
   let b = Buffer.create 100 in
   let fmt = formatter_of_buffer b in
   let out,flush,_newline,spaces =

src/util/pp.mli

@@ -120,3 +120,5 @@ val print_list_opt :
 
 
 val string_of : (Format.formatter -> 'a -> unit) -> 'a -> string
+val string_of_wnl : (Format.formatter -> 'a -> unit) -> 'a -> string
+  (** same as {!string_of} but without newline *)