Read and print NaN significand if <ieee754.h>

* configure.ac: Check for ieee754.h.
* doc/lispref/numbers.texi (Float Basics): Document
that NaN string representation digits are machine-dependent.
* etc/NEWS: Mention the change.
* src/lread.c, src/print.c [HAVE_IEEE754_H]: Include ieee754.h.
* src/lread.c (string_to_number) [HAVE_IEEE754_H]:
* src/print.c (float_to_string) [HAVE_IEEE754_H]:
Read and print NaN significand.

diff --git a/configure.ac b/configure.ac
index b6918671e409b767364c0db27cd7f9764d8da4cd..dbdcce7c8d85246a54be05c1221d9e3059cedd96 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1668,6 +1668,7 @@ fi
 
 dnl checks for header files
 AC_CHECK_HEADERS_ONCE(
+  ieee754.h
   linux/fs.h
   malloc.h
   sys/systeminfo.h

diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi
index 14d5059ffb3daea0b5a4818346c5464b33cd0958..a3317c9a260408d62e1e9686bb5f8522dc1336fe 100644 (file)
--- a/doc/lispref/numbers.texi
+++ b/doc/lispref/numbers.texi
@@ -241,7 +241,7 @@ A NaN is never numerically equal to any value, not even to itself.
 NaNs carry a sign and a significand, and non-numeric functions treat
 two NaNs as equal when their
 signs and significands agree.  Significands of NaNs are
-machine-dependent and are not directly visible to Emacs Lisp.
+machine-dependent, as are the digits in their string representation.
 
   When NaNs and signed zeros are involved, non-numeric functions like
 @code{eql}, @code{equal}, @code{sxhash-eql}, @code{sxhash-equal} and

diff --git a/etc/NEWS b/etc/NEWS
index f1ea835679030208dbf889bf5610681bef98d9ac..9e7a765dc61ccc878844e5a6da1895cb07eaf47e 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -880,6 +880,9 @@ Formerly, some of these functions ignored signs and significands of
 NaNs.  Now, all these functions treat NaN signs and significands as
 significant.  For example, (eql 0.0e+NaN -0.0e+NaN) now returns nil
 because the two NaNs have different signs; formerly it returned t.
+Also, on platforms that have <ieee754.h> Emacs now reads and prints
+NaN significands; e.g., if X is a NaN, (format "%s" X) now returns
+"0.0e+NaN", "1.0e+NaN", etc., depending on X's significand.
 
 +++
 ** The function 'make-string' accepts an additional optional argument.

diff --git a/src/lread.c b/src/lread.c
index 50fc6ef8f3ada0b9801f545c43e05b3230e61fd5..290b0f6bbe93c4b874036b9420c0c156a5105ca6 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -72,6 +72,10 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #define file_tell ftell
 #endif
 
+#if HAVE_IEEE754_H
+# include <ieee754.h>
+#endif
+
 /* The objects or placeholders read with the #n=object form.
 
    A hash table maps a number to either a placeholder (while the
@@ -3757,8 +3761,15 @@ string_to_number (char const *string, int base, int flags)
            {
              state |= E_EXP;
              cp += 3;
+#if HAVE_IEEE754_H
+             union ieee754_double u
+               = { .ieee_nan = { .exponent = -1, .quiet_nan = 1,
+                                 .mantissa0 = n >> 31 >> 1, .mantissa1 = n }};
+             value = u.d;
+#else
              /* NAN is a "positive" NaN on all known Emacs hosts.  */
              value = NAN;
+#endif
            }
          else
            cp = ecp;

diff --git a/src/print.c b/src/print.c
index da6ec1aaedf98648a0fea085b8a1761b9df21248..add21609cc58c600ade377ae6313a6b53c28ee64 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -40,6 +40,10 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include <ftoastr.h>
 #include <math.h>
 
+#if HAVE_IEEE754_H
+# include <ieee754.h>
+#endif
+
 #ifdef WINDOWSNT
 # include <sys/socket.h> /* for F_DUPFD_CLOEXEC */
 #endif
@@ -1011,6 +1015,12 @@ float_to_string (char *buf, double data)
     }
   if (isnan (data))
     {
+#if HAVE_IEEE754_H
+      union ieee754_double u = { .d = data };
+      uprintmax_t hi = u.ieee_nan.mantissa0;
+      return sprintf (buf, &"-%"pMu".0e+NaN"[!u.ieee_nan.negative],
+                     (hi << 31 << 1) + u.ieee_nan.mantissa1);
+#else
       /* Prepend "-" if the NaN's sign bit is negative.
         The sign bit of a double is the bit that is 1 in -0.0.  */
       static char const NaN_string[] = "0.0e+NaN";
@@ -1029,6 +1039,7 @@ float_to_string (char *buf, double data)
 
       strcpy (buf + negative, NaN_string);
       return negative + sizeof NaN_string - 1;
+#endif
     }
 
   if (NILP (Vfloat_output_format)