diff options
author | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2000-03-12 18:30:33 +0000 |
---|---|---|
committer | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2000-03-12 18:30:33 +0000 |
commit | f12677062e15015d7ef7d36fe3d103a77d1fefca (patch) | |
tree | e9ec3a99d2037b92f5c0c95e2a5b6e234b7ebb9d /libguile/objects.c | |
parent | 67673f7594ecd4768b9e6db847949406a9e10091 (diff) | |
download | guile-f12677062e15015d7ef7d36fe3d103a77d1fefca.tar.gz |
*** empty log message ***
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 416e58fdc..5026f3b66 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_CARBITS (x) & SCM_IMAG_PART) + if (SCM_UNPACK_CAR (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_CARBITS (x) - ? (SCM_RDNG & SCM_CARBITS (x) + return scm_port_class[(SCM_WRTNG & SCM_UNPACK_CAR (x) + ? (SCM_RDNG & SCM_UNPACK_CAR (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_BITS (SCM_STRUCT_DATA (scm_class_of (SCM_CAR (ls))) + i += SCM_UNPACK (SCM_STRUCT_DATA (scm_class_of (SCM_CAR (ls))) [scm_si_hashsets + hashset]); ls = SCM_CDR (ls); } |