mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-01 04:10:18 +02:00
Code Activity

*.[ch]: make a distinction between SCM as a generic

Browse source 
name for a Scheme object (now a void*), and SCM as 32 bit word for
storing tags and immediates (now a long int).  Introduced
SCM_ASWORD and SCM_ASSCM for conversion. Fixed various dubious
code in the process: arbiter.c (use macros), unif.c (scm_array_p),
This commit is contained in:
Greg J. Badros 2000-03-09 18:58:58 +00:00
parent df8bb2dc39
commit c209c88e54
53 changed files with 1371 additions and 1361 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libguile/objects.c
View file

@ -157,10 +157,10 @@ scm_class_of (SCM x)
case scm_tc7_smob:
{
SCM type = SCM_TYP16 (x);
long type = SCM_TYP16 (x);
if (type == scm_tc16_flo)
{
if (SCM_CAR (x) & SCM_IMAG_PART)
if (SCM_CARW (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_CAR (x)
? (SCM_RDNG & SCM_CAR (x)
return scm_port_class[(SCM_WRTNG & SCM_CARW (x)
? (SCM_RDNG & SCM_CARW (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_STRUCT_DATA (scm_class_of (SCM_CAR (ls)))
i += SCM_ASWORD (SCM_STRUCT_DATA (scm_class_of (SCM_CAR (ls)))
[scm_si_hashsets + hashset]);
ls = SCM_CDR (ls);
}