diff options
-rw-r--r-- | libguile/alist.c | 8 | ||||
-rw-r--r-- | libguile/arbiters.c | 8 | ||||
-rw-r--r-- | libguile/continuations.c | 2 | ||||
-rw-r--r-- | libguile/debug.c | 12 | ||||
-rw-r--r-- | libguile/debug.h | 1 | ||||
-rw-r--r-- | libguile/filesys.c | 4 | ||||
-rw-r--r-- | libguile/fports.c | 5 | ||||
-rw-r--r-- | libguile/gsubr.c | 4 | ||||
-rw-r--r-- | libguile/kw.c | 6 | ||||
-rw-r--r-- | libguile/mallocs.c | 4 | ||||
-rw-r--r-- | libguile/numbers.c | 18 | ||||
-rw-r--r-- | libguile/numbers.h | 2 | ||||
-rw-r--r-- | libguile/pairs.c | 16 | ||||
-rw-r--r-- | libguile/posix.c | 8 | ||||
-rw-r--r-- | libguile/procprop.c | 4 | ||||
-rw-r--r-- | libguile/procs.c | 4 | ||||
-rw-r--r-- | libguile/procs.h | 4 | ||||
-rw-r--r-- | libguile/read.c | 20 | ||||
-rw-r--r-- | libguile/root.c | 2 | ||||
-rw-r--r-- | libguile/srcprop.c | 4 | ||||
-rw-r--r-- | libguile/strports.c | 8 | ||||
-rw-r--r-- | libguile/variable.c | 16 | ||||
-rw-r--r-- | libguile/vports.c | 2 |
23 files changed, 85 insertions, 77 deletions
diff --git a/libguile/alist.c b/libguile/alist.c index 1f778ac12..06ede611a 100644 --- a/libguile/alist.c +++ b/libguile/alist.c @@ -58,12 +58,12 @@ scm_acons (w, x, y) { register SCM z; SCM_NEWCELL (z); - SCM_CAR (z) = w; - SCM_CDR (z) = x; + SCM_SETCAR (z, w); + SCM_SETCDR (z, x); x = z; SCM_NEWCELL (z); - SCM_CAR (z) = x; - SCM_CDR (z) = y; + SCM_SETCAR (z, x); + SCM_SETCDR (z, y); return z; } diff --git a/libguile/arbiters.c b/libguile/arbiters.c index 480ad7451..292f4fec1 100644 --- a/libguile/arbiters.c +++ b/libguile/arbiters.c @@ -84,8 +84,8 @@ scm_make_arbiter (name) { register SCM z; SCM_NEWCELL (z); - SCM_CDR (z) = name; - SCM_CAR (z) = scm_tc16_arbiter; + SCM_SETCDR (z, name); + SCM_SETCAR (z, scm_tc16_arbiter); return z; } @@ -101,7 +101,7 @@ scm_try_arbiter (arb) arb = SCM_BOOL_F; else { - SCM_CAR (arb) = scm_tc16_arbiter | (1L << 16); + SCM_SETCAR (arb, scm_tc16_arbiter | (1L << 16)); arb = SCM_BOOL_T; } SCM_ALLOW_INTS; @@ -118,7 +118,7 @@ scm_release_arbiter (arb) SCM_ASSERT ((SCM_TYP16 (arb) == scm_tc16_arbiter), arb, SCM_ARG1, s_release_arbiter); if (!(SCM_CAR (arb) & (1L << 16))) return SCM_BOOL_F; - SCM_CAR (arb) = scm_tc16_arbiter; + SCM_SETCAR (arb, scm_tc16_arbiter); return SCM_BOOL_T; } diff --git a/libguile/continuations.c b/libguile/continuations.c index 678628a08..f04912c8a 100644 --- a/libguile/continuations.c +++ b/libguile/continuations.c @@ -69,7 +69,7 @@ scm_make_cont (answer) *answer = cont; SCM_DEFER_INTS; SCM_SETJMPBUF (cont, scm_must_malloc ((long) sizeof (scm_contregs), s_cont)); - SCM_CAR (cont) = scm_tc7_contin; + SCM_SETCAR (cont, scm_tc7_contin); SCM_DYNENV (cont) = scm_dynwinds; SCM_THROW_VALUE = SCM_EOL; SCM_BASE (cont) = SCM_BASE (rootcont); diff --git a/libguile/debug.c b/libguile/debug.c index dc54cb47c..b18c5165c 100644 --- a/libguile/debug.c +++ b/libguile/debug.c @@ -171,11 +171,11 @@ scm_make_memoized (exp, env) register SCM z, ans; SCM_DEFER_INTS; SCM_NEWCELL (z); - SCM_CAR (z) = exp; - SCM_CDR (z) = env; + SCM_SETCAR (z, exp); + SCM_SETCDR (z, env); SCM_NEWCELL (ans); - SCM_CAR (ans) = scm_tc16_memoized; - SCM_CDR (ans) = z; + SCM_SETCAR (ans, scm_tc16_memoized); + SCM_SETCDR (ans, z); SCM_ALLOW_INTS; return ans; } @@ -378,8 +378,8 @@ scm_make_debugobj (frame) register SCM z; SCM_DEFER_INTS; SCM_NEWCELL (z); - SCM_CAR (z) = scm_tc16_debugobj; - SCM_DEBUGOBJ_FRAME (z) = (SCM) frame; + SCM_SETCAR (z, scm_tc16_debugobj); + SCM_SET_DEBUGOBJ_FRAME (z, (SCM) frame); SCM_ALLOW_INTS; return z; } diff --git a/libguile/debug.h b/libguile/debug.h index 1f999fa24..fe9c56fff 100644 --- a/libguile/debug.h +++ b/libguile/debug.h @@ -166,6 +166,7 @@ extern long scm_tc16_debugobj; #define SCM_DEBUGOBJP(x) (scm_tc16_debugobj == SCM_TYP16 (x)) #define SCM_DEBUGOBJ_FRAME(x) SCM_CDR (x) +#define SCM_SET_DEBUGOBJ_FRAME(x, f) SCM_SETCDR (x, f) /* {Memoized Source} */ diff --git a/libguile/filesys.c b/libguile/filesys.c index 0e5408692..9a99d0c9e 100644 --- a/libguile/filesys.c +++ b/libguile/filesys.c @@ -719,7 +719,7 @@ scm_sys_opendir (dirname) SCM_SYSCALL (ds = opendir (SCM_CHARS (dirname))); if (ds == NULL) scm_syserror (s_sys_opendir); - SCM_CAR (dir) = scm_tc16_dir | SCM_OPN; + SCM_SETCAR (dir, scm_tc16_dir | SCM_OPN); SCM_SETCDR (dir, ds); SCM_ALLOW_INTS; return dir; @@ -777,7 +777,7 @@ scm_sys_closedir (port) SCM_SYSCALL (sts = closedir ((DIR *) SCM_CDR (port))); if (sts != 0) scm_syserror (s_sys_closedir); - SCM_CAR (port) = scm_tc16_dir; + SCM_SETCAR (port, scm_tc16_dir); SCM_ALLOW_INTS; return SCM_UNSPECIFIED; } diff --git a/libguile/fports.c b/libguile/fports.c index ddcf2e93f..874fce2ee 100644 --- a/libguile/fports.c +++ b/libguile/fports.c @@ -170,9 +170,10 @@ scm_open_file (filename, modes) pt = scm_add_to_port_table (port); SCM_SETPTAB_ENTRY (port, pt); - if (SCM_BUF0 & (SCM_CAR (port) = scm_tc16_fport | scm_mode_bits (mode))) + SCM_SETCAR (port, scm_tc16_fport | scm_mode_bits (mode)); + if (SCM_BUF0 & SCM_CAR (port)) scm_setbuf0 (port); - SCM_SETSTREAM (port, (SCM)f); + SCM_SETSTREAM (port, (SCM) f); SCM_PTAB_ENTRY (port)->file_name = filename; } SCM_ALLOW_INTS; diff --git a/libguile/gsubr.c b/libguile/gsubr.c index 3a4d21aec..b69a6c497 100644 --- a/libguile/gsubr.c +++ b/libguile/gsubr.c @@ -99,10 +99,10 @@ scm_make_gsubr(name, req, opt, rst, fcn) tmp = 0; SCM_NEWCELL(z); SCM_SUBRF(z) = fcn; - SCM_CAR(z) = tmp + scm_tc7_subr_0; + SCM_SETCAR (z, tmp + scm_tc7_subr_0); GSUBR_PROC(cclo) = z; GSUBR_TYPE(cclo) = SCM_MAKINUM(GSUBR_MAKTYPE(req, opt, rst)); - SCM_CDR(symcell) = cclo; + SCM_SETCDR (symcell, cclo); #ifdef DEBUG_EXTENSIONS if (SCM_REC_PROCNAMES_P) scm_set_procedure_property_x (cclo, scm_i_name, SCM_CAR (symcell)); diff --git a/libguile/kw.c b/libguile/kw.c index bb26a4a96..76ca88050 100644 --- a/libguile/kw.c +++ b/libguile/kw.c @@ -101,11 +101,11 @@ scm_make_keyword_from_dash_symbol (symbol) { SCM kw; SCM_NEWCELL(kw); - SCM_CAR(kw) = (SCM)scm_tc16_kw; - SCM_CDR(kw) = symbol; + SCM_SETCAR (kw, (SCM)scm_tc16_kw); + SCM_SETCDR (kw, symbol); scm_intern_symbol (scm_kw_obarray, symbol); vcell = scm_sym2ovcell_soft (symbol, scm_kw_obarray); - SCM_CDR (vcell) = kw; + SCM_SETCDR (vcell, kw); } SCM_ALLOW_INTS; return SCM_CDR (vcell); diff --git a/libguile/mallocs.c b/libguile/mallocs.c index 78dd76307..4201adca8 100644 --- a/libguile/mallocs.c +++ b/libguile/mallocs.c @@ -88,8 +88,8 @@ scm_malloc_obj (n) SCM_ALLOW_INTS; return SCM_BOOL_F; } - SCM_CDR (answer) = mem; - SCM_CAR (answer) = scm_tc16_malloc; + SCM_SETCDR (answer, mem); + SCM_SETCAR (answer, scm_tc16_malloc); SCM_ALLOW_INTS; return answer; } diff --git a/libguile/numbers.c b/libguile/numbers.c index 811eace6f..ec6b3af48 100644 --- a/libguile/numbers.c +++ b/libguile/numbers.c @@ -939,7 +939,7 @@ scm_addbig(x, nx, xsgn, bigy, sgny) } while (++i < nx); if (num && nx==ny) { num = 1; i = 0; - SCM_CAR(z) ^= 0x0100; + SCM_SETCAR (z, SCM_CAR (z) ^ 0x0100); do { num += (SCM_BIGRAD-1) - zds[i]; zds[i++] = SCM_BIGLO(num); @@ -1819,18 +1819,18 @@ scm_makdbl (x, y) if ((-FLTMAX < x) && (x < FLTMAX) && (fx==x)) # endif { - SCM_CAR(z) = scm_tc_flo; + SCM_SETCAR (z, scm_tc_flo); SCM_FLO(z) = x; SCM_ALLOW_INTS; return z; } # endif/* def SCM_SINGLES */ - SCM_CDR(z) = (SCM)scm_must_malloc(1L*sizeof(double), "real"); - SCM_CAR(z) = scm_tc_dblr; + SCM_SETCDR (z, (SCM)scm_must_malloc(1L*sizeof(double), "real")); + SCM_SETCAR (z, scm_tc_dblr); } else { - SCM_CDR(z) = (SCM)scm_must_malloc(2L*sizeof(double), "complex"); - SCM_CAR(z) = scm_tc_dblc; + SCM_SETCDR (z, (SCM)scm_must_malloc(2L*sizeof(double), "complex")); + SCM_SETCAR (z, scm_tc_dblc); SCM_IMAG(z) = y; } SCM_REAL(z) = x; @@ -3686,12 +3686,12 @@ scm_init_numbers () #ifdef SCM_FLOATS SCM_NEWCELL(scm_flo0); # ifdef SCM_SINGLES - SCM_CAR(scm_flo0) = scm_tc_flo; + SCM_SETCAR (scm_flo0, scm_tc_flo); SCM_FLO(scm_flo0) = 0.0; # else - SCM_CDR(scm_flo0) = (SCM)scm_must_malloc(1L*sizeof(double), "real"); + SCM_SETCDR (scm_flo0, (SCM)scm_must_malloc(1L*sizeof(double), "real")); SCM_REAL(scm_flo0) = 0.0; - SCM_CAR(scm_flo0) = scm_tc_dblr; + SCM_SETCAR (scm_flo0, scm_tc_dblr); # endif # ifdef DBL_DIG scm_dblprec = (DBL_DIG > 20) ? 20 : DBL_DIG; diff --git a/libguile/numbers.h b/libguile/numbers.h index 2f0c37ccc..f38e73e78 100644 --- a/libguile/numbers.h +++ b/libguile/numbers.h @@ -197,7 +197,7 @@ #define SCM_BIGSIGN(x) (0x0100 & (int)SCM_CAR(x)) #define SCM_BDIGITS(x) ((SCM_BIGDIG *)(SCM_CDR(x))) #define SCM_NUMDIGS(x) ((scm_sizet)(SCM_CAR(x)>>16)) -#define SCM_SETNUMDIGS(x, v, t) SCM_CAR(x) = (((v)+0L)<<16)+(t) +#define SCM_SETNUMDIGS(x, v, t) SCM_SETCAR(x, (((v)+0L)<<16)+(t)) #ifdef SCM_FLOATS diff --git a/libguile/pairs.c b/libguile/pairs.c index 02e9cc09d..619529e64 100644 --- a/libguile/pairs.c +++ b/libguile/pairs.c @@ -56,8 +56,8 @@ scm_cons (x, y) { register SCM z; SCM_NEWCELL (z); - SCM_CAR (z) = x; - SCM_CDR (z) = y; + SCM_SETCAR (z, x); + SCM_SETCDR (z, y); return z; } @@ -70,12 +70,12 @@ scm_cons2 (w, x, y) { register SCM z; SCM_NEWCELL (z); - SCM_CAR (z) = x; - SCM_CDR (z) = y; + SCM_SETCAR (z, x); + SCM_SETCDR (z, y); x = z; SCM_NEWCELL (z); - SCM_CAR (z) = w; - SCM_CDR (z) = x; + SCM_SETCAR (z, w); + SCM_SETCDR (z, x); return z; } @@ -98,7 +98,7 @@ scm_set_car_x(pair, value) SCM value; { SCM_ASSERT(SCM_NIMP(pair) && SCM_CONSP(pair), pair, SCM_ARG1, s_set_car_x); - SCM_CAR(pair) = value; + SCM_SETCAR (pair, value); return value; } @@ -110,7 +110,7 @@ scm_set_cdr_x(pair, value) SCM value; { SCM_ASSERT(SCM_NIMP(pair) && SCM_CONSP(pair), pair, SCM_ARG1, s_set_cdr_x); - SCM_CDR(pair) = value; + SCM_SETCDR (pair, value); return value; } diff --git a/libguile/posix.c b/libguile/posix.c index f3676fdd1..f352d0796 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -224,8 +224,8 @@ scm_sys_pipe () ptw = scm_add_to_port_table (p_wt); SCM_SETPTAB_ENTRY (p_rd, ptr); SCM_SETPTAB_ENTRY (p_wt, ptw); - SCM_CAR (p_rd) = scm_tc16_fport | scm_mode_bits ("r"); - SCM_CAR (p_wt) = scm_tc16_fport | scm_mode_bits ("w"); + SCM_SETCAR (p_rd, scm_tc16_fport | scm_mode_bits ("r")); + SCM_SETCAR (p_wt, scm_tc16_fport | scm_mode_bits ("w")); SCM_SETSTREAM (p_rd, (SCM)f_rd); SCM_SETSTREAM (p_wt, (SCM)f_wt); @@ -875,8 +875,8 @@ scm_open_pipe (pipestr, modes) scm_syserror (s_open_pipe); pt = scm_add_to_port_table (z); SCM_SETPTAB_ENTRY (z, pt); - SCM_CAR (z) = scm_tc16_pipe | SCM_OPN - | (strchr (SCM_ROCHARS (modes), 'r') ? SCM_RDNG : SCM_WRTNG); + SCM_SETCAR (z, scm_tc16_pipe | SCM_OPN + | (strchr (SCM_ROCHARS (modes), 'r') ? SCM_RDNG : SCM_WRTNG)); SCM_SETSTREAM (z, (SCM)f); SCM_ALLOW_INTS; return z; diff --git a/libguile/procprop.c b/libguile/procprop.c index 8b9ef9b3d..42ca7dbd9 100644 --- a/libguile/procprop.c +++ b/libguile/procprop.c @@ -88,7 +88,7 @@ scm_set_procedure_properties_x (proc, new_val) if (!(SCM_NIMP (proc) && SCM_CLOSUREP (proc))) proc = scm_stand_in_scm_proc(proc); SCM_ASSERT (SCM_NIMP (proc) && SCM_CLOSUREP (proc), proc, SCM_ARG1, s_set_procedure_properties_x); - SCM_PROCPROPS (proc) = new_val; + SCM_SETPROCPROPS (proc, new_val); return SCM_UNSPECIFIED; } @@ -123,7 +123,7 @@ scm_set_procedure_property_x (p, k, v) if (SCM_NIMP (assoc)) SCM_SETCDR (assoc, v); else - SCM_PROCPROPS (p) = scm_acons (k, v, SCM_PROCPROPS (p)); + SCM_SETPROCPROPS (p, scm_acons (k, v, SCM_PROCPROPS (p))); return SCM_UNSPECIFIED; } diff --git a/libguile/procs.c b/libguile/procs.c index 83cd3114a..5f4324d2d 100644 --- a/libguile/procs.c +++ b/libguile/procs.c @@ -67,9 +67,9 @@ scm_make_subr_opt (name, type, fcn, set) tmp = 0; SCM_NEWCELL (z); SCM_SUBRF (z) = fcn; - SCM_CAR (z) = tmp + type; + SCM_SETCAR (z, tmp + type); if (set) - SCM_CDR (symcell) = z; + SCM_SETCDR (symcell, z); return z; } diff --git a/libguile/procs.h b/libguile/procs.h index bc84e5168..50345e784 100644 --- a/libguile/procs.h +++ b/libguile/procs.h @@ -82,8 +82,10 @@ typedef struct scm_dsubr #define SCM_CLOSCAR(x) (SCM_CAR(x)-scm_tc3_closure) #define SCM_CODE(x) SCM_CAR(SCM_CLOSCAR (x)) #define SCM_PROCPROPS(x) SCM_CDR(SCM_CLOSCAR (x)) -#define SCM_SETCODE(x, e) SCM_CAR(x) = (scm_cons ((e), SCM_EOL) + scm_tc3_closure) +#define SCM_SETPROCPROPS(x, p) SCM_SETCDR(SCM_CLOSCAR (x), p) +#define SCM_SETCODE(x, e) (SCM_SETCAR (x, scm_cons ((e), SCM_EOL) + scm_tc3_closure)) #define SCM_ENV(x) SCM_CDR(x) +#define SCM_SETENV(x, e) SCM_SETCDR (x, e) #define SCM_TOP_LEVEL(SCM_ENV) (SCM_NULLP(SCM_ENV) || (SCM_BOOL_T == scm_procedure_p (SCM_CAR (SCM_ENV)))) diff --git a/libguile/read.c b/libguile/read.c index 5831a9553..7ef8151a2 100644 --- a/libguile/read.c +++ b/libguile/read.c @@ -213,12 +213,15 @@ recsexpr (obj, line, column, filename) copy = scm_cons (recsexpr (SCM_CAR (obj), line, column, filename), SCM_UNDEFINED); while (SCM_NIMP (tmp = SCM_CDR (tmp)) && SCM_CONSP (tmp)) - copy = (SCM_CDR (copy) = scm_cons (recsexpr (SCM_CAR (tmp), - line, - column, - filename), - SCM_UNDEFINED)); - SCM_CDR (copy) = tmp; + { + SCM_SETCDR (copy, scm_cons (recsexpr (SCM_CAR (tmp), + line, + column, + filename), + SCM_UNDEFINED)); + copy = SCM_CDR (copy); + } + SCM_SETCDR (copy, tmp); } else { @@ -641,10 +644,11 @@ scm_lreadparen (tok_buf, port, name, case_i, sharp, copy) scm_gen_ungetc (c, port); if (scm_i_dot == (tmp = scm_lreadr (tok_buf, port, case_i, sharp, copy))) { - SCM_CDR (tl) = scm_lreadr (tok_buf, port, case_i, sharp, copy); + SCM_SETCDR (tl, scm_lreadr (tok_buf, port, case_i, sharp, copy)); goto closeit; } - tl = (SCM_CDR (tl) = scm_cons (tmp, SCM_EOL)); + SCM_SETCDR (tl, scm_cons (tmp, SCM_EOL)); + tl = SCM_CDR (tl); } return ans; } diff --git a/libguile/root.c b/libguile/root.c index 9b620dd1e..104869969 100644 --- a/libguile/root.c +++ b/libguile/root.c @@ -193,7 +193,7 @@ cwdr (proc, a1, args, handler, stack_start) SCM_SETJMPBUF (new_rootcont, scm_must_malloc ((long) sizeof (scm_contregs), "inferior root continuation")); - SCM_CAR (new_rootcont) = scm_tc7_contin; + SCM_SETCAR (new_rootcont, scm_tc7_contin); SCM_DYNENV (new_rootcont) = SCM_EOL; SCM_BASE (new_rootcont) = stack_start; SCM_SEQ (new_rootcont) = ++n_dynamic_roots; diff --git a/libguile/srcprop.c b/libguile/srcprop.c index 07d7fd137..86705826f 100644 --- a/libguile/srcprop.c +++ b/libguile/srcprop.c @@ -157,12 +157,12 @@ scm_make_srcprops (line, col, filename, copy, plist) srcprops_freelist = (scm_srcprops *) &ptr[1]; } SCM_NEWCELL (ans); - SCM_CAR (ans) = scm_tc16_srcprops; + SCM_SETCAR (ans, scm_tc16_srcprops); ptr->pos = SRCPROPMAKPOS (line, col); ptr->fname = filename; ptr->copy = copy; ptr->plist = plist; - SCM_CDR (ans) = (SCM) ptr; + SCM_SETCDR (ans, (SCM) ptr); SCM_ALLOW_INTS; return ans; } diff --git a/libguile/strports.c b/libguile/strports.c index e3f228f7a..ae9e53e86 100644 --- a/libguile/strports.c +++ b/libguile/strports.c @@ -84,7 +84,7 @@ stputc (c, p) scm_vector_set_length_x (SCM_CDR (p), SCM_MAKINUM (ind + (ind >> 1))); SCM_ALLOW_INTS; SCM_CHARS (SCM_CDR (p))[ind] = c; - SCM_CAR (p) = SCM_MAKINUM (ind + 1); + SCM_SETCAR (p, SCM_MAKINUM (ind + 1)); return c; } @@ -108,7 +108,7 @@ stwrite (str, siz, num, p) dst = &(SCM_CHARS (SCM_CDR (p))[ind]); while (len--) dst[len] = str[len]; - SCM_CAR (p) = SCM_MAKINUM (ind + siz * num); + SCM_SETCAR (p, SCM_MAKINUM (ind + siz * num)); return num; } @@ -134,7 +134,7 @@ stgetc (p) scm_sizet ind = SCM_INUM (SCM_CAR (p)); if (ind >= SCM_ROLENGTH (SCM_CDR (p))) return EOF; - SCM_CAR (p) = SCM_MAKINUM (ind + 1); + SCM_SETCAR (p, SCM_MAKINUM (ind + 1)); return SCM_ROUCHARS (SCM_CDR (p))[ind]; } @@ -156,7 +156,7 @@ scm_mkstrport (pos, str, modes, caller) SCM_NEWCELL (z); SCM_DEFER_INTS; pt = scm_add_to_port_table (z); - SCM_CAR (z) = scm_tc16_strport | modes; + SCM_SETCAR (z, scm_tc16_strport | modes); SCM_SETPTAB_ENTRY (z, pt); SCM_SETSTREAM (z, stream); SCM_ALLOW_INTS; diff --git a/libguile/variable.c b/libguile/variable.c index 777c5a9bc..692219c0a 100644 --- a/libguile/variable.c +++ b/libguile/variable.c @@ -113,8 +113,8 @@ make_vcell_variable (vcell) SCM answer; SCM_NEWCELL(answer); SCM_REDEFER_INTS; - SCM_CAR(answer) = scm_tc16_variable; - SCM_CDR(answer) = vcell; + SCM_SETCAR (answer, scm_tc16_variable); + SCM_SETCDR (answer, vcell); SCM_REALLOW_INTS; return answer; } @@ -133,8 +133,8 @@ scm_make_variable (init, name_hint) SCM_NEWCELL(val_cell); SCM_DEFER_INTS; - SCM_CAR(val_cell) = name_hint; - SCM_CDR(val_cell) = init; + SCM_SETCAR (val_cell, name_hint); + SCM_SETCDR (val_cell, init); SCM_ALLOW_INTS; return make_vcell_variable (val_cell); } @@ -153,8 +153,8 @@ scm_make_undefined_variable (name_hint) SCM_NEWCELL (vcell); SCM_DEFER_INTS; - SCM_CAR (vcell) = name_hint; - SCM_CDR (vcell) = SCM_UNDEFINED; + SCM_SETCAR (vcell, name_hint); + SCM_SETCDR (vcell, SCM_UNDEFINED); SCM_ALLOW_INTS; return make_vcell_variable (vcell); } @@ -192,7 +192,7 @@ scm_variable_set_x (var, val) SCM val; { SCM_ASSERT (SCM_NIMP(var) && SCM_VARIABLEP (var), var, SCM_ARG1, s_variable_set_x); - SCM_CDR (SCM_CDR (var)) = val; + SCM_SETCDR (SCM_CDR (var), val); return SCM_UNSPECIFIED; } @@ -217,7 +217,7 @@ scm_builtin_variable (name) SCM_DEFER_INTS; if ( SCM_IMP (SCM_CDR (var_slot)) || (SCM_VARVCELL (var_slot) != vcell)) - SCM_CDR (var_slot) = make_vcell_variable (vcell); + SCM_SETCDR (var_slot, make_vcell_variable (vcell)); SCM_ALLOW_INTS; return SCM_CDR (var_slot); diff --git a/libguile/vports.c b/libguile/vports.c index b9fae4e5d..89e398e98 100644 --- a/libguile/vports.c +++ b/libguile/vports.c @@ -184,7 +184,7 @@ scm_make_soft_port (pv, modes) SCM_NEWCELL (z); SCM_DEFER_INTS; pt = scm_add_to_port_table (z); - SCM_CAR (z) = scm_tc16_sfport | scm_mode_bits (SCM_CHARS (modes)); + SCM_SETCAR (z, scm_tc16_sfport | scm_mode_bits (SCM_CHARS (modes))); SCM_SETPTAB_ENTRY (z, pt); SCM_SETSTREAM (z, pv); SCM_ALLOW_INTS; |