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/pairs.h | |
| parent | 244fdc2f4be27a42fa0a8ffb06a57b441ac9c690 (diff) | |
* 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/pairs.h')
| -rw-r--r-- | libguile/pairs.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libguile/pairs.h b/libguile/pairs.h index e74c855a2..38e9a0523 100644 --- a/libguile/pairs.h +++ b/libguile/pairs.h @@ -104,21 +104,21 @@ typedef SCM huge *SCMPTR; #define SCM_CAR(x) (((scm_cell *)(SCM2PTR(x)))->car) #define SCM_CDR(x) (((scm_cell *)(SCM2PTR(x)))->cdr) -#define SCM_GCCDR(x) SCM_ASSCM(~1L & SCM_ASWORD (SCM_CDR(x))) -#define SCM_SETCAR(x, v) (SCM_CAR(x) = SCM_ASSCM(v)) -#define SCM_SETCDR(x, v) (SCM_CDR(x) = SCM_ASSCM(v)) +#define SCM_GCCDR(x) SCM_SCM(~1L & SCM_BITS (SCM_CDR(x))) +#define SCM_SETCAR(x, v) (SCM_CAR(x) = SCM_SCM(v)) +#define SCM_SETCDR(x, v) (SCM_CDR(x) = SCM_SCM(v)) #define SCM_CARLOC(x) (&SCM_CAR (x)) #define SCM_CDRLOC(x) (&SCM_CDR (x)) #define SCM_SETAND_CAR(x, y)\ - (SCM_CAR (x) = SCM_ASSCM (SCM_ASWORD (SCM_CAR (x)) & (y))) + (SCM_CAR (x) = SCM_SCM (SCM_BITS (SCM_CAR (x)) & (y))) #define SCM_SETAND_CDR(x, y)\ - (SCM_CDR (x) = SCM_ASSCM (SCM_ASWORD (SCM_CDR (x)) & (y))) + (SCM_CDR (x) = SCM_SCM (SCM_BITS (SCM_CDR (x)) & (y))) #define SCM_SETOR_CAR(x, y)\ - (SCM_CAR (x) = SCM_ASSCM (SCM_ASWORD (SCM_CAR (x)) | (y))) + (SCM_CAR (x) = SCM_SCM (SCM_BITS (SCM_CAR (x)) | (y))) #define SCM_SETOR_CDR(x, y)\ - (SCM_CDR (x) = SCM_ASSCM (SCM_ASWORD (SCM_CDR (x)) | (y))) + (SCM_CDR (x) = SCM_SCM (SCM_BITS (SCM_CDR (x)) | (y))) #define SCM_CAAR(OBJ) SCM_CAR (SCM_CAR (OBJ)) #define SCM_CDAR(OBJ) SCM_CDR (SCM_CAR (OBJ)) |