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/ioext.c | |
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/ioext.c')
-rw-r--r-- | libguile/ioext.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libguile/ioext.c b/libguile/ioext.c index 221b72fab..0cc53ecc7 100644 --- a/libguile/ioext.c +++ b/libguile/ioext.c @@ -116,14 +116,15 @@ scm_sys_freopen (filename, modes, port) SCM p; p = port; port = SCM_MAKINUM (errno); - SCM_CAR (p) &= ~SCM_OPN; + SCM_SETAND_CAR (p, ~SCM_OPN); scm_remove_from_port_table (p); } else { - SCM_CAR (port) = scm_tc16_fport | scm_mode_bits (SCM_CHARS (modes)); + SCM_SETCAR (port, scm_tc16_fport | scm_mode_bits (SCM_CHARS (modes))); SCM_SETSTREAM (port, (SCM)f); - if (SCM_BUF0 & (SCM_CAR (port) = scm_tc16_fport | scm_mode_bits (SCM_CHARS (modes)))) + SCM_SETCAR (port, scm_tc16_fport | scm_mode_bits (SCM_CHARS (modes))); + if (SCM_BUF0 & SCM_CAR (port)) scm_setbuf0 (port); } SCM_ALLOW_INTS; @@ -163,7 +164,8 @@ scm_sys_duplicate_port (oldpt, modes) struct scm_port_table * pt; pt = scm_add_to_port_table (newpt); SCM_SETPTAB_ENTRY (newpt, pt); - if (SCM_BUF0 & (SCM_CAR (newpt) = scm_tc16_fport | scm_mode_bits (SCM_CHARS (modes)))) + SCM_SETCAR (newpt, scm_tc16_fport | scm_mode_bits (SCM_CHARS (modes))); + if (SCM_BUF0 & SCM_CAR (newpt)) scm_setbuf0 (newpt); SCM_SETSTREAM (newpt, (SCM)f); SCM_PTAB_ENTRY (newpt)->file_name = SCM_PTAB_ENTRY (oldpt)->file_name; @@ -249,8 +251,8 @@ scm_sys_fdopen (fdes, modes) scm_syserror (s_sys_fdopen); pt = scm_add_to_port_table (port); SCM_SETPTAB_ENTRY (port, pt); - if (SCM_BUF0 & (SCM_CAR (port) = scm_tc16_fport - | scm_mode_bits (SCM_CHARS (modes)))) + SCM_SETCAR (port, scm_tc16_fport | scm_mode_bits (SCM_CHARS (modes))); + if (SCM_BUF0 & SCM_CAR (port)) scm_setbuf0 (port); SCM_SETSTREAM (port, (SCM)f); SCM_ALLOW_INTS; |