replay trunk@13911: better behavior of printf on nan/infinity floats

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14871 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Gabriel Scherer 2014-05-14 16:01:10 +00:00
parent 74b20bef58
commit a9aea4306c
1 changed files with 5 additions and 2 deletions

View File

@ -1036,8 +1036,11 @@ let convert_float fconv prec x =
| _ -> is_valid (i + 1)
in
match classify_float x with
| FP_normal | FP_subnormal | FP_zero when not (is_valid 0) -> str ^ "."
| FP_infinite | FP_nan | FP_normal | FP_subnormal | FP_zero -> str
| FP_normal | FP_subnormal | FP_zero ->
if is_valid 0 then str else str ^ "."
| FP_infinite ->
if x < 0.0 then "neg_infinity" else "infinity"
| FP_nan -> "nan"
(* Convert a char to a string according to the OCaml lexical convention. *)
let format_caml_char c =