From 546cc94a830ac971ac72700deac908fd8e41d356 Mon Sep 17 00:00:00 2001 From: Pip Cet Date: Tue, 14 Aug 2018 12:36:04 +0000 Subject: [PATCH] fix minor oversights in the bignum patch --- src/data.c | 6 +++--- src/lread.c | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/data.c b/src/data.c index a1215b9d6bf..4cd93f0ac7f 100644 --- a/src/data.c +++ b/src/data.c @@ -74,7 +74,7 @@ XKBOARD_OBJFWD (union Lisp_Fwd *a) return &a->u_kboard_objfwd; } static struct Lisp_Intfwd * -XFIXNUMFWD (union Lisp_Fwd *a) +XINTFWD (union Lisp_Fwd *a) { eassert (INTFWDP (a)); return &a->u_intfwd; @@ -1002,7 +1002,7 @@ do_symval_forwarding (register union Lisp_Fwd *valcontents) switch (XFWDTYPE (valcontents)) { case Lisp_Fwd_Int: - XSETINT (val, *XFIXNUMFWD (valcontents)->intvar); + XSETINT (val, *XINTFWD (valcontents)->intvar); return val; case Lisp_Fwd_Bool: @@ -1095,7 +1095,7 @@ store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newva { case Lisp_Fwd_Int: CHECK_FIXNUM (newval); - *XFIXNUMFWD (valcontents)->intvar = XFIXNUM (newval); + *XINTFWD (valcontents)->intvar = XFIXNUM (newval); break; case Lisp_Fwd_Bool: diff --git a/src/lread.c b/src/lread.c index df2fe581203..7411f1c7354 100644 --- a/src/lread.c +++ b/src/lread.c @@ -3813,10 +3813,9 @@ string_to_number (char const *string, int base, int flags) return make_bignum_str (string, base); } - /* Either the number uses float syntax, or it does not fit into a fixnum. - Convert it from string to floating point, unless the value is already - known because it is an infinity, a NAN, or its absolute value fits in - uintmax_t. */ + /* The number uses float syntax. Convert it from string to floating + point, unless the value is already known because it is an + infinity, a NAN, or its absolute value fits in uintmax_t. */ if (! value) value = atof (string + signedp); -- 2.18.0