X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/1cc91f1b2937a230a2dc80dd25cc6003b7b8f2b5..f85a9bcf5fcd8ebf591e0accc0a25e24140d5fad:/libguile/srcprop.h

diff --git a/libguile/srcprop.h b/libguile/srcprop.h
index 1101ccc63..2d92044f4 100644
--- a/libguile/srcprop.h
+++ b/libguile/srcprop.h
@@ -2,7 +2,7 @@
 
 #ifndef SRCPROPH
 #define SRCPROPH
-/*	Copyright (C) 1995,1996 Mikael Djurfeldt
+/*	Copyright (C) 1995,1996 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,16 +44,16 @@
  * 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 */
+
+/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
+   gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
 
 
 #include "libguile/__scm.h"
 
 
 
-SCM scm_i_copy;
-
 /* {The old whash table interface}
  * *fixme* This is a temporary solution until weak hash table access
  * has been optimized for speed (which is quite necessary, if they are
@@ -68,10 +69,10 @@ SCM scm_i_copy;
 #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}
@@ -94,16 +95,16 @@ typedef struct scm_srcprops_chunk
   scm_srcprops srcprops[1];
 } scm_srcprops_chunk;
 
-#define SRCPROPSP(p) (SCM_TYP16 (p) == scm_tc16_srcprops)
-#define SRCPROPBRK(p) ((1L << 16) & SCM_CAR (p) ? SCM_BOOL_T : SCM_BOOL_F)
+#define SRCPROPSP(p) (SCM_NIMP(p) && (SCM_TYP16 (p) == scm_tc16_srcprops))
+#define SRCPROPBRK(p) (SCM_BOOL((1L << 16) & SCM_UNPACK_CAR (p)))
 #define SRCPROPPOS(p) ((scm_srcprops *) SCM_CDR (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_CAR (p) = SCM_CAR (p) | (1L << 16))
-#define CLEARSRCPROPBRK(p) (SCM_CAR (p) = SCM_CAR (p) & ~(1L << 16))
+#define SETSRCPROPBRK(p) (SCM_SETOR_CAR (p, (1L << 16)))
+#define CLEARSRCPROPBRK(p) SCM_SETAND_CAR (p, ~(1L << 16))
 #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))
@@ -111,20 +112,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))
+		    && ((1L << 16) & SCM_UNPACK (SCM_CAR (t.arg1))))
 
-#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_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 (int 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 /* SRCPROPH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/