diff options
author | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2004-03-29 19:59:43 +0000 |
---|---|---|
committer | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2004-03-29 19:59:43 +0000 |
commit | 434f2f7a91bccd9029e380030768115b1c976d06 (patch) | |
tree | 87f61c9f05a84e2e77b6094bed94fa1cbbc67a23 /libguile/debug.h | |
parent | 5fb64383803fff3d25f21ed99d4f624f264bd1c9 (diff) | |
download | guile-434f2f7a91bccd9029e380030768115b1c976d06.tar.gz |
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
Diffstat (limited to 'libguile/debug.h')
-rw-r--r-- | libguile/debug.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libguile/debug.h b/libguile/debug.h index ee272629d..de4a0054b 100644 --- a/libguile/debug.h +++ b/libguile/debug.h @@ -3,7 +3,8 @@ #ifndef SCM_DEBUG_H #define SCM_DEBUG_H -/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2004 + * Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -59,9 +60,7 @@ SCM_API scm_t_option scm_debug_opts[]; #define SCM_SHOW_FILE_NAME scm_debug_opts[13].val #define SCM_N_DEBUG_OPTIONS 14 -SCM_API SCM (*scm_ceval_ptr) (SCM exp, SCM env); - -SCM_API int scm_debug_mode; +SCM_API int scm_debug_mode_p; SCM_API int scm_check_entry_p; SCM_API int scm_check_apply_p; SCM_API int scm_check_exit_p; @@ -74,9 +73,8 @@ do {\ && !SCM_FALSEP (SCM_APPLY_FRAME_HDLR);\ scm_check_exit_p = (SCM_EXIT_FRAME_P || SCM_TRACE_P)\ && !SCM_FALSEP (SCM_EXIT_FRAME_HDLR);\ - scm_debug_mode = SCM_DEVAL_P\ + scm_debug_mode_p = SCM_DEVAL_P\ || scm_check_entry_p || scm_check_apply_p || scm_check_exit_p;\ - scm_ceval_ptr = scm_debug_mode ? scm_deval : scm_ceval;\ } while (0) /* {Evaluator} @@ -128,8 +126,6 @@ typedef struct scm_t_debug_frame #define SCM_SET_MACROEXP(x) ((x).status |= SCM_MACROEXPF) #define SCM_CLEAR_MACROEXP(x) ((x).status &= ~SCM_MACROEXPF) -#define SCM_DEBUGGINGP scm_debug_mode - /* {Debug Objects} */ @@ -177,9 +173,15 @@ SCM_API SCM scm_debug_hang (SCM obj); #endif /*GUILE_DEBUG*/ #if SCM_ENABLE_DEPRECATED == 1 + #define CHECK_ENTRY scm_check_entry_p #define CHECK_APPLY scm_check_apply_p #define CHECK_EXIT scm_check_exit_p + +/* Deprecated in guile 1.7.0 on 2004-03-29. */ +#define SCM_DEBUGGINGP scm_debug_mode_p +#define scm_debug_mode scm_debug_mode_p + #endif #endif /* SCM_DEBUG_H */ |