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/environments.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/environments.c')
-rw-r--r-- | libguile/environments.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libguile/environments.c b/libguile/environments.c index 6ad9d51d2..5448c9294 100644 --- a/libguile/environments.c +++ b/libguile/environments.c @@ -480,7 +480,7 @@ observer_mark (SCM observer) static int observer_print (SCM type, SCM port, scm_print_state *pstate SCM_UNUSED) { - SCM address = scm_ulong2num (SCM_UNPACK (type)); + SCM address = scm_from_size_t (SCM_UNPACK (type)); SCM base16 = scm_number_to_string (address, scm_from_int (16)); scm_puts ("#<observer ", port); @@ -978,7 +978,7 @@ leaf_environment_free (SCM env) static int leaf_environment_print (SCM type, SCM port, scm_print_state *pstate SCM_UNUSED) { - SCM address = scm_ulong2num (SCM_UNPACK (type)); + SCM address = scm_from_size_t (SCM_UNPACK (type)); SCM base16 = scm_number_to_string (address, scm_from_int (16)); scm_puts ("#<leaf environment ", port); @@ -1220,7 +1220,7 @@ eval_environment_folder (SCM extended_data, SCM symbol, SCM value, SCM tail) if (!SCM_ENVIRONMENT_BOUND_P (local, symbol)) { SCM proc_as_nr = SCM_CADR (extended_data); - unsigned long int proc_as_ul = scm_num2ulong (proc_as_nr, 0, NULL); + unsigned long int proc_as_ul = scm_to_ulong (proc_as_nr); scm_environment_folder proc = (scm_environment_folder) proc_as_ul; SCM data = SCM_CDDR (extended_data); @@ -1238,7 +1238,7 @@ eval_environment_fold (SCM env, scm_environment_folder proc, SCM data, SCM init) { SCM local = EVAL_ENVIRONMENT (env)->local; SCM imported = EVAL_ENVIRONMENT (env)->imported; - SCM proc_as_nr = scm_ulong2num ((unsigned long int) proc); + SCM proc_as_nr = scm_from_ulong ((unsigned long) proc); SCM extended_data = scm_cons2 (local, proc_as_nr, data); SCM tmp_result = scm_c_environment_fold (imported, eval_environment_folder, extended_data, init); @@ -1338,7 +1338,7 @@ eval_environment_free (SCM env) static int eval_environment_print (SCM type, SCM port, scm_print_state *pstate SCM_UNUSED) { - SCM address = scm_ulong2num (SCM_UNPACK (type)); + SCM address = scm_from_size_t (SCM_UNPACK (type)); SCM base16 = scm_number_to_string (address, scm_from_int (16)); scm_puts ("#<eval environment ", port); @@ -1625,7 +1625,7 @@ import_environment_folder (SCM extended_data, SCM symbol, SCM value, SCM tail) SCM imported_env = SCM_CADR (extended_data); SCM owner = import_environment_lookup (import_env, symbol); SCM proc_as_nr = SCM_CADDR (extended_data); - unsigned long int proc_as_ul = scm_num2ulong (proc_as_nr, 0, NULL); + unsigned long int proc_as_ul = scm_to_ulong (proc_as_nr); scm_environment_folder proc = (scm_environment_folder) proc_as_ul; SCM data = SCM_CDDDR (extended_data); @@ -1643,7 +1643,7 @@ import_environment_folder (SCM extended_data, SCM symbol, SCM value, SCM tail) static SCM import_environment_fold (SCM env, scm_environment_folder proc, SCM data, SCM init) { - SCM proc_as_nr = scm_ulong2num ((unsigned long int) proc); + SCM proc_as_nr = scm_from_ulong ((unsigned long) proc); SCM result = init; SCM l; @@ -1757,7 +1757,7 @@ static int import_environment_print (SCM type, SCM port, scm_print_state *pstate SCM_UNUSED) { - SCM address = scm_ulong2num (SCM_UNPACK (type)); + SCM address = scm_from_size_t (SCM_UNPACK (type)); SCM base16 = scm_number_to_string (address, scm_from_int (16)); scm_puts ("#<import environment ", port); @@ -2062,7 +2062,7 @@ static int export_environment_print (SCM type, SCM port, scm_print_state *pstate SCM_UNUSED) { - SCM address = scm_ulong2num (SCM_UNPACK (type)); + SCM address = scm_from_size_t (SCM_UNPACK (type)); SCM base16 = scm_number_to_string (address, scm_from_int (16)); scm_puts ("#<export environment ", port); |