mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-09 15:10:29 +02:00
Code Activity

SCM-to-C number conversion functions incorrect when SIZEOF_LONG != SIZEOF_SCM_T_BITS

Browse source 
* libguile/conv-integer.i.c (SCM_FROM_TYPE_PROTO, SCM_TO_TYPE_PROTO):
    prefer fixnum size to scm_t_bits size
* libguile/conv-uinteger.i.c (SCM_FROM_TYPE_PROTO, SCM_TO_TYPE_PROTO):
    prefer fixnum size to scm_t_bits size
This commit is contained in:
Michael Gran 2018-04-13 14:20:02 -07:00
parent c56d2d1023
commit dbc10620a4
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libguile/conv-integer.i.c
View file

@ -29,7 +29,7 @@ SCM_TO_TYPE_PROTO (SCM val)
if (SCM_I_INUMP (val)) if (SCM_I_INUMP (val))
{ {
scm_t_signed_bits n = SCM_I_INUM (val); scm_t_signed_bits n = SCM_I_INUM (val);
#if SIZEOF_TYPE != 0 && SIZEOF_TYPE > SIZEOF_SCM_T_BITS #if SIZEOF_TYPE != 0 && SIZEOF_TYPE * 8 > SCM_I_FIXNUM_BIT
return n; return n;
#else #else
if (n >= TYPE_MIN && n <= TYPE_MAX) if (n >= TYPE_MIN && n <= TYPE_MAX)
@ -113,7 +113,7 @@ SCM_TO_TYPE_PROTO (SCM val)
SCM SCM
SCM_FROM_TYPE_PROTO (TYPE val) SCM_FROM_TYPE_PROTO (TYPE val)
{ {
#if SIZEOF_TYPE != 0 && SIZEOF_TYPE < SIZEOF_SCM_T_BITS #if SIZEOF_TYPE != 0 && SIZEOF_TYPE * 8 < SCM_I_FIXNUM_BIT
return SCM_I_MAKINUM (val); return SCM_I_MAKINUM (val);
#else #else
if (SCM_FIXABLE (val)) if (SCM_FIXABLE (val))

2
libguile/conv-uinteger.i.c
View file

@ -95,7 +95,7 @@ SCM_TO_TYPE_PROTO (SCM val)
SCM SCM
SCM_FROM_TYPE_PROTO (TYPE val) SCM_FROM_TYPE_PROTO (TYPE val)
{ {
#if SIZEOF_TYPE != 0 && SIZEOF_TYPE < SIZEOF_SCM_T_BITS #if SIZEOF_TYPE != 0 && SIZEOF_TYPE * 8 < SCM_I_FIXNUM_BIT
return SCM_I_MAKINUM (val); return SCM_I_MAKINUM (val);
#else #else
if (SCM_POSFIXABLE (val)) if (SCM_POSFIXABLE (val))