Permalink
Browse files

minor strengthening of the typing of %{...%} formats

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14832 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
  • Loading branch information...
1 parent 0a7224f commit 7f8e43aa9aa0fdd589d4eaaa2a8c9ebd1974877c @gasche gasche committed May 12, 2014
Showing with 12 additions and 13 deletions.
  1. +4 −4 otherlibs/threads/pervasives.ml
  2. +4 −5 stdlib/pervasives.ml
  3. +4 −4 stdlib/pervasives.mli
@@ -699,9 +699,9 @@ type ('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 *
@@ -778,9 +778,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 *
View
@@ -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 *
View
@@ -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 *

0 comments on commit 7f8e43a

Please sign in to comment.