X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/904a077df1a670d386ca114ddb7a8e371684f655..22fc179acda911108e697446921306b5c9eb644b:/libguile/srcprop.c diff --git a/libguile/srcprop.c b/libguile/srcprop.c index 651066135..16c023bc2 100644 --- a/libguile/srcprop.c +++ b/libguile/srcprop.c @@ -1,46 +1,19 @@ -/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001 Free Software Foundation +/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002, 2006 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 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. + * 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. * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ @@ -48,6 +21,7 @@ #include #include "libguile/_scm.h" +#include "libguile/async.h" #include "libguile/smob.h" #include "libguile/alist.h" #include "libguile/debug.h" @@ -63,7 +37,7 @@ /* {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. @@ -81,29 +55,46 @@ SCM_GLOBAL_SYMBOL (scm_sym_line, "line"); SCM_GLOBAL_SYMBOL (scm_sym_column, "column"); SCM_GLOBAL_SYMBOL (scm_sym_breakpoint, "breakpoint"); -scm_t_bits scm_tc16_srcprops; -static scm_t_srcprops_chunk *srcprops_chunklist = 0; -static scm_t_srcprops *srcprops_freelist = 0; +/* + layout: + + car = tag + cbr = pos + ccr = copy + cdr = plist +*/ + +#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 SRCPROPPLIST(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) + + + +scm_t_bits scm_tc16_srcprops; + static SCM srcprops_mark (SCM obj) { - scm_gc_mark (SRCPROPFNAME (obj)); scm_gc_mark (SRCPROPCOPY (obj)); return SRCPROPPLIST (obj); } - -static size_t -srcprops_free (SCM 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 */ -} - - static int srcprops_print (SCM obj, SCM port, scm_print_state *pstate) { @@ -117,37 +108,52 @@ srcprops_print (SCM obj, SCM port, scm_print_state *pstate) } +int +scm_c_source_property_breakpoint_p (SCM form) +{ + SCM obj = scm_whash_lookup (scm_source_whash, form); + return SRCPROPSP (obj) && SRCPROPBRK (obj); +} + + +/* + A protected cells whose cdr contains the last plist + used if plist contains only the filename. + + This works because scm_set_source_property_x does + not use assoc-set! for modifying the plist. + */ +static SCM scm_last_plist_filename; + SCM scm_make_srcprops (long line, int col, SCM filename, SCM copy, SCM plist) { - register scm_t_srcprops *ptr; - SCM_DEFER_INTS; - if ((ptr = srcprops_freelist) != NULL) - srcprops_freelist = *(scm_t_srcprops **)ptr; - else + if (!SCM_UNBNDP (filename)) { - 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 *) malloc (n)); - if (mem == NULL) - scm_memory_error ("srcprops"); - scm_mallocated += n; - mem->next = srcprops_chunklist; - srcprops_chunklist = mem; - ptr = &mem->srcprops[0]; - for (i = 1; i < SRCPROPS_CHUNKSIZE - 1; ++i) - *(scm_t_srcprops **)&ptr[i] = &ptr[i + 1]; - *(scm_t_srcprops **)&ptr[SRCPROPS_CHUNKSIZE - 1] = 0; - srcprops_freelist = (scm_t_srcprops *) &ptr[1]; + SCM old_plist = plist; + + /* + have to extract the acons, and operate on that, for + thread safety. + */ + SCM last_acons = SCM_CDR (scm_last_plist_filename); + if (old_plist == SCM_EOL + && SCM_CDAR (last_acons) == filename) + { + plist = last_acons; + } + else + { + plist = scm_acons (scm_sym_filename, filename, plist); + if (old_plist == SCM_EOL) + SCM_SETCDR (scm_last_plist_filename, plist); + } } - ptr->pos = SRCPROPMAKPOS (line, col); - ptr->fname = filename; - ptr->copy = copy; - ptr->plist = plist; - SCM_ALLOW_INTS; - SCM_RETURN_NEWSMOB (scm_tc16_srcprops, ptr); + + SCM_RETURN_NEWSMOB3 (scm_tc16_srcprops, + SRCPROPMAKPOS (line, col), + copy, + plist); } @@ -157,11 +163,9 @@ scm_srcprops_to_plist (SCM obj) SCM plist = SRCPROPPLIST (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_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_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; } @@ -171,17 +175,17 @@ SCM_DEFINE (scm_source_properties, "source-properties", 1, 0, 0, #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_is_pair (obj)) SCM_WRONG_TYPE_ARG (1, obj); -#endif - p = scm_hashq_ref (scm_source_whash, obj, SCM_BOOL_F); + p = scm_hashq_ref (scm_source_whash, obj, SCM_EOL); if (SRCPROPSP (p)) return scm_srcprops_to_plist (p); - return SCM_EOL; + else + /* list from set-source-properties!, or SCM_EOL for not found */ + return p; } #undef FUNC_NAME @@ -194,13 +198,11 @@ SCM_DEFINE (scm_set_source_properties_x, "set-source-properties!", 2, 0, 0, #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_is_pair (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; @@ -214,21 +216,18 @@ SCM_DEFINE (scm_source_property, "source-property", 2, 0, 0, #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_NCONSP (obj)) + else if (!scm_is_pair (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); - 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); - else if (SCM_EQ_P (scm_sym_copy, key)) p = SRCPROPCOPY (p); + 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_copy, key)) p = SRCPROPCOPY (p); else { p = SRCPROPPLIST (p); @@ -248,13 +247,11 @@ SCM_DEFINE (scm_set_source_property_x, "set-source-property!", 3, 0, 0, { 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_is_pair (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); @@ -263,11 +260,11 @@ SCM_DEFINE (scm_set_source_property_x, "set-source-property!", 3, 0, 0, h = scm_whash_create_handle (scm_source_whash, obj); p = SCM_EOL; } - if (SCM_EQ_P (scm_sym_breakpoint, key)) + if (scm_is_eq (scm_sym_breakpoint, key)) { if (SRCPROPSP (p)) { - if (SCM_FALSEP (datum)) + if (scm_is_false (datum)) CLEARSRCPROPBRK (p); else SETSRCPROPBRK (p); @@ -276,48 +273,44 @@ SCM_DEFINE (scm_set_source_property_x, "set-source-property!", 3, 0, 0, { SCM sp = scm_make_srcprops (0, 0, SCM_UNDEFINED, SCM_UNDEFINED, p); SCM_WHASHSET (scm_source_whash, h, sp); - if (SCM_FALSEP (datum)) + if (scm_is_false (datum)) CLEARSRCPROPBRK (sp); else SETSRCPROPBRK (sp); } } - else if (SCM_EQ_P (scm_sym_line, key)) + else if (scm_is_eq (scm_sym_line, key)) { - SCM_VALIDATE_INUM (3,datum); if (SRCPROPSP (p)) - SETSRCPROPLINE (p, SCM_INUM (datum)); + SETSRCPROPLINE (p, scm_to_int (datum)); else SCM_WHASHSET (scm_source_whash, h, - scm_make_srcprops (SCM_INUM (datum), 0, + scm_make_srcprops (scm_to_int (datum), 0, SCM_UNDEFINED, SCM_UNDEFINED, p)); } - else if (SCM_EQ_P (scm_sym_column, key)) + else if (scm_is_eq (scm_sym_column, key)) { - SCM_VALIDATE_INUM (3,datum); if (SRCPROPSP (p)) - SETSRCPROPCOL (p, SCM_INUM (datum)); + SETSRCPROPCOL (p, scm_to_int (datum)); else SCM_WHASHSET (scm_source_whash, h, - scm_make_srcprops (0, SCM_INUM (datum), + scm_make_srcprops (0, scm_to_int (datum), SCM_UNDEFINED, SCM_UNDEFINED, p)); } - else if (SCM_EQ_P (scm_sym_filename, key)) + else if (scm_is_eq (scm_sym_copy, key)) { if (SRCPROPSP (p)) - SRCPROPFNAME (p) = datum; + SRCPROPCOPY (p) = datum; else - SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, datum, SCM_UNDEFINED, p)); + SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, SCM_UNDEFINED, datum, p)); } - else if (SCM_EQ_P (scm_sym_copy, key)) + else { if (SRCPROPSP (p)) - SRCPROPCOPY (p) = datum; + SRCPROPPLIST (p) = scm_acons (key, datum, SRCPROPPLIST (p)); else - SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, SCM_UNDEFINED, datum, p)); + SCM_WHASHSET (scm_source_whash, h, scm_acons (key, datum, p)); } - else - SCM_WHASHSET (scm_source_whash, h, scm_acons (key, datum, p)); return SCM_UNSPECIFIED; } #undef FUNC_NAME @@ -328,30 +321,18 @@ scm_init_srcprop () { scm_tc16_srcprops = scm_make_smob_type ("srcprops", 0); scm_set_smob_mark (scm_tc16_srcprops, srcprops_mark); - scm_set_smob_free (scm_tc16_srcprops, srcprops_free); scm_set_smob_print (scm_tc16_srcprops, srcprops_print); - scm_source_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (2047)); + scm_source_whash = scm_make_weak_key_hash_table (scm_from_int (2047)); scm_c_define ("source-whash", scm_source_whash); -#ifndef SCM_MAGIC_SNARFER + scm_last_plist_filename + = scm_permanent_object (scm_cons (SCM_EOL, + scm_acons (SCM_EOL, SCM_EOL, SCM_EOL))); + #include "libguile/srcprop.x" -#endif } -void -scm_finish_srcprop () -{ - register scm_t_srcprops_chunk *ptr = srcprops_chunklist, *next; - while (ptr) - { - next = ptr->next; - free ((char *) ptr); - scm_mallocated -= sizeof (scm_t_srcprops_chunk) - + sizeof (scm_t_srcprops) * (SRCPROPS_CHUNKSIZE - 1); - ptr = next; - } -} /* Local Variables: