-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002, 2006 Free Software Foundation
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002, 2006, 2008 Free Software Foundation
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
*/
\f
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include <errno.h>
/* {Source Properties}
*
* Properties of source list expressions.
- * Five of these have special meaning and optimized storage:
+ * Five of these have special meaning:
*
* filename string The name of the source file.
* copy list A copy of the list expression.
SCM_GLOBAL_SYMBOL (scm_sym_column, "column");
SCM_GLOBAL_SYMBOL (scm_sym_breakpoint, "breakpoint");
-scm_t_bits scm_tc16_srcprops;
+/*
+ * Source properties are stored as double cells with the
+ * following layout:
+
+ * car = tag
+ * cbr = pos
+ * ccr = copy
+ * cdr = alist
+ */
+
+#define SRCPROPSP(p) (SCM_SMOB_PREDICATE (scm_tc16_srcprops, (p)))
+#define SRCPROPBRK(p) (SCM_SMOB_FLAGS (p) & SCM_SOURCE_PROPERTY_FLAG_BREAK)
+#define SRCPROPPOS(p) (SCM_CELL_WORD(p,1))
+#define SRCPROPLINE(p) (SRCPROPPOS(p) >> 12)
+#define SRCPROPCOL(p) (SRCPROPPOS(p) & 0x0fffL)
+#define SRCPROPCOPY(p) (SCM_CELL_OBJECT(p,2))
+#define SRCPROPALIST(p) (SCM_CELL_OBJECT_3(p))
+#define SETSRCPROPBRK(p) \
+ (SCM_SET_SMOB_FLAGS ((p), \
+ SCM_SMOB_FLAGS (p) | SCM_SOURCE_PROPERTY_FLAG_BREAK))
+#define CLEARSRCPROPBRK(p) \
+ (SCM_SET_SMOB_FLAGS ((p), \
+ SCM_SMOB_FLAGS (p) & ~SCM_SOURCE_PROPERTY_FLAG_BREAK))
+#define SRCPROPMAKPOS(l, c) (((l) << 12) + (c))
+#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 SETSRCPROPALIST(p, l) (SCM_SET_CELL_WORD(p, 3, l))
+
+
+static SCM scm_srcprops_to_alist (SCM obj);
+
+
+scm_t_bits scm_tc16_srcprops;
+
static int
srcprops_print (SCM obj, SCM port, scm_print_state *pstate)
{
int writingp = SCM_WRITINGP (pstate);
scm_puts ("#<srcprops ", port);
SCM_SET_WRITINGP (pstate, 1);
- scm_iprin1 (scm_srcprops_to_plist (obj), port, pstate);
+ scm_iprin1 (scm_srcprops_to_alist (obj), port, pstate);
SCM_SET_WRITINGP (pstate, writingp);
scm_putc ('>', port);
return 1;
}
+/*
+ * We remember the last file name settings, so we can share that alist
+ * entry. This works because scm_set_source_property_x does not use
+ * assoc-set! for modifying the alist.
+ *
+ * This variable contains a protected cons, whose cdr is the cached
+ * alist
+ */
+static SCM scm_last_alist_filename;
+
SCM
-scm_make_srcprops (long line, int col, SCM filename, SCM copy, SCM plist)
+scm_make_srcprops (long line, int col, SCM filename, SCM copy, SCM alist)
{
- register scm_t_srcprops *ptr;
-
- ptr = scm_gc_malloc (sizeof (*ptr), "srcprop");
-
- ptr->pos = SRCPROPMAKPOS (line, col);
- ptr->fname = filename;
- ptr->copy = copy;
- ptr->plist = plist;
+ if (!SCM_UNBNDP (filename))
+ {
+ SCM old_alist = alist;
- SCM_RETURN_NEWSMOB (scm_tc16_srcprops, ptr);
+ /*
+ have to extract the acons, and operate on that, for
+ thread safety.
+ */
+ SCM last_acons = SCM_CDR (scm_last_alist_filename);
+ if (old_alist == SCM_EOL
+ && SCM_CDAR (last_acons) == filename)
+ {
+ alist = last_acons;
+ }
+ else
+ {
+ alist = scm_acons (scm_sym_filename, filename, alist);
+ if (old_alist == SCM_EOL)
+ SCM_SETCDR (scm_last_alist_filename, alist);
+ }
+ }
+
+ SCM_RETURN_NEWSMOB3 (scm_tc16_srcprops,
+ SRCPROPMAKPOS (line, col),
+ copy,
+ alist);
}
-SCM
-scm_srcprops_to_plist (SCM obj)
+static SCM
+scm_srcprops_to_alist (SCM obj)
{
- SCM plist = SRCPROPPLIST (obj);
+ SCM alist = SRCPROPALIST (obj);
if (!SCM_UNBNDP (SRCPROPCOPY (obj)))
- plist = scm_acons (scm_sym_copy, SRCPROPCOPY (obj), plist);
- if (!SCM_UNBNDP (SRCPROPFNAME (obj)))
- plist = scm_acons (scm_sym_filename, SRCPROPFNAME (obj), plist);
- plist = scm_acons (scm_sym_column, scm_from_int (SRCPROPCOL (obj)), plist);
- plist = scm_acons (scm_sym_line, scm_from_int (SRCPROPLINE (obj)), plist);
- plist = scm_acons (scm_sym_breakpoint, scm_from_bool (SRCPROPBRK (obj)), plist);
- return plist;
+ alist = scm_acons (scm_sym_copy, SRCPROPCOPY (obj), alist);
+ alist = scm_acons (scm_sym_column, scm_from_int (SRCPROPCOL (obj)), alist);
+ alist = scm_acons (scm_sym_line, scm_from_int (SRCPROPLINE (obj)), alist);
+ alist = scm_acons (scm_sym_breakpoint, scm_from_bool (SRCPROPBRK (obj)), alist);
+ return alist;
}
SCM_DEFINE (scm_source_properties, "source-properties", 1, 0, 0,
SCM_WRONG_TYPE_ARG (1, obj);
p = scm_hashq_ref (scm_source_whash, obj, SCM_EOL);
if (SRCPROPSP (p))
- return scm_srcprops_to_plist (p);
+ return scm_srcprops_to_alist (p);
else
/* list from set-source-properties!, or SCM_EOL for not found */
return p;
/* Perhaps this procedure should look through an alist
and try to make a srcprops-object...? */
SCM_DEFINE (scm_set_source_properties_x, "set-source-properties!", 2, 0, 0,
- (SCM obj, SCM plist),
- "Install the association list @var{plist} as the source property\n"
+ (SCM obj, SCM alist),
+ "Install the association list @var{alist} as the source property\n"
"list for @var{obj}.")
#define FUNC_NAME s_scm_set_source_properties_x
{
SCM handle;
+ long line = 0, col = 0;
+ SCM fname = SCM_UNDEFINED, copy = SCM_UNDEFINED, breakpoint = SCM_BOOL_F;
+ SCM others = SCM_EOL;
+ SCM *others_cdrloc = &others;
+ int need_srcprops = 0;
+ SCM tail, key;
+
SCM_VALIDATE_NIM (1, obj);
if (SCM_MEMOIZEDP (obj))
obj = SCM_MEMOIZED_EXP (obj);
else if (!scm_is_pair (obj))
SCM_WRONG_TYPE_ARG(1, obj);
- handle = scm_hashq_create_handle_x (scm_source_whash, obj, plist);
- return plist;
+ tail = alist;
+ while (!scm_is_null (tail))
+ {
+ key = SCM_CAAR (tail);
+ if (scm_is_eq (key, scm_sym_line))
+ {
+ line = scm_to_long (SCM_CDAR (tail));
+ need_srcprops = 1;
+ }
+ else if (scm_is_eq (key, scm_sym_column))
+ {
+ col = scm_to_long (SCM_CDAR (tail));
+ need_srcprops = 1;
+ }
+ else if (scm_is_eq (key, scm_sym_filename))
+ {
+ fname = SCM_CDAR (tail);
+ need_srcprops = 1;
+ }
+ else if (scm_is_eq (key, scm_sym_copy))
+ {
+ copy = SCM_CDAR (tail);
+ need_srcprops = 1;
+ }
+ else if (scm_is_eq (key, scm_sym_breakpoint))
+ {
+ breakpoint = SCM_CDAR (tail);
+ need_srcprops = 1;
+ }
+ else
+ {
+ /* Do we allocate here, or clobber the caller's alist?
+
+ Source properties aren't supposed to be used for anything
+ except the special properties above, so the mainline case
+ is that we never execute this else branch, and hence it
+ doesn't matter much.
+
+ We choose allocation here, as that seems safer.
+ */
+ *others_cdrloc = scm_cons (scm_cons (key, SCM_CDAR (tail)),
+ SCM_EOL);
+ others_cdrloc = SCM_CDRLOC (*others_cdrloc);
+ }
+ tail = SCM_CDR (tail);
+ }
+ if (need_srcprops)
+ {
+ alist = scm_make_srcprops (line, col, fname, copy, others);
+ if (scm_is_true (breakpoint))
+ SETSRCPROPBRK (alist);
+ }
+ else
+ alist = others;
+
+ handle = scm_hashq_create_handle_x (scm_source_whash, obj, alist);
+ SCM_SETCDR (handle, alist);
+ return alist;
}
#undef FUNC_NAME
SCM_WRONG_TYPE_ARG (1, obj);
p = scm_hashq_ref (scm_source_whash, obj, SCM_EOL);
if (!SRCPROPSP (p))
- goto plist;
+ goto alist;
if (scm_is_eq (scm_sym_breakpoint, key)) p = scm_from_bool (SRCPROPBRK (p));
else if (scm_is_eq (scm_sym_line, key)) p = scm_from_int (SRCPROPLINE (p));
else if (scm_is_eq (scm_sym_column, key)) p = scm_from_int (SRCPROPCOL (p));
- else if (scm_is_eq (scm_sym_filename, key)) p = SRCPROPFNAME (p);
else if (scm_is_eq (scm_sym_copy, key)) p = SRCPROPCOPY (p);
else
{
- p = SRCPROPPLIST (p);
- plist:
+ p = SRCPROPALIST (p);
+ alist:
p = scm_assoc (key, p);
return (SCM_NIMP (p) ? SCM_CDR (p) : SCM_BOOL_F);
}
scm_make_srcprops (0, scm_to_int (datum),
SCM_UNDEFINED, SCM_UNDEFINED, p));
}
- else if (scm_is_eq (scm_sym_filename, key))
- {
- if (SRCPROPSP (p))
- SRCPROPFNAME (p) = datum;
- else
- SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, datum, SCM_UNDEFINED, p));
- }
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));
+ SETSRCPROPALIST (p, scm_acons (key, datum, SRCPROPALIST (p)));
else
SCM_WHASHSET (scm_source_whash, h, scm_acons (key, datum, p));
}
#undef FUNC_NAME
+SCM_DEFINE (scm_cons_source, "cons-source", 3, 0, 0,
+ (SCM xorig, SCM x, SCM y),
+ "Create and return a new pair whose car and cdr are @var{x} and @var{y}.\n"
+ "Any source properties associated with @var{xorig} are also associated\n"
+ "with the new pair.")
+#define FUNC_NAME s_scm_cons_source
+{
+ SCM p, z;
+ z = scm_cons (x, y);
+ /* Copy source properties possibly associated with xorig. */
+ p = scm_whash_lookup (scm_source_whash, xorig);
+ if (scm_is_true (p))
+ scm_whash_insert (scm_source_whash, z, p);
+ return z;
+}
+#undef FUNC_NAME
+
+
void
scm_init_srcprop ()
{
scm_source_whash = scm_make_weak_key_hash_table (scm_from_int (2047));
scm_c_define ("source-whash", scm_source_whash);
+ scm_last_alist_filename
+ = scm_permanent_object (scm_cons (SCM_EOL,
+ scm_acons (SCM_EOL, SCM_EOL, SCM_EOL)));
+
#include "libguile/srcprop.x"
}
-void
-scm_finish_srcprop ()
-{
- /* Nothing to do. */
-}
/*
Local Variables:
HCoop / bpt / guile.git / blobdiff