diff options
| author | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2000-03-27 12:42:16 +0000 |
|---|---|---|
| committer | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2000-03-27 12:42:16 +0000 |
| commit | 76a369d95d5bf8291d5641efe84c879d017b2b53 (patch) | |
| tree | 8728fedaf9d3ba63b1805a0b05548d91f1526121 /libguile/pairs.h | |
| parent | 2549a7096d2443b3f581ca7bffa4ece1d07894c0 (diff) | |
| download | guile-76a369d95d5bf8291d5641efe84c879d017b2b53.tar.gz | |
* SCM_C[AD]R and SCM_SETC[AD]R use SCM_{SET_}?OBJECT now.
* Moved SCM_GCCDR from pairs.h to tags.h.
Diffstat (limited to 'libguile/pairs.h')
| -rw-r--r-- | libguile/pairs.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libguile/pairs.h b/libguile/pairs.h index 90c88e043..b07225698 100644 --- a/libguile/pairs.h +++ b/libguile/pairs.h @@ -55,11 +55,11 @@ #define SCM_NULLP(x) (SCM_EOL == (x)) #define SCM_NNULLP(x) (SCM_EOL != (x)) -#define SCM_CAR(x) (((scm_cell *) (SCM2PTR (x)))->car) -#define SCM_CDR(x) (((scm_cell *) (SCM2PTR (x)))->cdr) -#define SCM_GCCDR(x) SCM_PACK(~1L & SCM_UNPACK (SCM_CDR (x))) -#define SCM_SETCAR(x, v) (SCM_CAR (x) = SCM_PACK (v)) -#define SCM_SETCDR(x, v) (SCM_CDR (x) = SCM_PACK (v)) +#define SCM_CAR(x) (SCM_CELL_OBJECT_0 (x)) +#define SCM_CDR(x) (SCM_CELL_OBJECT_1 (x)) + +#define SCM_SETCAR(x, v) (SCM_SET_CELL_OBJECT_0 ((x), (v))) +#define SCM_SETCDR(x, v) (SCM_SET_CELL_OBJECT_1 ((x), (v))) #define SCM_CAAR(OBJ) SCM_CAR (SCM_CAR (OBJ)) #define SCM_CDAR(OBJ) SCM_CDR (SCM_CAR (OBJ)) |