diff options
author | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 1996-10-20 03:28:34 +0000 |
---|---|---|
committer | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 1996-10-20 03:28:34 +0000 |
commit | 898a256f9156643b4ceb275776372ee4380b8df1 (patch) | |
tree | fad48588aa635930dd21135883d0db9bcf6fab91 /libguile/srcprop.h | |
parent | 3f46d9597804cda1f9d92ef239007b3b8b35ddb8 (diff) | |
download | guile-898a256f9156643b4ceb275776372ee4380b8df1.tar.gz |
* pairs.h, eval.c, gc.c, init.c, ioext.c, ports.c, ports.h,
srcprop.h, tags.h, throw.c, unif.c: Added new selectors
SCM_SETAND_CAR, SCM_SETAND_CDR, SCM_SETOR_CAR and SCM_SETOR_CDR.
Motivation: Safer use. Some other macros are defined in terms of
these operations. If these are defined using the SCM_SETCXR
(<e1>, SCM_CXR (<e1>) <op> <e2>) pattern a complex <e1> will lead
to inefficiency and an <e1> with side-effects could potentially
break. Also, these particular operations are heavily utilized in
the garbage collector. In unoptimized code there will be a
measurable speedup.
* alist.c, arbiters.c, continuations.c, debug.c, debug.h, eval.c,
eval.h, feature.c, filesys.c, fports.c, gc.c, gsubr.c, init.c,
ioext.c, kw.c, list.c, load.c, mallocs.c, numbers.c, numbers.h,
pairs.c, pairs.h, ports.c, ports.h, posix.c, procprop.c, procs.c,
procs.h, ramap.c, read.c, root.c, srcprop.c, srcprop.h,
strports.c, symbols.c, tags.h, throw.c, unif.c, variable.c,
vports.c: Cleaned up use of pairs: Don't make any special
assumptions about the internal structure of selectors and
mutators: SCM_CXR (<e1>) = <e2> --> SCM_SETCXR (<e1>, <e2>),
SCM_CXR (<e1>) &= <e2> --> SCM_SETAND_CXR (<e1>, <e2>) etc.
(Among other things, this change makes it easier to build Guile
with certain compilers which have problems with casted lvalues.)
Diffstat (limited to 'libguile/srcprop.h')
-rw-r--r-- | libguile/srcprop.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/srcprop.h b/libguile/srcprop.h index a5924d737..ae9358b0c 100644 --- a/libguile/srcprop.h +++ b/libguile/srcprop.h @@ -100,8 +100,8 @@ typedef struct scm_srcprops_chunk #define SRCPROPFNAME(p) ((scm_srcprops *) SCM_CDR (p))->fname #define SRCPROPCOPY(p) ((scm_srcprops *) SCM_CDR (p))->copy #define SRCPROPPLIST(p) ((scm_srcprops *) SCM_CDR (p))->plist -#define SETSRCPROPBRK(p) (SCM_CAR (p) = SCM_CAR (p) | (1L << 16)) -#define CLEARSRCPROPBRK(p) (SCM_CAR (p) = SCM_CAR (p) & ~(1L << 16)) +#define SETSRCPROPBRK(p) (SCM_SETOR_CAR (p, (1L << 16))) +#define CLEARSRCPROPBRK(p) SCM_SETAND_CAR (p, ~(1L << 16)) #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)) |