Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Factorisation de unit_out. Details de polissage. 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3975 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Pierre Weis 2001-11-04 21:43:01 +00:00
parent 4fcb648544
commit ac35cb1a4e
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
stdlib/format.ml
View File

@ -283,11 +283,12 @@ let format_pp_token state size = function
then break_new_line state off width else
(* break the line here leads to new indentation ? *)
if state.pp_current_indent > state.pp_margin - width + off
then break_new_line state off width else break_same_line state n
then break_new_line state off width
else break_same_line state n
| Pp_hvbox -> break_new_line state off width
| Pp_fits -> break_same_line state n
| Pp_vbox -> break_new_line state off width
| Pp_hbox -> break_same_line state n
| Pp_vbox -> break_new_line state off width
| Pp_hbox -> break_same_line state n
end
| _ -> () (* No opened block *)
end;;
@ -365,11 +366,9 @@ let scan_push state b tok =
state.pp_scan_stack <-
Scan_elem (state.pp_right_total, tok) :: state.pp_scan_stack;;
(*
To open a new block :
the user may set the depth bound pp_max_boxes
any text nested deeper is printed as the ellipsis string
*)
(* To open a new block :
the user may set the depth bound pp_max_boxes
any text nested deeper is printed as the ellipsis string *)
let pp_open_box_gen state indent br_ty =
state.pp_curr_depth <- state.pp_curr_depth + 1;
if state.pp_curr_depth < state.pp_max_boxes then
@ -626,8 +625,10 @@ let make_formatter f g = pp_make_formatter f g display_newline display_blanks;;
let formatter_of_out_channel oc =
make_formatter (output oc) (fun () -> flush oc);;
let unit_out () = ();;
let formatter_of_buffer b =
make_formatter (Buffer.add_substring b) (fun () -> ());;
make_formatter (Buffer.add_substring b) unit_out;;
let stdbuf = Buffer.create 512;;
@ -697,8 +698,8 @@ and get_all_formatter_output_functions =
(* Printf implementation. *)
external format_int: string -> int -> string = "format_int"
external format_float: string -> float -> string = "format_float"
external format_int : string -> int -> string = "format_int";;
external format_float : string -> float -> string = "format_float";;
let format_invalid_arg s c = invalid_arg (s ^ String.make 1 c);;
@ -866,8 +867,6 @@ let string_out b ppf () =
pp_flush_queue ppf false;
get_buffer_out b;;
let unit_out () = ();;
let fprintf ppf = fprintf_out false unit_out ppf;;
let printf f = fprintf_out false unit_out std_formatter f;;
let eprintf f = fprintf_out false unit_out err_formatter f;;