-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001 Free Software Foundation
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Free Software Foundation
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
+ * 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.
*
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ * 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.
*
- * The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
- gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
\f
SCM_GLOBAL_SYMBOL (scm_sym_column, "column");
SCM_GLOBAL_SYMBOL (scm_sym_breakpoint, "breakpoint");
-scm_bits_t scm_tc16_srcprops;
-static scm_srcprops_chunk *srcprops_chunklist = 0;
-static scm_srcprops *srcprops_freelist = 0;
+scm_t_bits scm_tc16_srcprops;
+static scm_t_srcprops_chunk *srcprops_chunklist = 0;
+static scm_t_srcprops *srcprops_freelist = 0;
static SCM
}
-static scm_sizet
+static size_t
srcprops_free (SCM obj)
{
- *((scm_srcprops **) SCM_CELL_WORD_1 (obj)) = srcprops_freelist;
- srcprops_freelist = (scm_srcprops *) SCM_CELL_WORD_1 (obj);
+ *((scm_t_srcprops **) SCM_CELL_WORD_1 (obj)) = srcprops_freelist;
+ srcprops_freelist = (scm_t_srcprops *) SCM_CELL_WORD_1 (obj);
return 0; /* srcprops_chunks are not freed until leaving guile */
}
}
+int
+scm_c_source_property_breakpoint_p (SCM form)
+{
+ SCM obj = scm_whash_lookup (scm_source_whash, form);
+ return SRCPROPSP (obj) && SRCPROPBRK (obj);
+}
+
+
SCM
-scm_make_srcprops (int line, int col, SCM filename, SCM copy, SCM plist)
+scm_make_srcprops (long line, int col, SCM filename, SCM copy, SCM plist)
{
- register scm_srcprops *ptr;
+ register scm_t_srcprops *ptr;
SCM_DEFER_INTS;
if ((ptr = srcprops_freelist) != NULL)
- srcprops_freelist = *(scm_srcprops **)ptr;
+ srcprops_freelist = *(scm_t_srcprops **)ptr;
else
{
- int i;
- scm_srcprops_chunk *mem;
- scm_sizet n = sizeof (scm_srcprops_chunk)
- + sizeof (scm_srcprops) * (SRCPROPS_CHUNKSIZE - 1);
- SCM_SYSCALL (mem = (scm_srcprops_chunk *) malloc (n));
+ size_t i;
+ scm_t_srcprops_chunk *mem;
+ size_t n = sizeof (scm_t_srcprops_chunk)
+ + sizeof (scm_t_srcprops) * (SRCPROPS_CHUNKSIZE - 1);
+ SCM_SYSCALL (mem = (scm_t_srcprops_chunk *) scm_malloc (n));
if (mem == NULL)
scm_memory_error ("srcprops");
scm_mallocated += n;
srcprops_chunklist = mem;
ptr = &mem->srcprops[0];
for (i = 1; i < SRCPROPS_CHUNKSIZE - 1; ++i)
- *(scm_srcprops **)&ptr[i] = &ptr[i + 1];
- *(scm_srcprops **)&ptr[SRCPROPS_CHUNKSIZE - 1] = 0;
- srcprops_freelist = (scm_srcprops *) &ptr[1];
+ *(scm_t_srcprops **)&ptr[i] = &ptr[i + 1];
+ *(scm_t_srcprops **)&ptr[SRCPROPS_CHUNKSIZE - 1] = 0;
+ srcprops_freelist = (scm_t_srcprops *) &ptr[1];
}
ptr->pos = SRCPROPMAKPOS (line, col);
ptr->fname = filename;
plist = scm_acons (scm_sym_filename, SRCPROPFNAME (obj), plist);
plist = scm_acons (scm_sym_column, SCM_MAKINUM (SRCPROPCOL (obj)), plist);
plist = scm_acons (scm_sym_line, SCM_MAKINUM (SRCPROPLINE (obj)), plist);
- plist = scm_acons (scm_sym_breakpoint, SRCPROPBRK (obj), plist);
+ plist = scm_acons (scm_sym_breakpoint, SCM_BOOL (SRCPROPBRK (obj)), plist);
return plist;
}
#define FUNC_NAME s_scm_source_properties
{
SCM p;
- SCM_VALIDATE_NIM (1,obj);
+ SCM_VALIDATE_NIM (1, obj);
if (SCM_MEMOIZEDP (obj))
obj = SCM_MEMOIZED_EXP (obj);
-#ifndef SCM_RECKLESS
- else if (SCM_NCONSP (obj))
+ else if (!SCM_CONSP (obj))
SCM_WRONG_TYPE_ARG (1, obj);
-#endif
p = scm_hashq_ref (scm_source_whash, obj, SCM_BOOL_F);
if (SRCPROPSP (p))
return scm_srcprops_to_plist (p);
#define FUNC_NAME s_scm_set_source_properties_x
{
SCM handle;
- SCM_VALIDATE_NIM (1,obj);
+ SCM_VALIDATE_NIM (1, obj);
if (SCM_MEMOIZEDP (obj))
obj = SCM_MEMOIZED_EXP (obj);
-#ifndef SCM_RECKLESS
- else if (SCM_NCONSP (obj))
+ else if (!SCM_CONSP (obj))
SCM_WRONG_TYPE_ARG(1, obj);
-#endif
handle = scm_hashq_create_handle_x (scm_source_whash, obj, plist);
SCM_SETCDR (handle, plist);
return plist;
#define FUNC_NAME s_scm_source_property
{
SCM p;
- SCM_VALIDATE_NIM (1,obj);
+ SCM_VALIDATE_NIM (1, obj);
if (SCM_MEMOIZEDP (obj))
obj = SCM_MEMOIZED_EXP (obj);
-#ifndef SCM_RECKLESS
- else if (SCM_NECONSP (obj))
+ else if (!SCM_CONSP (obj))
SCM_WRONG_TYPE_ARG (1, obj);
-#endif
p = scm_hashq_ref (scm_source_whash, obj, SCM_EOL);
- if (SCM_IMP (p) || !SRCPROPSP (p))
+ if (!SRCPROPSP (p))
goto plist;
- if (SCM_EQ_P (scm_sym_breakpoint, key)) p = SRCPROPBRK (p);
+ if (SCM_EQ_P (scm_sym_breakpoint, key)) p = SCM_BOOL (SRCPROPBRK (p));
else if (SCM_EQ_P (scm_sym_line, key)) p = SCM_MAKINUM (SRCPROPLINE (p));
else if (SCM_EQ_P (scm_sym_column, key)) p = SCM_MAKINUM (SRCPROPCOL (p));
else if (SCM_EQ_P (scm_sym_filename, key)) p = SRCPROPFNAME (p);
{
scm_whash_handle h;
SCM p;
- SCM_VALIDATE_NIM (1,obj);
+ SCM_VALIDATE_NIM (1, obj);
if (SCM_MEMOIZEDP (obj))
obj = SCM_MEMOIZED_EXP (obj);
-#ifndef SCM_RECKLESS
- else if (SCM_NCONSP (obj))
+ else if (!SCM_CONSP (obj))
SCM_WRONG_TYPE_ARG (1, obj);
-#endif
h = scm_whash_get_handle (scm_source_whash, obj);
if (SCM_WHASHFOUNDP (h))
p = SCM_WHASHREF (scm_source_whash, h);
}
else if (SCM_EQ_P (scm_sym_line, key))
{
- SCM_VALIDATE_INUM (3,datum);
+ SCM_VALIDATE_INUM (3, datum);
if (SRCPROPSP (p))
SETSRCPROPLINE (p, SCM_INUM (datum));
else
}
else if (SCM_EQ_P (scm_sym_column, key))
{
- SCM_VALIDATE_INUM (3,datum);
+ SCM_VALIDATE_INUM (3, datum);
if (SRCPROPSP (p))
SETSRCPROPCOL (p, SCM_INUM (datum));
else
SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, SCM_UNDEFINED, datum, p));
}
else
- SCM_WHASHSET (scm_source_whash, h, scm_acons (key, datum, p));
+ {
+ if (SRCPROPSP (p))
+ SRCPROPPLIST (p) = scm_acons (key, datum, SRCPROPPLIST (p));
+ else
+ SCM_WHASHSET (scm_source_whash, h, scm_acons (key, datum, p));
+ }
return SCM_UNSPECIFIED;
}
#undef FUNC_NAME
scm_set_smob_print (scm_tc16_srcprops, srcprops_print);
scm_source_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (2047));
- scm_sysintern ("source-whash", scm_source_whash);
+ scm_c_define ("source-whash", scm_source_whash);
-#ifndef SCM_MAGIC_SNARFER
#include "libguile/srcprop.x"
-#endif
}
void
scm_finish_srcprop ()
{
- register scm_srcprops_chunk *ptr = srcprops_chunklist, *next;
+ register scm_t_srcprops_chunk *ptr = srcprops_chunklist, *next;
while (ptr)
{
next = ptr->next;
free ((char *) ptr);
- scm_mallocated -= sizeof (scm_srcprops_chunk)
- + sizeof (scm_srcprops) * (SRCPROPS_CHUNKSIZE - 1);
+ scm_mallocated -= sizeof (scm_t_srcprops_chunk)
+ + sizeof (scm_t_srcprops) * (SRCPROPS_CHUNKSIZE - 1);
ptr = next;
}
}
HCoop / bpt / guile.git / blobdiff