diff options
| author | Pierre Weis <Pierre.Weis@inria.fr> | 2010-06-09 10:23:48 +0000 |
|---|---|---|
| committer | Pierre Weis <Pierre.Weis@inria.fr> | 2010-06-09 10:23:48 +0000 |
| commit | 97e55c0ab71c8cc3e0b352cde8c7e1da1e5d2bb1 (patch) | |
| tree | 82ead7ef9e9219c81aabda1999eafeef9c694905 | |
| parent | 71606b388a5cb02157391b7d95fd3ad55c335f8c (diff) | |
| download | ocaml-97e55c0ab71c8cc3e0b352cde8c7e1da1e5d2bb1.tar.gz | |
PR#5062: was corrected in trunk and not in 3.12
Correction of operator ( ^^ ) was never reported from stdlib/pervasives.ml.
git-svn-id: http://caml.inria.fr/svn/ocaml/version/3.12@10547 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | otherlibs/threads/pervasives.ml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/otherlibs/threads/pervasives.ml b/otherlibs/threads/pervasives.ml index 7cfd02505c..08115a2ff8 100644 --- a/otherlibs/threads/pervasives.ml +++ b/otherlibs/threads/pervasives.ml @@ -55,6 +55,7 @@ external (||) : bool -> bool -> bool = "%sequor" (* Integer operations *) external (~-) : int -> int = "%negint" +external (~+) : int -> int = "%identity" external succ : int -> int = "%succint" external pred : int -> int = "%predint" external (+) : int -> int -> int = "%addint" @@ -81,6 +82,7 @@ let max_int = min_int - 1 (* Floating-point operations *) external (~-.) : float -> float = "%negfloat" +external (~+.) : float -> float = "%identity" external (+.) : float -> float -> float = "%addfloat" external (-.) : float -> float -> float = "%subfloat" external ( *. ) : float -> float -> float = "%mulfloat" @@ -512,7 +514,8 @@ 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 = let s = format_to_string fmt in @@ -521,7 +524,6 @@ let string_of_format fmt = string_blit s 0 r 0 l; r - (* Miscellaneous *) external sys_exit : int -> 'a = "caml_sys_exit" |