summaryrefslogtreecommitdiff
path: root/libguile/unif.c
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2004-08-02 16:14:04 +0000
committerMarius Vollmer <mvo@zagadka.de>2004-08-02 16:14:04 +0000
commitb9bd8526f055eeef0acc42c269eb5ec67546159f (patch)
treef2561facb5d3a08f72839a166e89eda9e7b4136e /libguile/unif.c
parent531bf3e6a84faf61107b4a8a5288a2a757d17c6e (diff)
downloadguile-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/unif.c')
-rw-r--r--libguile/unif.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/libguile/unif.c b/libguile/unif.c
index 34b707f7b..a81ec4643 100644
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -141,7 +141,7 @@ static SCM
make_uve (long type, long k, size_t size)
#define FUNC_NAME "scm_make_uve"
{
- SCM_ASSERT_RANGE (1, scm_long2num (k), k <= SCM_UVECTOR_MAX_LENGTH);
+ SCM_ASSERT_RANGE (1, scm_from_long (k), k <= SCM_UVECTOR_MAX_LENGTH);
return scm_cell (SCM_MAKE_UVECTOR_TAG (k, type),
(scm_t_bits) scm_gc_malloc (k * size, "vector"));
@@ -157,8 +157,8 @@ scm_make_uve (long k, SCM prot)
if (k > 0)
{
long i;
- SCM_ASSERT_RANGE (1,
- scm_long2num (k), k <= SCM_BITVECTOR_MAX_LENGTH);
+ SCM_ASSERT_RANGE (1, scm_from_long (k),
+ k <= SCM_BITVECTOR_MAX_LENGTH);
i = sizeof (long) * ((k + SCM_LONG_BIT - 1) / SCM_LONG_BIT);
return scm_cell (SCM_MAKE_BITVECTOR_TAG (k),
(scm_t_bits) scm_gc_malloc (i, "vector"));
@@ -1277,21 +1277,17 @@ SCM_DEFINE (scm_array_set_x, "array-set!", 2, 0, 1,
((char *) SCM_UVECTOR_BASE (v))[pos] = scm_to_char (obj);
break;
case scm_tc7_uvect:
- ((unsigned long *) SCM_UVECTOR_BASE (v))[pos]
- = scm_num2ulong (obj, SCM_ARG2, FUNC_NAME);
+ ((unsigned long *) SCM_UVECTOR_BASE (v))[pos] = scm_to_ulong (obj);
break;
case scm_tc7_ivect:
- ((long *) SCM_UVECTOR_BASE (v))[pos]
- = scm_num2long (obj, SCM_ARG2, FUNC_NAME);
+ ((long *) SCM_UVECTOR_BASE (v))[pos] = scm_to_long (obj);
break;
case scm_tc7_svect:
- ((short *) SCM_UVECTOR_BASE (v))[pos]
- = scm_num2short (obj, SCM_ARG2, FUNC_NAME);
+ ((short *) SCM_UVECTOR_BASE (v))[pos] = scm_to_short (obj);
break;
#if SCM_SIZEOF_LONG_LONG != 0
case scm_tc7_llvect:
- ((long long *) SCM_UVECTOR_BASE (v))[pos]
- = scm_num2long_long (obj, SCM_ARG2, FUNC_NAME);
+ ((long long *) SCM_UVECTOR_BASE (v))[pos] = scm_to_long_long (obj);
break;
#endif
case scm_tc7_fvect:
@@ -2137,7 +2133,7 @@ SCM_DEFINE (scm_array_to_list, "array->list", 1, 0, 0,
{
short *data = (short *)SCM_VELTS(v);
for (k = SCM_UVECTOR_LENGTH(v) - 1; k >= 0; k--)
- res = scm_cons(scm_short2num (data[k]), res);
+ res = scm_cons (scm_from_short (data[k]), res);
return res;
}
#if SCM_SIZEOF_LONG_LONG != 0
@@ -2145,7 +2141,7 @@ SCM_DEFINE (scm_array_to_list, "array->list", 1, 0, 0,
{
long long *data = (long long *)SCM_VELTS(v);
for (k = SCM_UVECTOR_LENGTH(v) - 1; k >= 0; k--)
- res = scm_cons(scm_long_long2num(data[k]), res);
+ res = scm_cons(scm_from_long_long (data[k]), res);
return res;
}
#endif