diff options
| author | Pierre Weis <Pierre.Weis@inria.fr> | 2009-11-30 21:58:35 +0000 |
|---|---|---|
| committer | Pierre Weis <Pierre.Weis@inria.fr> | 2009-11-30 21:58:35 +0000 |
| commit | 5d35a4b47520e38db2a629b97c9babb5f968f896 (patch) | |
| tree | 28100e02509d635249c795ac8960087dc0132e6a | |
| parent | bdd01e7371bdc72318f72675243a069bd0662a41 (diff) | |
| download | ocaml-5d35a4b47520e38db2a629b97c9babb5f968f896.tar.gz | |
Format concatenation introduces %, to delimit conversions.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9431 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | stdlib/pervasives.ml | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -3.12.0+dev7 (2009-11-19) +3.12.0+dev8 (2009-11-30) # The version string is the first line of this file. # It must be in the format described in stdlib/sys.mli diff --git a/stdlib/pervasives.ml b/stdlib/pervasives.ml index f3eb037604..c4f0bcfd84 100644 --- a/stdlib/pervasives.ml +++ b/stdlib/pervasives.ml @@ -418,7 +418,7 @@ let (( ^^ ) : ('f, 'b, 'c, 'e, 'g, 'h) format6 -> ('a, 'b, 'c, 'd, 'g, 'h) format6) = fun fmt1 fmt2 -> - string_to_format (format_to_string fmt1 ^ format_to_string fmt2) + string_to_format (format_to_string fmt1 ^ "%," ^ format_to_string fmt2) ;; let string_of_format fmt = |