Introducing output meanings to subsume set/get_[all_]formatter_output_functions.

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

6 files changed, 66 insertions, 27 deletions

diff --git a/VERSION b/VERSION
index 860d90aca4..8bdc741eb6 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-3.12.0+dev9 (2009-11-30)
+3.12.0+dev10 (2009-12-01)
 
 # The version string is the first line of this file.
 # It must be in the format described in stdlib/sys.mli
diff --git a/boot/ocamlc b/boot/ocamlc
index 9338841510..e1d00d661b 100755
--- a/boot/ocamlc
+++ b/boot/ocamlc
diff --git a/boot/ocamldep b/boot/ocamldep
index ec972f00d7..eaf01b977e 100755
--- a/boot/ocamldep
+++ b/boot/ocamldep
diff --git a/boot/ocamllex b/boot/ocamllex
index 1439196d30..d5b63b1c79 100755
--- a/boot/ocamllex
+++ b/boot/ocamllex
diff --git a/stdlib/format.ml b/stdlib/format.ml
index 67b5322c75..a525ba075e 100644
--- a/stdlib/format.ml
+++ b/stdlib/format.ml
@@ -810,6 +810,22 @@ let pp_set_margin state n =
 
 let pp_get_margin state () = state.pp_margin;;
 
+let pp_get_formatter_output_meaning state = {
+  output_string = state.pp_output_function;
+  output_flush = state.pp_flush_function;
+  output_line_break = state.pp_output_newline;
+  output_indentation = state.pp_output_spaces;
+}
+;;
+
+let pp_set_formatter_output_meaning state = function
+  | { output_string; output_flush; output_line_break; output_indentation; } ->
+      state.pp_output_function <- output_string;
+      state.pp_flush_function <- output_flush;
+      state.pp_output_newline <- output_line_break;
+      state.pp_output_spaces <- output_indentation
+;;
+
 let pp_set_formatter_output_functions state f g =
   state.pp_output_function <- f; state.pp_flush_function <- g;;
 let pp_get_formatter_output_functions state () =
@@ -832,22 +848,6 @@ let pp_set_formatter_out_channel state os =
   state.pp_flush_function <- (fun () -> flush os)
 ;;
 
-let get_formatter_output_meaning state = {
-  output_string = state.pp_output_function;
-  output_flush = state.pp_flush_function;
-  output_line_break = state.pp_output_newline;
-  output_indentation = state.pp_output_spaces;
-}
-;;
-
-let set_formatter_output_meaning state = function
-  | { output_string; output_flush; output_line_break; output_indentation; } ->
-      state.pp_output_function <- output_string;
-      state.pp_flush_function <- output_flush;
-      state.pp_output_newline <- output_line_break;
-      state.pp_output_spaces <- output_indentation
-;;
-
 (**************************************************************
 
   Creation of specific formatters
@@ -1013,6 +1013,11 @@ and set_all_formatter_output_functions =
 and get_all_formatter_output_functions =
   pp_get_all_formatter_output_functions std_formatter
 
+and get_formatter_output_meaning =
+  pp_get_formatter_output_meaning std_formatter
+and set_formatter_output_meaning =
+  pp_set_formatter_output_meaning std_formatter
+
 and set_formatter_tag_functions =
   pp_set_formatter_tag_functions std_formatter
 and get_formatter_tag_functions =
diff --git a/stdlib/format.mli b/stdlib/format.mli
index 6bb4a04d6f..897ebb3ef5 100644
--- a/stdlib/format.mli
+++ b/stdlib/format.mli
@@ -396,9 +396,47 @@ val get_formatter_tag_functions :
   unit -> formatter_tag_functions;;
 (** Return the current tag functions of the pretty-printer. *)
 
-(** {6 Changing the meaning of pretty printing (indentation, line breaking,
- and printing material)} *)
+(** {6 Changing the meaning of pretty printing} *)
 
+(** The [Format] module is versatile enough to let you completely redefine
+ the meaning of pretty printing: you may provide your own functions to define
+ how to handle indentation, line breaking, and even printing of all the
+ characters that have to be printed! *)
+
+type formatter_output_meaning = {
+  output_string: string -> int -> int -> unit;
+  output_flush : unit -> unit;
+  output_line_break : unit -> unit;
+  output_indentation : int -> unit;
+}
+;;
+(** The output handling functions specific to a formatter:
+   - the [output_string] function performs the pretty-printer string output. It
+   is called with a string [s], a start position [p], and a number of characters
+   [n]; it is supposed to output characters [p] to [p + n - 1] of
+   [s].
+   - the [output_flush] function is called whenever the pretty-printer is
+   flushed (via conversion [%!], pretty-printing indications [@?] or [@.],
+   or using low level function [print_flush] or [print_newline]).
+   - the [output_line_break] function is called whenever the pretty-printer
+   outputs a new line.
+   - the [output_indentation] function is called whenever the pretty-printer
+   must output an indentation: [output_space n] signal an new indentation of
+   value [n] (on a terminal, the regular way to indicate an indentation of
+   value [n] is to print [n] white spaces.
+*)
+
+(** {6 Changing the meaning of the standard output pretty printer} *)
+
+val set_formatter_output_meaning : formatter_output_meaning -> unit
+ (** Set the output functions according to the given meaning. *) 
+;;
+val get_formatter_output_meaning : formatter_output_meaning
+ (** Get the current meaning of the output functions. *) 
+;;
+
+(** An alternative way to modify the behaviour of output functions in an
+    unstructured way. *)
 val set_all_formatter_output_functions :
   out:(string -> int -> int -> unit) ->
   flush:(unit -> unit) ->
@@ -427,7 +465,8 @@ val get_all_formatter_output_functions :
   (unit -> unit) *
   (int -> unit);;
 (** Return the current output functions of the pretty-printer,
-   including line breaking and indentation functions. *)
+   including line breaking and indentation functions. Useful to record the
+   current setting and restore it afterwards. *)
 
 (** {6 Multiple formatted output} *)
 
@@ -517,13 +556,6 @@ val make_formatter :
   [flush]. Hence, a formatter to the output channel [oc] is returned by
   [make_formatter (Pervasives.output oc) (fun () -> Pervasives.flush oc)]. *)
 
-type formatter_output_meaning = {
-  output_string: string -> int -> int -> unit;
-  output_flush : unit -> unit;
-  output_line_break : unit -> unit;
-  output_indentation : int -> unit;
-}
-;;
 (** {6 Basic functions to use with formatters} *)
 
 val pp_open_hbox : formatter -> unit -> unit;;
@@ -567,6 +599,8 @@ val pp_over_max_boxes : formatter -> unit -> bool;;
 val pp_set_ellipsis_text : formatter -> string -> unit;;
 val pp_get_ellipsis_text : formatter -> unit -> string;;
 val pp_set_formatter_out_channel : formatter -> Pervasives.out_channel -> unit;;
+val pp_get_formatter_output_meaning : formatter -> formatter_output_meaning;;
+val pp_set_formatter_output_meaning : formatter -> formatter_output_meaning -> unit;;
 val pp_set_formatter_output_functions :
   formatter -> (string -> int -> int -> unit) -> (unit -> unit) -> unit;;
 val pp_get_formatter_output_functions :