X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/898a256f9156643b4ceb275776372ee4380b8df1..0527e6876338ba394366273351105d6622368da2:/libguile/srcprop.h diff --git a/libguile/srcprop.h b/libguile/srcprop.h index ae9358b0c..5da2e1282 100644 --- a/libguile/srcprop.h +++ b/libguile/srcprop.h @@ -1,8 +1,8 @@ /* classes: h_files */ -#ifndef SRCPROPH -#define SRCPROPH -/* Copyright (C) 1995,1996 Mikael Djurfeldt +#ifndef SCM_SOURCE_PROPERTIES_H +#define SCM_SOURCE_PROPERTIES_H +/* Copyright (C) 1995,1996,2000,2001 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 @@ -16,7 +16,8 @@ * * 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, 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. @@ -43,8 +44,8 @@ * If you do not wish that, delete this exception notice. * * The author can be reached at djurfeldt@nada.kth.se - * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN - */ + * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */ + #include "libguile/__scm.h" @@ -60,48 +61,60 @@ #define scm_whash_handle SCM #define scm_whash_get_handle(whash, key) scm_hash_fn_get_handle (whash, key, scm_ihashq, scm_sloppy_assq, 0) -#define SCM_WHASHFOUNDP(h) ((h) != SCM_BOOL_F) +#define SCM_WHASHFOUNDP(h) (!SCM_FALSEP (h)) #define SCM_WHASHREF(whash, handle) SCM_CDR (handle) #define SCM_WHASHSET(whash, handle, obj) SCM_SETCDR (handle, obj) #define scm_whash_create_handle(whash, key) scm_hash_fn_create_handle_x (whash, key, SCM_UNSPECIFIED, scm_ihashq, scm_sloppy_assq, 0) #define scm_whash_lookup(whash, obj) scm_hash_fn_ref (whash, obj, SCM_BOOL_F, scm_ihashq, scm_sloppy_assq, 0) #define scm_whash_insert(whash, key, obj) \ -{ \ +do { \ register SCM w = (whash); \ SCM_WHASHSET (w, scm_whash_create_handle (w, key), obj); \ -} \ +} while (0) /* {Source properties} */ -extern long scm_tc16_srcprops; +extern scm_t_bits scm_tc16_srcprops; -typedef struct scm_srcprops +typedef struct scm_t_srcprops { unsigned long pos; SCM fname; SCM copy; SCM plist; -} scm_srcprops; +} scm_t_srcprops; #define SRCPROPS_CHUNKSIZE 2047 /* Number of srcprops per chunk */ -typedef struct scm_srcprops_chunk +typedef struct scm_t_srcprops_chunk { - struct scm_srcprops_chunk *next; - scm_srcprops srcprops[1]; -} scm_srcprops_chunk; + struct scm_t_srcprops_chunk *next; + scm_t_srcprops srcprops[1]; +} scm_t_srcprops_chunk; + +#if (SCM_DEBUG_DEPRECATED == 0) +# define scm_srcprops scm_t_srcprops +# define scm_srcprops_chunk scm_t_srcprops_chunk +#endif -#define SRCPROPSP(p) (SCM_TYP16 (p) == scm_tc16_srcprops) -#define SRCPROPBRK(p) ((1L << 16) & SCM_CAR (p) ? SCM_BOOL_T : SCM_BOOL_F) -#define SRCPROPPOS(p) ((scm_srcprops *) SCM_CDR (p))->pos +#define SCM_SOURCE_PROPERTY_FLAG_BREAK (1L << 16) + +#define SRCPROPSP(p) (SCM_TYP16_PREDICATE (scm_tc16_srcprops, p)) +#define SRCPROPBRK(p) \ + (SCM_BOOL (SCM_CELL_WORD_0 (p) & SCM_SOURCE_PROPERTY_FLAG_BREAK)) +#define SRCPROPPOS(p) ((scm_t_srcprops *) SCM_CELL_WORD_1 (p))->pos #define SRCPROPLINE(p) (SRCPROPPOS(p) >> 12) #define SRCPROPCOL(p) (SRCPROPPOS(p) & 0x0fffL) -#define SRCPROPFNAME(p) ((scm_srcprops *) SCM_CDR (p))->fname -#define SRCPROPCOPY(p) ((scm_srcprops *) SCM_CDR (p))->copy -#define SRCPROPPLIST(p) ((scm_srcprops *) SCM_CDR (p))->plist -#define SETSRCPROPBRK(p) (SCM_SETOR_CAR (p, (1L << 16))) -#define CLEARSRCPROPBRK(p) SCM_SETAND_CAR (p, ~(1L << 16)) +#define SRCPROPFNAME(p) ((scm_t_srcprops *) SCM_CELL_WORD_1 (p))->fname +#define SRCPROPCOPY(p) ((scm_t_srcprops *) SCM_CELL_WORD_1 (p))->copy +#define SRCPROPPLIST(p) ((scm_t_srcprops *) SCM_CELL_WORD_1 (p))->plist +#define SETSRCPROPBRK(p) \ + (SCM_SET_CELL_WORD_0 ((p), SCM_CELL_WORD_0 (p) \ + | SCM_SOURCE_PROPERTY_FLAG_BREAK)) +#define CLEARSRCPROPBRK(p) \ + (SCM_SET_CELL_WORD_0 ((p), SCM_CELL_WORD_0 (p) \ + & ~SCM_SOURCE_PROPERTY_FLAG_BREAK)) #define SRCPROPMAKPOS(l,c) (((l) << 12) + (c)) #define SETSRCPROPPOS(p,l,c) (SRCPROPPOS (p) = SRCPROPMAKPOS (l, c)) #define SETSRCPROPLINE(p,l) SETSRCPROPPOS (p, l, SRCPROPCOL (p)) @@ -109,26 +122,32 @@ typedef struct scm_srcprops_chunk #define SRCBRKP(x) (SCM_NIMP (t.arg1 = scm_whash_lookup (scm_source_whash, (x)))\ && SRCPROPSP (t.arg1)\ - && (1L << 16) & SCM_CAR (t.arg1)) + && (SCM_CELL_WORD_0 (t.arg1) & (1L << 16))) -#define PROCTRACEP(x) SCM_NFALSEP (scm_procedure_property (x, scm_i_trace)) +#define PROCTRACEP(x) SCM_NFALSEP (scm_procedure_property (x, scm_sym_trace)) -extern SCM scm_i_filename; -extern SCM scm_i_copy; -extern SCM scm_i_line; -extern SCM scm_i_column; -extern SCM scm_i_breakpoint; +extern SCM scm_sym_filename; +extern SCM scm_sym_copy; +extern SCM scm_sym_line; +extern SCM scm_sym_column; +extern SCM scm_sym_breakpoint; -extern SCM scm_srcprops_to_plist SCM_P ((SCM obj)); -extern SCM scm_make_srcprops SCM_P ((int line, int col, SCM fname, SCM copy, SCM plist)); -extern SCM scm_source_property SCM_P ((SCM obj, SCM key)); -extern SCM scm_set_source_property_x SCM_P ((SCM obj, SCM key, SCM datum)); -extern SCM scm_source_properties SCM_P ((SCM obj)); -extern SCM scm_set_source_properties_x SCM_P ((SCM obj, SCM props)); -extern void scm_finish_srcprop SCM_P ((void)); -extern void scm_init_srcprop SCM_P ((void)); +extern SCM scm_srcprops_to_plist (SCM obj); +extern SCM scm_make_srcprops (long line, int col, SCM fname, SCM copy, SCM plist); +extern SCM scm_source_property (SCM obj, SCM key); +extern SCM scm_set_source_property_x (SCM obj, SCM key, SCM datum); +extern SCM scm_source_properties (SCM obj); +extern SCM scm_set_source_properties_x (SCM obj, SCM props); +extern void scm_finish_srcprop (void); +extern void scm_init_srcprop (void); + +#endif /* SCM_SOURCE_PROPERTIES_H */ -#endif /* SRCPROPH */ +/* + Local Variables: + c-file-style: "gnu" + End: +*/