simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-07 19:55:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

with compat >= 4.02, use Format.pp_print_text directly

Browse source
This commit is contained in:
Simon Cruanes 2018-02-05 08:56:01 -06:00
parent 27c768eebf
commit 3ab9cd58e1
1 changed files with 1 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/core/CCFormat.ml
View file

@ -46,35 +46,7 @@ let newline = Format.pp_force_newline
let substring out (s,i,len): unit = let substring out (s,i,len): unit =
string out (String.sub s i len) string out (String.sub s i len)
let text out (s:string): unit = let text = Format.pp_print_text
let len = String.length s in
let i = ref 0 in
let search_ c =
try Some (String.index_from s !i c) with Not_found -> None
in
while !i < len do
let j_newline = search_ '\n' in
let j_space = search_ ' ' in
let on_newline j =
substring out (s, !i, j - !i);
newline out ();
i := j + 1
and on_space j =
substring out (s, !i, j - !i);
Format.pp_print_space out ();
i := j + 1
in
begin match j_newline, j_space with
| None, None ->
(* done *)
substring out (s, !i, len - !i);
i := len
| Some j, None -> on_newline j
| None, Some j -> on_space j
| Some j1, Some j2 ->
if j1<j2 then on_newline j1 else on_space j2
end
done
(*$= & ~printer:(fun s->CCFormat.sprintf "%S" s) (*$= & ~printer:(fun s->CCFormat.sprintf "%S" s)
"a\nb\nc" (sprintf_no_color "@[<v>%a@]%!" text "a b c") "a\nb\nc" (sprintf_no_color "@[<v>%a@]%!" text "a b c")