diff options
| author | Marius Vollmer <mvo@zagadka.de> | 2004-05-06 16:43:14 +0000 |
|---|---|---|
| committer | Marius Vollmer <mvo@zagadka.de> | 2004-05-06 16:43:14 +0000 |
| commit | f5710d53b1a67d7b965701b4b34004b9db1a6813 (patch) | |
| tree | e6e4e2a562a827adba4f3c374c1152016dd6b68c /libguile/srcprop.h | |
| parent | 41a2f6fc0c62afeb09bd7fbae4e9eca794c26bbe (diff) | |
| download | guile-f5710d53b1a67d7b965701b4b34004b9db1a6813.tar.gz | |
Use SCM_SMOB_* instead of SCM_CELL_* as appropriate. Use
SCM_SMOB_FLAGS and SCM_SET_SMOB_FLAGS instead of accessing the
zeroth word directly. Use SCM_SMOB_PREDICATE as appropriate.
Diffstat (limited to 'libguile/srcprop.h')
| -rw-r--r-- | libguile/srcprop.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libguile/srcprop.h b/libguile/srcprop.h index 2b9f08fda..bd6918bf4 100644 --- a/libguile/srcprop.h +++ b/libguile/srcprop.h @@ -67,22 +67,22 @@ typedef struct scm_t_srcprops_chunk scm_t_srcprops srcprops[1]; } scm_t_srcprops_chunk; -#define SCM_SOURCE_PROPERTY_FLAG_BREAK (1L << 16) +#define SCM_SOURCE_PROPERTY_FLAG_BREAK 1 -#define SRCPROPSP(p) (SCM_TYP16_PREDICATE (scm_tc16_srcprops, p)) -#define SRCPROPBRK(p) (SCM_CELL_WORD_0 (p) & SCM_SOURCE_PROPERTY_FLAG_BREAK) -#define SRCPROPPOS(p) ((scm_t_srcprops *) SCM_CELL_WORD_1 (p))->pos +#define SRCPROPSP(p) (SCM_SMOB_PREDICATE (scm_tc16_srcprops, (p))) +#define SRCPROPBRK(p) (SCM_SMOB_FLAGS (p) & SCM_SOURCE_PROPERTY_FLAG_BREAK) +#define SRCPROPPOS(p) ((scm_t_srcprops *) SCM_SMOB_DATA (p))->pos #define SRCPROPLINE(p) (SRCPROPPOS(p) >> 12) #define SRCPROPCOL(p) (SRCPROPPOS(p) & 0x0fffL) -#define SRCPROPFNAME(p) ((scm_t_srcprops *) SCM_CELL_WORD_1 (p))->fname -#define SRCPROPCOPY(p) ((scm_t_srcprops *) SCM_CELL_WORD_1 (p))->copy -#define SRCPROPPLIST(p) ((scm_t_srcprops *) SCM_CELL_WORD_1 (p))->plist +#define SRCPROPFNAME(p) ((scm_t_srcprops *) SCM_SMOB_DATA (p))->fname +#define SRCPROPCOPY(p) ((scm_t_srcprops *) SCM_SMOB_DATA (p))->copy +#define SRCPROPPLIST(p) ((scm_t_srcprops *) SCM_SMOB_DATA (p))->plist #define SETSRCPROPBRK(p) \ - (SCM_SET_CELL_WORD_0 ((p), SCM_CELL_WORD_0 (p) \ - | SCM_SOURCE_PROPERTY_FLAG_BREAK)) + (SCM_SET_SMOB_FLAGS ((p), \ + SCM_SMOB_FLAGS (p) | SCM_SOURCE_PROPERTY_FLAG_BREAK)) #define CLEARSRCPROPBRK(p) \ - (SCM_SET_CELL_WORD_0 ((p), SCM_CELL_WORD_0 (p) \ - & ~SCM_SOURCE_PROPERTY_FLAG_BREAK)) + (SCM_SET_SMOB_FLAGS ((p), \ + SCM_SMOB_FLAGS (p) & ~SCM_SOURCE_PROPERTY_FLAG_BREAK)) #define SRCPROPMAKPOS(l, c) (((l) << 12) + (c)) #define SETSRCPROPPOS(p, l, c) (SRCPROPPOS (p) = SRCPROPMAKPOS (l, c)) #define SETSRCPROPLINE(p, l) SETSRCPROPPOS (p, l, SRCPROPCOL (p)) |