Merge remote-tracking branch 'origin/master' into feature/android

3 files changed, 30 insertions, 5 deletions

diff --git a/src/data.c b/src/data.c
index 6de8e0cf1a1..5a31462d8ca 100644
--- a/src/data.c
+++ b/src/data.c
@@ -3033,7 +3033,8 @@ If the base used is not 10, STRING is always parsed as an integer.  */)
     p++;
 
   Lisp_Object val = string_to_number (p, b, 0);
-  return NILP (val) ? make_fixnum (0) : val;
+  return ((IEEE_FLOATING_POINT ? NILP (val) : !NUMBERP (val))
+          ? make_fixnum (0) : val);
 }
 
 enum arithop
diff --git a/src/lread.c b/src/lread.c
index c3829d2a3a3..11bfc52a83f 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -166,6 +166,10 @@ file_get_char (file_stream stream)
 # ifndef INFINITY
 #  define INFINITY ((union ieee754_double) {.ieee = {.exponent = -1}}.d)
 # endif
+#else
+# ifndef INFINITY
+#  define INFINITY HUGE_VAL
+# endif
 #endif
 
 /* The objects or placeholders read with the #n=object form.
@@ -4721,10 +4725,17 @@ substitute_in_interval (INTERVAL interval, void *arg)
 }
 
 
+#if !IEEE_FLOATING_POINT
+/* Strings that stand in for +NaN, -NaN, respectively.  */
+static Lisp_Object not_a_number[2];
+#endif
+
 /* Convert the initial prefix of STRING to a number, assuming base BASE.
    If the prefix has floating point syntax and BASE is 10, return a
    nearest float; otherwise, if the prefix has integer syntax, return
-   the integer; otherwise, return nil.  If PLEN, set *PLEN to the
+   the integer; otherwise, return nil.  (On antique platforms that lack
+   support for NaNs, if the prefix has NaN syntax return a Lisp object that
+   will provoke an error if used as a number.)  If PLEN, set *PLEN to the
    length of the numeric prefix if there is one, otherwise *PLEN is
    unspecified.  */
 
@@ -4789,7 +4800,6 @@ string_to_number (char const *string, int base, ptrdiff_t *plen)
                 cp++;
               while ('0' <= *cp && *cp <= '9');
             }
-#if IEEE_FLOATING_POINT
           else if (cp[-1] == '+'
                    && cp[0] == 'I' && cp[1] == 'N' && cp[2] == 'F')
             {
@@ -4802,12 +4812,17 @@ string_to_number (char const *string, int base, ptrdiff_t *plen)
             {
               state |= E_EXP;
               cp += 3;
+#if IEEE_FLOATING_POINT
               union ieee754_double u
                 = { .ieee_nan = { .exponent = 0x7ff, .quiet_nan = 1,
                                   .mantissa0 = n >> 31 >> 1, .mantissa1 = n }};
               value = u.d;
-            }
+#else
+              if (plen)
+                *plen = cp - string;
+              return not_a_number[negative];
 #endif
+            }
           else
             cp = ecp;
         }
@@ -5951,6 +5966,14 @@ that are loaded before your customizations are read!  */);
   DEFSYM (Qcomma, ",");
   DEFSYM (Qcomma_at, ",@");
 
+#if !IEEE_FLOATING_POINT
+  for (int negative = 0; negative < 2; negative++)
+    {
+      not_a_number[negative] = build_pure_c_string (&"-0.0e+NaN"[!negative]);
+      staticpro (&not_a_number[negative]);
+    }
+#endif
+
   DEFSYM (Qinhibit_file_name_operation, "inhibit-file-name-operation");
   DEFSYM (Qascii_character, "ascii-character");
   DEFSYM (Qfunction, "function");
diff --git a/src/process.c b/src/process.c
index 0eff789e599..8b7b8d8566e 100644
--- a/src/process.c
+++ b/src/process.c
@@ -7147,7 +7147,8 @@ See function `signal-process' for more details on usage.  */)
         {
           ptrdiff_t len;
           tem = string_to_number (SSDATA (process), 10, &len);
-          if (NILP (tem) || len != SBYTES (process))
+          if ((IEEE_FLOATING_POINT ? NILP (tem) : !NUMBERP (tem))
+              || len != SBYTES (process))
             return Qnil;
         }
       process = tem;