diff options
| author | Gabriel Scherer <gabriel.scherer@gmail.com> | 2014-05-12 15:38:17 +0000 |
|---|---|---|
| committer | Gabriel Scherer <gabriel.scherer@gmail.com> | 2014-05-12 15:38:17 +0000 |
| commit | 7f8e43aa9aa0fdd589d4eaaa2a8c9ebd1974877c (patch) | |
| tree | a42814f044f1213103a239380026038fbf621cc3 /stdlib | |
| parent | 0a7224fd23febc81f00ee37ae589072e5c307a5b (diff) | |
minor strengthening of the typing of %{...%} formats
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14832 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/pervasives.ml | 9 | ||||
| -rw-r--r-- | stdlib/pervasives.mli | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/stdlib/pervasives.ml b/stdlib/pervasives.ml index f24ed976a..7c28eb369 100644 --- a/stdlib/pervasives.ml +++ b/stdlib/pervasives.ml @@ -599,11 +599,10 @@ type ('a, 'b, 'c, 'd, 'e, 'f) fmtty = | Bool_ty : (* %B *) ('a, 'b, 'c, 'd, 'e, 'f) fmtty -> (bool -> 'a, 'b, 'c, 'd, 'e, 'f) fmtty - | Format_arg_ty : (* %{...%} *) - ('x, 'b, 'c, 'q, 'r, 'u) fmtty * + ('g, 'h, 'i, 'j, 'k, 'l) fmtty * ('a, 'b, 'c, 'd, 'e, 'f) fmtty -> - (('x, 'b, 'c, 'q, 'r, 'u) format6 -> 'a, 'b, 'c, 'd, 'e, 'f) fmtty + (('g, 'h, 'i, 'j, 'k, 'l) format6 -> 'a, 'b, 'c, 'd, 'e, 'f) fmtty | Format_subst_ty : (* %(...%) *) ('d1, 'q1, 'd2, 'q2) reader_nb_unifier * ('x, 'b, 'c, 'd1, 'q1, 'u) fmtty * @@ -680,9 +679,9 @@ and ('a, 'b, 'c, 'd, 'e, 'f) fmt = ('a, 'b, 'c, 'd, 'e, 'f) fmt | Format_arg : (* %{...%} *) - pad_option * ('x, 'b, 'c, 'q, 'r, 'u) fmtty * + pad_option * ('g, 'h, 'i, 'j, 'k, 'l) fmtty * ('a, 'b, 'c, 'd, 'e, 'f) fmt -> - (('x, 'b, 'c, 'q, 'r, 'u) format6 -> 'a, 'b, 'c, 'd, 'e, 'f) fmt + (('g, 'h, 'i, 'j, 'k, 'l) format6 -> 'a, 'b, 'c, 'd, 'e, 'f) fmt | Format_subst : (* %(...%) *) pad_option * ('d1, 'q1, 'd2, 'q2) reader_nb_unifier * ('x, 'b, 'c, 'd1, 'q1, 'u) fmtty * diff --git a/stdlib/pervasives.mli b/stdlib/pervasives.mli index d2cc76d32..09af424e7 100644 --- a/stdlib/pervasives.mli +++ b/stdlib/pervasives.mli @@ -1047,8 +1047,8 @@ module CamlinternalFormatBasics : sig ('a, 'b, 'c, 'd, 'e, 'f) fmtty -> (bool -> 'a, 'b, 'c, 'd, 'e, 'f) fmtty | Format_arg_ty : - ('x, 'b, 'c, 'q, 'r, 'u) fmtty * ('a, 'b, 'c, 'd, 'e, 'f) fmtty -> - (('x, 'b, 'c, 'q, 'r, 'u) format6 -> 'a, 'b, 'c, 'd, 'e, 'f) fmtty + ('g, 'h, 'i, 'j, 'k, 'l) fmtty * ('a, 'b, 'c, 'd, 'e, 'f) fmtty -> + (('g, 'h, 'i, 'j, 'k, 'l) format6 -> 'a, 'b, 'c, 'd, 'e, 'f) fmtty | Format_subst_ty : ('d1, 'q1, 'd2, 'q2) reader_nb_unifier * ('x, 'b, 'c, 'd1, 'q1, 'u) fmtty * @@ -1115,9 +1115,9 @@ module CamlinternalFormatBasics : sig char * ('a, 'b, 'c, 'd, 'e, 'f) fmt -> ('a, 'b, 'c, 'd, 'e, 'f) fmt | Format_arg : - pad_option * ('x, 'b, 'c, 'q, 'r, 'u) fmtty * + pad_option * ('g, 'h, 'i, 'j, 'k, 'l) fmtty * ('a, 'b, 'c, 'd, 'e, 'f) fmt -> - (('x, 'b, 'c, 'q, 'r, 'u) format6 -> 'a, 'b, 'c, 'd, 'e, 'f) fmt + (('g, 'h, 'i, 'j, 'k, 'l) format6 -> 'a, 'b, 'c, 'd, 'e, 'f) fmt | Format_subst : pad_option * ('d1, 'q1, 'd2, 'q2) reader_nb_unifier * ('x, 'b, 'c, 'd1, 'q1, 'u) fmtty * |