Merge branch 'master' into boehm-demers-weiser-gc

[bpt/guile.git] / libguile / srcprop.c

diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index e3691d4..ed36127 100644 (file)
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -85,6 +85,8 @@ SCM_GLOBAL_SYMBOL (scm_sym_breakpoint, "breakpoint");
 #define SETSRCPROPPOS(p, l, c) (SCM_SET_CELL_WORD(p,1, SRCPROPMAKPOS (l, c)))
 #define SETSRCPROPLINE(p, l) SETSRCPROPPOS (p, l, SRCPROPCOL (p))
 #define SETSRCPROPCOL(p, c) SETSRCPROPPOS (p, SRCPROPLINE (p), c)
+#define SETSRCPROPCOPY(p, c) (SCM_SET_CELL_WORD(p, 2, c))
+#define SETSRCPROPPLIST(p, l) (SCM_SET_CELL_WORD(p, 3, l))
 
 
 
@@ -303,14 +305,14 @@ SCM_DEFINE (scm_set_source_property_x, "set-source-property!", 3, 0, 0,
   else if (scm_is_eq (scm_sym_copy, key))
     {
       if (SRCPROPSP (p))
-       SRCPROPCOPY (p) = datum;
+       SETSRCPROPCOPY (p, datum);
       else
        SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, SCM_UNDEFINED, datum, p));
     }
   else
     {
       if (SRCPROPSP (p))
-       SRCPROPPLIST (p) = scm_acons (key, datum, SRCPROPPLIST (p));
+       SETSRCPROPPLIST (p, scm_acons (key, datum, SRCPROPPLIST (p)));
       else
        SCM_WHASHSET (scm_source_whash, h, scm_acons (key, datum, p));
     }