* validate.h

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

diff --git a/libguile/debug.h b/libguile/debug.h
index a3e69bf..2ee0e77 100644 (file)
--- a/libguile/debug.h
+++ b/libguile/debug.h
@@ -2,7 +2,7 @@
 
 #ifndef DEBUGH
 #define DEBUGH
-/*     Copyright (C) 1995,1996,1998, 1999 Free Software Foundation
+/*     Copyright (C) 1995,1996,1998, 1999, 2000 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
@@ -69,7 +69,7 @@
 /* scm_debug_opts is  defined in eval.c.
  */
 
-extern scm_option scm_debug_opts[];
+extern scm_option_t scm_debug_opts[];
 
 #define SCM_CHEAPTRAPS_P       scm_debug_opts[0].val
 #define SCM_BREAKPOINTS_P      scm_debug_opts[1].val
@@ -86,7 +86,7 @@ extern scm_option scm_debug_opts[];
 #define SCM_STACK_LIMIT                scm_debug_opts[12].val
 #define SCM_N_DEBUG_OPTIONS 13
 
-extern SCM (*scm_ceval_ptr) SCM_P ((SCM exp, SCM env));
+extern SCM (*scm_ceval_ptr) (SCM exp, SCM env);
 
 extern int scm_debug_mode;
 extern int scm_check_entry_p, scm_check_apply_p, scm_check_exit_p;
@@ -108,25 +108,30 @@ do {\
 /* {Evaluator}
  */
 
-typedef union scm_debug_info
+typedef union scm_debug_info_t
 {
   struct { SCM exp, env; } e;
   struct { SCM proc, args; } a;
   SCM id;
-} scm_debug_info;
+} scm_debug_info_t;
 
-extern int scm_debug_eframe_size;
+extern scm_bits_t scm_debug_eframe_size;
 
-typedef struct scm_debug_frame
+typedef struct scm_debug_frame_t
 {
-  struct scm_debug_frame *prev;
+  struct scm_debug_frame_t *prev;
   long status;
-  scm_debug_info *vect;
-  scm_debug_info *info;
-} scm_debug_frame;
+  scm_debug_info_t *vect;
+  scm_debug_info_t *info;
+} scm_debug_frame_t;
+
+#if (SCM_DEBUG_DEPRECATED == 0)
+# define scm_debug_info scm_debug_info_t
+# define scm_debug_frame scm_debug_frame_t
+#endif
 
 #ifndef USE_THREADS
-extern scm_debug_frame *scm_last_debug_frame;
+extern scm_debug_frame_t *scm_last_debug_frame;
 #endif
 
 #define SCM_EVALFRAME    (0L << 11)
@@ -164,55 +169,61 @@ extern scm_debug_frame *scm_last_debug_frame;
 /* {Debug Objects}
  */
 
-extern long scm_tc16_debugobj;
+extern scm_bits_t scm_tc16_debugobj;
 
-#define SCM_DEBUGOBJP(x) (SCM_NIMP(x) && (scm_tc16_debugobj == SCM_TYP16 (x)))
-#define SCM_DEBUGOBJ_FRAME(x) SCM_CDR (x)
-#define SCM_SET_DEBUGOBJ_FRAME(x, f) SCM_SETCDR (x, f)
+#define SCM_DEBUGOBJP(x)              SCM_TYP16_PREDICATE (scm_tc16_debugobj, x)
+#define SCM_DEBUGOBJ_FRAME(x)         SCM_CELL_WORD_1 (x)
+#define SCM_SET_DEBUGOBJ_FRAME(x, f)  SCM_SET_CELL_WORD_1 (x, f)
 
 /* {Memoized Source}
  */
 
-extern long scm_tc16_memoized;
+extern scm_bits_t scm_tc16_memoized;
 
-#define SCM_MEMOIZEDP(x) (SCM_NIMP(x) && (scm_tc16_memoized == SCM_TYP16 (x)))
-#define SCM_MEMOIZED_EXP(x) SCM_CAR (SCM_CDR (x))
-#define SCM_MEMOIZED_ENV(x) SCM_CDR (SCM_CDR (x))
+#define SCM_MEMOIZEDP(x)       SCM_TYP16_PREDICATE (scm_tc16_memoized, x)
+#define SCM_MEMOIZED_EXP(x)    SCM_CAR (SCM_CELL_OBJECT_1 (x))
+#define SCM_MEMOIZED_ENV(x)    SCM_CDR (SCM_CELL_OBJECT_1 (x))
 
 \f
 
-extern SCM * scm_lookup_cstr SCM_P ((char *str, int len, SCM env));
-extern SCM * scm_lookup_soft SCM_P ((SCM var, SCM genv));
-extern SCM scm_evstr SCM_P ((char *str));
-extern SCM scm_eval_string SCM_P ((SCM str));
-extern int scm_ready_p SCM_P ((void));
-extern void debug_print SCM_P ((SCM obj));
-extern SCM scm_debug_object_p SCM_P ((SCM obj));
-extern SCM scm_local_eval SCM_P ((SCM exp, SCM env));
-extern SCM scm_reverse_lookup SCM_P ((SCM env, SCM data));
-extern SCM scm_start_stack SCM_P ((SCM id, SCM exp, SCM env));
-extern SCM scm_procedure_environment SCM_P ((SCM proc));
-extern SCM scm_procedure_source SCM_P ((SCM proc));
-extern SCM scm_procedure_name SCM_P ((SCM proc));
-extern SCM scm_memoized_environment SCM_P ((SCM m));
-extern SCM scm_make_memoized SCM_P ((SCM exp, SCM env));
-extern SCM scm_memoized_p SCM_P ((SCM obj));
-extern SCM scm_with_traps SCM_P ((SCM thunk));
-extern SCM scm_evaluator_traps SCM_P ((SCM setting));
-extern SCM scm_debug_options SCM_P ((SCM setting));
-extern SCM scm_unmemoize SCM_P ((SCM memoized));
-extern SCM scm_make_debugobj SCM_P ((scm_debug_frame* debug));
-extern void scm_init_debug SCM_P ((void));
+extern SCM * scm_lookup_cstr (char *str, int len, SCM env);
+extern SCM * scm_lookup_soft (SCM var, SCM genv);
+extern SCM scm_evstr (char *str);
+extern SCM scm_eval_string (SCM str);
+extern int scm_ready_p (void);
+extern void debug_print (SCM obj);
+extern SCM scm_debug_object_p (SCM obj);
+extern SCM scm_local_eval (SCM exp, SCM env);
+extern SCM scm_reverse_lookup (SCM env, SCM data);
+extern SCM scm_start_stack (SCM id, SCM exp, SCM env);
+extern SCM scm_procedure_environment (SCM proc);
+extern SCM scm_procedure_source (SCM proc);
+extern SCM scm_procedure_name (SCM proc);
+extern SCM scm_memoized_environment (SCM m);
+extern SCM scm_make_memoized (SCM exp, SCM env);
+extern SCM scm_memoized_p (SCM obj);
+extern SCM scm_with_traps (SCM thunk);
+extern SCM scm_evaluator_traps (SCM setting);
+extern SCM scm_debug_options (SCM setting);
+extern SCM scm_unmemoize (SCM memoized);
+extern SCM scm_make_debugobj (scm_debug_frame_t *debug);
+extern void scm_init_debug (void);
 
 #ifdef GUILE_DEBUG
-extern SCM scm_make_gloc SCM_P ((SCM var, SCM env));
-extern SCM scm_gloc_p SCM_P ((SCM obj));
-extern SCM scm_make_iloc SCM_P ((SCM frame, SCM binding, SCM cdrp));
-extern SCM scm_iloc_p SCM_P ((SCM obj));
-extern SCM scm_memcons SCM_P ((SCM car, SCM cdr, SCM env));
-extern SCM scm_mem_to_proc SCM_P ((SCM obj));
-extern SCM scm_proc_to_mem SCM_P ((SCM obj));
-extern SCM scm_debug_hang SCM_P ((SCM obj));
+extern SCM scm_make_gloc (SCM var, SCM env);
+extern SCM scm_gloc_p (SCM obj);
+extern SCM scm_make_iloc (SCM frame, SCM binding, SCM cdrp);
+extern SCM scm_iloc_p (SCM obj);
+extern SCM scm_memcons (SCM car, SCM cdr, SCM env);
+extern SCM scm_mem_to_proc (SCM obj);
+extern SCM scm_proc_to_mem (SCM obj);
+extern SCM scm_debug_hang (SCM obj);
 #endif /*GUILE_DEBUG*/
 
 #endif /* DEBUGH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/