summaryrefslogtreecommitdiff
path: root/libguile/srcprop.c
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2008-09-09 22:03:42 +0200
committerLudovic Courtès <ludo@gnu.org>2008-09-09 22:03:42 +0200
commit53f4876abcebf3f05d2a88bba3a898ddcda25a74 (patch)
tree7413b4f4ab565e4784f26ee347e2a1ff46ea467e /libguile/srcprop.c
parent69f23174d313650ca8fb0f69ede45c48d7a26b05 (diff)
parent242ebeaf083cc43a9df18ac4436178d9b3ff66e5 (diff)
downloadguile-53f4876abcebf3f05d2a88bba3a898ddcda25a74.tar.gz
Merge branch 'master' into strftime-gnulib
Conflicts: libguile/ChangeLog srfi/ChangeLog test-suite/ChangeLog
Diffstat (limited to 'libguile/srcprop.c')
-rw-r--r--libguile/srcprop.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index c7d4e2cc0..ed9b1b7fd 100644
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -84,6 +84,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))
@@ -302,14 +304,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));
}