* Renamed header macros to the SCM_<filename>_H format.

[bpt/guile.git] / libguile / srcprop.h

diff --git a/libguile/srcprop.h b/libguile/srcprop.h
index 35afdf5..5da2e12 100644 (file)
--- a/libguile/srcprop.h
+++ b/libguile/srcprop.h
@@ -1,8 +1,8 @@
 /* classes: h_files */
 
-#ifndef SRCPROPH
-#define SRCPROPH
-/*     Copyright (C) 1995,1996 Free Software Foundation
+#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
@@ -46,8 +46,6 @@
  * The author can be reached at djurfeldt@nada.kth.se
  * 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 */
 \f
 
 #include "libguile/__scm.h"
@@ -63,7 +61,7 @@
 #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)
@@ -78,33 +76,45 @@ do { \
 /* {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;
 
-#define SRCPROPSP(p) (SCM_NIMP(p) && (SCM_TYP16 (p) == scm_tc16_srcprops))
-#define SRCPROPBRK(p) (SCM_BOOL((1L << 16) & SCM_CAR (p)))
-#define SRCPROPPOS(p) ((scm_srcprops *) SCM_CDR (p))->pos
+#if (SCM_DEBUG_DEPRECATED == 0)
+# define scm_srcprops scm_t_srcprops
+# define scm_srcprops_chunk scm_t_srcprops_chunk
+#endif
+
+#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))
@@ -112,7 +122,7 @@ 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_sym_trace))
 
@@ -126,7 +136,7 @@ extern SCM scm_sym_breakpoint;
 
 
 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_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);
@@ -134,4 +144,10 @@ 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 */
+#endif /* SCM_SOURCE_PROPERTIES_H */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/