diff options
author | Marius Vollmer <mvo@zagadka.de> | 2004-08-02 16:14:04 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2004-08-02 16:14:04 +0000 |
commit | b9bd8526f055eeef0acc42c269eb5ec67546159f (patch) | |
tree | f2561facb5d3a08f72839a166e89eda9e7b4136e /libguile/gh_data.c | |
parent | 531bf3e6a84faf61107b4a8a5288a2a757d17c6e (diff) | |
download | guile-b9bd8526f055eeef0acc42c269eb5ec67546159f.tar.gz |
* numbers.h, numbers.c, discouraged.h, discouraged.c (scm_short2num,
scm_ushort2num, scm_int2num, scm_uint2num, scm_long2num,
scm_ulong2num, scm_size2num, scm_ptrdiff2num, scm_num2short,
scm_num2ushort, scm_num2int, scm_num2uint, scm_num2long,
scm_num2ulong, scm_num2size, scm_num2ptrdiff, scm_long_long2num,
scm_ulong_long2num, scm_num2long_long, scm_num2ulong_long):
Discouraged by moving to discouraged.h and discouraged.c and
reimplementing in terms of scm_from_* and scm_to_*. Changed all uses
to the new scm_from_* and scm_to_* functions.
Diffstat (limited to 'libguile/gh_data.c')
-rw-r--r-- | libguile/gh_data.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libguile/gh_data.c b/libguile/gh_data.c index b1cfd5096..b0cab03cf 100644 --- a/libguile/gh_data.c +++ b/libguile/gh_data.c @@ -36,17 +36,17 @@ gh_bool2scm (int x) SCM gh_int2scm (int x) { - return scm_long2num ((long) x); + return scm_from_long ((long) x); } SCM gh_ulong2scm (unsigned long x) { - return scm_ulong2num (x); + return scm_from_ulong (x); } SCM gh_long2scm (long x) { - return scm_long2num (x); + return scm_from_long (x); } SCM gh_double2scm (double x) @@ -187,17 +187,17 @@ gh_scm2bool (SCM obj) unsigned long gh_scm2ulong (SCM obj) { - return scm_num2ulong (obj, SCM_ARG1, "gh_scm2ulong"); + return scm_to_ulong (obj); } long gh_scm2long (SCM obj) { - return scm_num2long (obj, SCM_ARG1, "gh_scm2long"); + return scm_to_long (obj); } int gh_scm2int (SCM obj) { - return (int) scm_num2int (obj, SCM_ARG1, "gh_scm2int"); + return scm_to_int (obj); } double gh_scm2double (SCM obj) @@ -353,7 +353,7 @@ gh_scm2longs (SCM obj, long *m) val = SCM_VELTS (obj)[i]; m[i] = SCM_I_INUMP (val) ? SCM_I_INUM (val) - : scm_num2long (val, 0, NULL); + : scm_to_long (val); } break; #if SCM_HAVE_ARRAYS @@ -405,7 +405,7 @@ gh_scm2floats (SCM obj, float *m) if (SCM_I_INUMP (val)) m[i] = SCM_I_INUM (val); else if (SCM_BIGP (val)) - m[i] = scm_num2long (val, 0, NULL); + m[i] = scm_to_long (val); else m[i] = SCM_REAL_VALUE (val); } @@ -468,7 +468,7 @@ gh_scm2doubles (SCM obj, double *m) if (SCM_I_INUMP (val)) m[i] = SCM_I_INUM (val); else if (SCM_BIGP (val)) - m[i] = scm_num2long (val, 0, NULL); + m[i] = scm_to_long (val); else m[i] = SCM_REAL_VALUE (val); } |