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/struct.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/struct.c')
-rw-r--r-- | libguile/struct.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libguile/struct.c b/libguile/struct.c index 6535064fd..dac3ae5ab 100644 --- a/libguile/struct.c +++ b/libguile/struct.c @@ -163,7 +163,7 @@ scm_struct_init (SCM handle, SCM layout, scm_t_bits * mem, int tail_elts, SCM in *mem = 0; else { - *mem = scm_num2long (SCM_CAR (inits), SCM_ARGn, "scm_struct_init"); + *mem = scm_to_long (SCM_CAR (inits)); inits = SCM_CDR (inits); } break; @@ -174,9 +174,7 @@ scm_struct_init (SCM handle, SCM layout, scm_t_bits * mem, int tail_elts, SCM in *mem = 0; else { - *mem = scm_num2ulong (SCM_CAR (inits), - SCM_ARGn, - "scm_struct_init"); + *mem = scm_to_ulong (SCM_CAR (inits)); inits = SCM_CDR (inits); } break; @@ -577,12 +575,12 @@ SCM_DEFINE (scm_struct_ref, "struct-ref", 2, 0, 0, switch (field_type) { case 'u': - answer = scm_ulong2num (data[p]); + answer = scm_from_ulong (data[p]); break; #if 0 case 'i': - answer = scm_long2num (data[p]); + answer = scm_from_long (data[p]); break; case 'd': @@ -694,7 +692,7 @@ SCM_DEFINE (scm_struct_vtable_tag, "struct-vtable-tag", 1, 0, 0, #define FUNC_NAME s_scm_struct_vtable_tag { SCM_VALIDATE_VTABLE (1, handle); - return scm_long2num ((long) SCM_STRUCT_DATA (handle) >> 3); + return scm_from_ulong (((unsigned long)SCM_STRUCT_DATA (handle)) >> 3); } #undef FUNC_NAME |