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

bugfix in PrintBox for unicode text

Browse source
This commit is contained in:
Simon Cruanes 2015-05-18 21:55:57 +02:00
parent 153cababb3
commit 4c4f7995c1
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/misc/printBox.ml
View file

@ -100,7 +100,7 @@ module Output = struct
line.bl_len <- max line.bl_len (pos.x+s_len) line.bl_len <- max line.bl_len (pos.x+s_len)
let _buf_put_string buf pos s = let _buf_put_string buf pos s =
_buf_put_sub_string buf pos s 0 (!_string_len (Bytes.unsafe_of_string s)) _buf_put_sub_string buf pos s 0 (String.length s)
(* create a new buffer *) (* create a new buffer *)
let make_buffer () = let make_buffer () =
@ -119,7 +119,7 @@ module Output = struct
let buf_to_lines ?(indent=0) buf = let buf_to_lines ?(indent=0) buf =
let buffer = Buffer.create (5 + buf.buf_len * 32) in let buffer = Buffer.create (5 + buf.buf_len * 32) in
for i = 0 to buf.buf_len - 1 do for i = 0 to buf.buf_len - 1 do
for k = 1 to indent do Buffer.add_char buffer ' ' done; for _ = 1 to indent do Buffer.add_char buffer ' ' done;
let line = buf.buf_lines.(i) in let line = buf.buf_lines.(i) in
Buffer.add_substring buffer (Bytes.unsafe_to_string line.bl_str) 0 line.bl_len; Buffer.add_substring buffer (Bytes.unsafe_to_string line.bl_str) 0 line.bl_len;
Buffer.add_char buffer '\n'; Buffer.add_char buffer '\n';
@ -128,7 +128,7 @@ module Output = struct
let buf_output ?(indent=0) oc buf = let buf_output ?(indent=0) oc buf =
for i = 0 to buf.buf_len - 1 do for i = 0 to buf.buf_len - 1 do
for k = 1 to indent do output_char oc ' '; done; for _ = 1 to indent do output_char oc ' '; done;
let line = buf.buf_lines.(i) in let line = buf.buf_lines.(i) in
output oc line.bl_str 0 line.bl_len; output oc line.bl_str 0 line.bl_len;
output_char oc '\n'; output_char oc '\n';
@ -141,6 +141,7 @@ let rec _find s c i =
else if s.[i] = c then Some i else if s.[i] = c then Some i
else _find s c (i+1) else _find s c (i+1)
(* sequence of lines *)
let rec _lines s i k = match _find s '\n' i with let rec _lines s i k = match _find s '\n' i with
| None -> | None ->
if i<String.length s then k (String.sub s i (String.length s-i)) if i<String.length s then k (String.sub s i (String.length s-i))