diff options
author | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2000-03-12 17:00:58 +0000 |
---|---|---|
committer | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2000-03-12 17:00:58 +0000 |
commit | 413cb56ff4080de5676a2756b670bcdd81af3334 (patch) | |
tree | 2c0bbcce260b66b0ed2f43a0c939d48c472ab33c /libguile/objects.c | |
parent | 244fdc2f4be27a42fa0a8ffb06a57b441ac9c690 (diff) | |
download | guile-413cb56ff4080de5676a2756b670bcdd81af3334.tar.gz |
* async.c, boolean.h, debug.c, dynl.c, dynwind.c, eval.c, eval.h,
feature.h, filesys.h, fluids.h, fports.c, fports.h, gc.c, gc.h,
hash.c, keywords.h, macros.c, numbers.c, numbers.h, objects.c,
objects.h, options.c, pairs.h, ports.c, ports.h, print.c,
procs.h, ramap.c, read.c, smob.c, smob.h, srcprop.h, stacks.c,
stacks.h, strports.c, struct.c, struct.h, tag.c, tags.h,
throw.c, unif.c, unif.h, variable.h, vectors.h, weaks.c,
weaks.h (SCM_SCM, SCM_BITS, SCM_CARBITS): Renamed from
SCM_ASSCM, SCM_ASWORD, SCM_CARW).
Diffstat (limited to 'libguile/objects.c')
-rw-r--r-- | libguile/objects.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/objects.c b/libguile/objects.c index 2d52b0b93..416e58fdc 100644 --- a/libguile/objects.c +++ b/libguile/objects.c @@ -160,7 +160,7 @@ scm_class_of (SCM x) long type = SCM_TYP16 (x); if (type == scm_tc16_flo) { - if (SCM_CARW (x) & SCM_IMAG_PART) + if (SCM_CARBITS (x) & SCM_IMAG_PART) return scm_class_complex; else return scm_class_real; @@ -171,8 +171,8 @@ scm_class_of (SCM x) /* fall through to ports */ } case scm_tc7_port: - return scm_port_class[(SCM_WRTNG & SCM_CARW (x) - ? (SCM_RDNG & SCM_CARW (x) + return scm_port_class[(SCM_WRTNG & SCM_CARBITS (x) + ? (SCM_RDNG & SCM_CARBITS (x) ? SCM_INOUT_PCLASS_INDEX | SCM_PTOBNUM (x) : SCM_OUT_PCLASS_INDEX | SCM_PTOBNUM (x)) : SCM_IN_PCLASS_INDEX | SCM_PTOBNUM (x))]; @@ -280,7 +280,7 @@ scm_mcache_lookup_cmethod (SCM cache, SCM args) if (SCM_NIMP (ls)) do { - i += SCM_ASWORD (SCM_STRUCT_DATA (scm_class_of (SCM_CAR (ls))) + i += SCM_BITS (SCM_STRUCT_DATA (scm_class_of (SCM_CAR (ls))) [scm_si_hashsets + hashset]); ls = SCM_CDR (ls); } |