- /* Debugging extensions for Guile
- * Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation
+/* Debugging extensions for Guile
+ * Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2006, 2008, 2009 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
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * 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, 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.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * 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 */
-
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
- gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
-
-
-#include <stdio.h>
-#include "_scm.h"
-#include "eval.h"
-#include "stackchk.h"
-#include "throw.h"
-#include "macros.h"
-#include "smob.h"
-#include "procprop.h"
-#include "srcprop.h"
-#include "alist.h"
-#include "continuations.h"
-#include "strports.h"
-#include "read.h"
-#include "feature.h"
-#include "dynwind.h"
-#include "modules.h"
-#include "ports.h"
-#include "root.h"
-
-#include "validate.h"
-#include "debug.h"
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "libguile/_scm.h"
+#include "libguile/async.h"
+#include "libguile/eval.h"
+#include "libguile/list.h"
+#include "libguile/stackchk.h"
+#include "libguile/throw.h"
+#include "libguile/macros.h"
+#include "libguile/smob.h"
+#include "libguile/procprop.h"
+#include "libguile/srcprop.h"
+#include "libguile/alist.h"
+#include "libguile/continuations.h"
+#include "libguile/strports.h"
+#include "libguile/read.h"
+#include "libguile/feature.h"
+#include "libguile/dynwind.h"
+#include "libguile/modules.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+#include "libguile/fluids.h"
+#include "libguile/objects.h"
+#include "libguile/programs.h"
+
+#include "libguile/validate.h"
+#include "libguile/debug.h"
+
+#include "libguile/private-options.h"
\f
+
/* {Run time control of the debugging evaluator}
*/
SCM_DEFINE (scm_debug_options, "debug-options-interface", 0, 1, 0,
(SCM setting),
-"")
+ "Option interface for the debug options. Instead of using\n"
+ "this procedure directly, use the procedures @code{debug-enable},\n"
+ "@code{debug-disable}, @code{debug-set!} and @code{debug-options}.")
#define FUNC_NAME s_scm_debug_options
{
SCM ans;
- SCM_DEFER_INTS;
- ans = scm_options (setting,
- scm_debug_opts,
- SCM_N_DEBUG_OPTIONS,
- FUNC_NAME);
-#ifndef SCM_RECKLESS
+
+ scm_dynwind_begin (0);
+ scm_dynwind_critical_section (SCM_BOOL_F);
+
+ ans = scm_options (setting, scm_debug_opts, FUNC_NAME);
if (!(1 <= SCM_N_FRAMES && SCM_N_FRAMES <= SCM_MAX_FRAME_SIZE))
{
- scm_options (ans, scm_debug_opts, SCM_N_DEBUG_OPTIONS, FUNC_NAME);
+ scm_options (ans, scm_debug_opts, FUNC_NAME);
SCM_OUT_OF_RANGE (1, setting);
}
-#endif
SCM_RESET_DEBUG_MODE;
+#ifdef STACK_CHECKING
scm_stack_checking_enabled_p = SCM_STACK_CHECKING_P;
+#endif
scm_debug_eframe_size = 2 * SCM_N_FRAMES;
- SCM_ALLOW_INTS;
+
+ scm_dynwind_end ();
return ans;
}
#undef FUNC_NAME
+
static void
with_traps_before (void *data)
{
static SCM
with_traps_inner (void *data)
{
- SCM thunk = (SCM) data;
- return scm_apply (thunk, SCM_EOL, SCM_EOL);
+ SCM thunk = SCM_PACK ((scm_t_bits) data);
+ return scm_call_0 (thunk);
}
SCM_DEFINE (scm_with_traps, "with-traps", 1, 0, 0,
(SCM thunk),
-"")
+ "Call @var{thunk} with traps enabled.")
#define FUNC_NAME s_scm_with_traps
{
int trap_flag;
- SCM_VALIDATE_THUNK (1,thunk);
+ SCM_VALIDATE_THUNK (1, thunk);
return scm_internal_dynamic_wind (with_traps_before,
with_traps_inner,
with_traps_after,
- (void *) thunk,
+ (void *) SCM_UNPACK (thunk),
&trap_flag);
}
#undef FUNC_NAME
\f
-static SCM scm_sym_source, scm_sym_dots;
-static SCM scm_sym_procname;
+SCM_SYMBOL (scm_sym_procname, "procname");
+SCM_SYMBOL (scm_sym_dots, "...");
+SCM_SYMBOL (scm_sym_source, "source");
/* {Memoized Source}
*/
-long scm_tc16_memoized;
-
+scm_t_bits scm_tc16_memoized;
static int
-prinmemoized (SCM obj,SCM port,scm_print_state *pstate)
+memoized_print (SCM obj, SCM port, scm_print_state *pstate)
{
int writingp = SCM_WRITINGP (pstate);
scm_puts ("#<memoized ", port);
SCM_SET_WRITINGP (pstate, 1);
-#ifdef GUILE_DEBUG
scm_iprin1 (SCM_MEMOIZED_EXP (obj), port, pstate);
-#else
- scm_iprin1 (scm_unmemoize (obj), port, pstate);
-#endif
SCM_SET_WRITINGP (pstate, writingp);
scm_putc ('>', port);
return 1;
SCM_DEFINE (scm_memoized_p, "memoized?", 1, 0, 0,
(SCM obj),
-"")
+ "Return @code{#t} if @var{obj} is memoized.")
#define FUNC_NAME s_scm_memoized_p
{
- return SCM_BOOL(SCM_MEMOIZEDP (obj));
+ return scm_from_bool(SCM_MEMOIZEDP (obj));
}
#undef FUNC_NAME
scm_make_memoized (SCM exp, SCM env)
{
/* *fixme* Check that env is a valid environment. */
- register SCM z, ans;
- SCM_ENTER_A_SECTION;
- SCM_NEWSMOB (z, exp, env);
- SCM_NEWSMOB (ans, scm_tc16_memoized, z);
- SCM_EXIT_A_SECTION;
- return ans;
+ SCM_RETURN_NEWSMOB (scm_tc16_memoized, SCM_UNPACK (scm_cons (exp, env)));
}
#ifdef GUILE_DEBUG
* specified, the top-level environment of the current module will
* be assumed. All environments must match.
*
- * - procedure: make-gloc VARIABLE [ENV]
- *
- * Return a gloc, encapsulated in a memoized object.
- *
- * (Glocs can't exist in normal list structures, since they will
- * be mistaken for structs.)
- *
- * - procedure: gloc? OBJECT
- *
- * Return #t if OBJECT is a memoized gloc.
- *
* - procedure: make-iloc FRAME BINDING CDRP
*
* Return an iloc referring to frame no. FRAME, binding
* - constant: SCM_IM_DISPATCH
*/
-#include "variable.h"
-#include "procs.h"
-
-SCM_DEFINE (scm_make_gloc, "make-gloc", 1, 1, 0,
- (SCM var, SCM env),
-"")
-#define FUNC_NAME s_scm_make_gloc
-{
-#if 1 /* Unsafe */
- if (SCM_CONSP (var))
- var = scm_cons (SCM_BOOL_F, var);
- else
-#endif
- SCM_VALIDATE_VARIABLE (1,var);
- if (SCM_UNBNDP (env))
- env = scm_top_level_env (SCM_CDR (scm_top_level_lookup_closure_var));
- else
- SCM_VALIDATE_NULLORCONS (2,env);
- return scm_make_memoized (SCM_VARVCELL (var) + 1, env);
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_gloc_p, "gloc?", 1, 0, 0,
- (SCM obj),
-"")
-#define FUNC_NAME s_scm_gloc_p
-{
- return SCM_BOOL((SCM_MEMOIZEDP (obj)
- && (SCM_UNPACK(SCM_MEMOIZED_EXP (obj)) & 7) == 1));
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_make_iloc, "make-iloc", 3, 0, 0,
- (SCM frame, SCM binding, SCM cdrp),
-"")
-#define FUNC_NAME s_scm_make_iloc
-{
- SCM_VALIDATE_INUM (1,frame);
- SCM_VALIDATE_INUM (2,binding);
- return (SCM_ILOC00
- + SCM_IFRINC * SCM_INUM (frame)
- + (SCM_NFALSEP (cdrp) ? SCM_ICDR : 0)
- + SCM_IDINC * SCM_INUM (binding));
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_iloc_p, "iloc?", 1, 0, 0,
- (SCM obj),
-"")
-#define FUNC_NAME s_scm_iloc_p
-{
- return SCM_BOOL(SCM_ILOCP (obj));
-}
-#undef FUNC_NAME
+#include "libguile/variable.h"
+#include "libguile/procs.h"
SCM_DEFINE (scm_memcons, "memcons", 2, 1, 0,
(SCM car, SCM cdr, SCM env),
-"")
+ "Return a new memoized cons cell with @var{car} and @var{cdr}\n"
+ "as members and @var{env} as the environment.")
#define FUNC_NAME s_scm_memcons
{
if (SCM_MEMOIZEDP (car))
/*fixme* environments may be two different but equal top-level envs */
if (!SCM_UNBNDP (env) && SCM_MEMOIZED_ENV (car) != env)
SCM_MISC_ERROR ("environment mismatch arg1 <-> arg3",
- scm_cons2 (car, env, SCM_EOL));
+ scm_list_2 (car, env));
else
env = SCM_MEMOIZED_ENV (car);
car = SCM_MEMOIZED_EXP (car);
{
if (!SCM_UNBNDP (env) && SCM_MEMOIZED_ENV (cdr) != env)
SCM_MISC_ERROR ("environment mismatch arg2 <-> arg3",
- scm_cons2 (cdr, env, SCM_EOL));
+ scm_list_2 (cdr, env));
else
env = SCM_MEMOIZED_ENV (cdr);
cdr = SCM_MEMOIZED_EXP (cdr);
}
if (SCM_UNBNDP (env))
- env = scm_top_level_env (SCM_CDR (scm_top_level_lookup_closure_var));
+ env = scm_top_level_env (SCM_TOP_LEVEL_LOOKUP_CLOSURE);
else
- SCM_VALIDATE_NULLORCONS (3,env);
+ SCM_VALIDATE_NULLORCONS (3, env);
return scm_make_memoized (scm_cons (car, cdr), env);
}
#undef FUNC_NAME
SCM_DEFINE (scm_mem_to_proc, "mem->proc", 1, 0, 0,
(SCM obj),
-"")
+ "Convert a memoized object (which must represent a body)\n"
+ "to a procedure.")
#define FUNC_NAME s_scm_mem_to_proc
{
SCM env;
- SCM_VALIDATE_MEMOIZED (1,obj);
+ SCM_VALIDATE_MEMOIZED (1, obj);
env = SCM_MEMOIZED_ENV (obj);
obj = SCM_MEMOIZED_EXP (obj);
- if (!(SCM_NIMP (obj) && SCM_CAR (obj) == SCM_IM_LAMBDA))
- SCM_MISC_ERROR ("expected lambda expression",
- scm_cons (obj, SCM_EOL));
- return scm_closure (SCM_CDR (obj), env);
+ return scm_closure (obj, env);
}
#undef FUNC_NAME
SCM_DEFINE (scm_proc_to_mem, "proc->mem", 1, 0, 0,
(SCM obj),
-"")
+ "Convert a procedure to a memoized object.")
#define FUNC_NAME s_scm_proc_to_mem
{
SCM_VALIDATE_CLOSURE (1, obj);
- return scm_make_memoized (scm_cons (SCM_IM_LAMBDA, SCM_CODE (obj)),
- SCM_ENV (obj));
+ return scm_make_memoized (SCM_CODE (obj), SCM_ENV (obj));
}
#undef FUNC_NAME
#endif /* GUILE_DEBUG */
-SCM_DEFINE (scm_unmemoize, "unmemoize", 1, 0, 0,
+SCM_DEFINE (scm_i_unmemoize_expr, "unmemoize-expr", 1, 0, 0,
(SCM m),
-"")
-#define FUNC_NAME s_scm_unmemoize
+ "Unmemoize the memoized expression @var{m},")
+#define FUNC_NAME s_scm_i_unmemoize_expr
{
- SCM_VALIDATE_MEMOIZED (1,m);
- return scm_unmemocopy (SCM_MEMOIZED_EXP (m), SCM_MEMOIZED_ENV (m));
+ SCM_VALIDATE_MEMOIZED (1, m);
+ return scm_i_unmemocopy_expr (SCM_MEMOIZED_EXP (m), SCM_MEMOIZED_ENV (m));
}
#undef FUNC_NAME
SCM_DEFINE (scm_memoized_environment, "memoized-environment", 1, 0, 0,
(SCM m),
-"")
+ "Return the environment of the memoized expression @var{m}.")
#define FUNC_NAME s_scm_memoized_environment
{
- SCM_VALIDATE_MEMOIZED (1,m);
+ SCM_VALIDATE_MEMOIZED (1, m);
return SCM_MEMOIZED_ENV (m);
}
#undef FUNC_NAME
SCM_DEFINE (scm_procedure_name, "procedure-name", 1, 0, 0,
(SCM proc),
-"")
+ "Return the name of the procedure @var{proc}")
#define FUNC_NAME s_scm_procedure_name
{
- SCM_VALIDATE_PROC (1,proc);
+ SCM_VALIDATE_PROC (1, proc);
switch (SCM_TYP7 (proc)) {
case scm_tcs_subrs:
return SCM_SNAME (proc);
SCM name = scm_procedure_property (proc, scm_sym_name);
#if 0
/* Source property scm_sym_procname not implemented yet... */
- SCM name = scm_source_property (SCM_CAR (SCM_CDR (SCM_CODE (proc))), scm_sym_procname);
- if (SCM_FALSEP (name))
+ SCM name = scm_source_property (SCM_CAR (SCM_CLOSURE_BODY (proc)), scm_sym_procname);
+ if (scm_is_false (name))
name = scm_procedure_property (proc, scm_sym_name);
#endif
- if (SCM_FALSEP (name) && SCM_CLOSUREP (proc))
+ if (scm_is_false (name) && SCM_CLOSUREP (proc))
name = scm_reverse_lookup (SCM_ENV (proc), proc);
+ if (scm_is_false (name) && SCM_PROGRAM_P (proc))
+ name = scm_program_name (proc);
return name;
}
}
SCM_DEFINE (scm_procedure_source, "procedure-source", 1, 0, 0,
(SCM proc),
-"")
+ "Return the source of the procedure @var{proc}.")
#define FUNC_NAME s_scm_procedure_source
{
- SCM_VALIDATE_NIM (1,proc);
+ SCM_VALIDATE_NIM (1, proc);
+ again:
switch (SCM_TYP7 (proc)) {
case scm_tcs_closures:
{
- SCM src;
- src = scm_source_property (SCM_CDR (SCM_CODE (proc)), scm_sym_copy);
- if (src != SCM_BOOL_F)
- return scm_cons2 (scm_sym_lambda, SCM_CAR (SCM_CODE (proc)), src);
- src = SCM_CODE (proc);
- return scm_cons (scm_sym_lambda,
- scm_unmemocopy (src,
- SCM_EXTEND_ENV (SCM_CAR (src),
- SCM_EOL,
- SCM_ENV (proc))));
+ const SCM formals = SCM_CLOSURE_FORMALS (proc);
+ const SCM body = SCM_CLOSURE_BODY (proc);
+ const SCM src = scm_source_property (body, scm_sym_copy);
+
+ if (scm_is_true (src))
+ {
+ return scm_cons2 (scm_sym_lambda, formals, src);
+ }
+ else
+ {
+ const SCM env = SCM_EXTEND_ENV (formals, SCM_EOL, SCM_ENV (proc));
+ return scm_cons2 (scm_sym_lambda,
+ scm_i_finite_list_copy (formals),
+ scm_i_unmemocopy_body (body, env));
+ }
}
- case scm_tc7_contin:
+ case scm_tcs_struct:
+ if (!SCM_I_OPERATORP (proc))
+ break;
+ goto procprop;
+ case scm_tc7_smob:
+ if (!SCM_SMOB_DESCRIPTOR (proc).apply)
+ break;
case scm_tcs_subrs:
-#ifdef CCLO
- case scm_tc7_cclo:
-#endif
+ procprop:
/* It would indeed be a nice thing if we supplied source even for
built in procedures! */
return scm_procedure_property (proc, scm_sym_source);
+ case scm_tc7_pws:
+ {
+ SCM src = scm_procedure_property (proc, scm_sym_source);
+ if (scm_is_true (src))
+ return src;
+ proc = SCM_PROCEDURE (proc);
+ goto again;
+ }
default:
- SCM_WTA(1,proc);
- return 0;
+ ;
}
+ SCM_WRONG_TYPE_ARG (1, proc);
+ return SCM_BOOL_F; /* not reached */
}
#undef FUNC_NAME
SCM_DEFINE (scm_procedure_environment, "procedure-environment", 1, 0, 0,
(SCM proc),
-"")
+ "Return the environment of the procedure @var{proc}.")
#define FUNC_NAME s_scm_procedure_environment
{
- SCM_VALIDATE_NIM (1,proc);
+ SCM_VALIDATE_NIM (1, proc);
switch (SCM_TYP7 (proc)) {
case scm_tcs_closures:
return SCM_ENV (proc);
- case scm_tc7_contin:
case scm_tcs_subrs:
-#ifdef CCLO
- case scm_tc7_cclo:
-#endif
return SCM_EOL;
default:
- SCM_WTA(1,proc);
- return 0;
+ SCM_WRONG_TYPE_ARG (1, proc);
+ /* not reached */
}
}
#undef FUNC_NAME
{
if (SCM_UNBNDP (env))
{
- SCM_VALIDATE_MEMOIZED (1,exp);
- return scm_eval_3 (SCM_MEMOIZED_EXP (exp), 0, SCM_MEMOIZED_ENV (exp));
+ SCM_VALIDATE_MEMOIZED (1, exp);
+ return scm_i_eval_x (SCM_MEMOIZED_EXP (exp), SCM_MEMOIZED_ENV (exp));
}
- return scm_eval_3 (exp, 1, env);
+ return scm_i_eval (exp, env);
}
#undef FUNC_NAME
SCM
scm_reverse_lookup (SCM env, SCM data)
{
- SCM names, values;
- while (SCM_NIMP (env) && SCM_SLOPPY_CONSP (SCM_CAR (env)))
+ while (scm_is_pair (env) && scm_is_pair (SCM_CAR (env)))
{
- names = SCM_CAAR (env);
- values = SCM_CDAR (env);
- while (SCM_CONSP (names))
+ SCM names = SCM_CAAR (env);
+ SCM values = SCM_CDAR (env);
+ while (scm_is_pair (names))
{
- if (SCM_CAR (values) == data)
+ if (scm_is_eq (SCM_CAR (values), data))
return SCM_CAR (names);
names = SCM_CDR (names);
values = SCM_CDR (values);
}
- if (names != SCM_EOL && values == data)
+ if (!scm_is_null (names) && scm_is_eq (values, data))
return names;
env = SCM_CDR (env);
}
return SCM_BOOL_F;
}
-SCM
-scm_start_stack (SCM id, SCM exp, SCM env)
+SCM_DEFINE (scm_sys_start_stack, "%start-stack", 2, 0, 0,
+ (SCM id, SCM thunk),
+ "Call @var{thunk} on an evaluator stack tagged with @var{id}.")
+#define FUNC_NAME s_scm_sys_start_stack
{
SCM answer;
- scm_debug_frame vframe;
- scm_debug_info vframe_vect_body;
- vframe.prev = scm_last_debug_frame;
+ scm_t_debug_frame vframe;
+ scm_t_debug_info vframe_vect_body;
+ vframe.prev = scm_i_last_debug_frame ();
vframe.status = SCM_VOIDFRAME;
vframe.vect = &vframe_vect_body;
vframe.vect[0].id = id;
- scm_last_debug_frame = &vframe;
- answer = scm_eval_3 (exp, 1, env);
- scm_last_debug_frame = vframe.prev;
+ scm_i_set_last_debug_frame (&vframe);
+ answer = scm_call_0 (thunk);
+ scm_i_set_last_debug_frame (vframe.prev);
return answer;
}
-
-SCM_SYNTAX(s_start_stack, "start-stack", scm_makacro, scm_m_start_stack);
-
-static SCM
-scm_m_start_stack (SCM exp, SCM env)
-{
- exp = SCM_CDR (exp);
- SCM_ASSERT (SCM_ECONSP (exp)
- && SCM_ECONSP (SCM_CDR (exp))
- && SCM_NULLP (SCM_CDDR (exp)),
- exp,
- SCM_WNA,
- s_start_stack);
- return scm_start_stack (scm_eval_car (exp, env), SCM_CADR (exp), env);
-}
+#undef FUNC_NAME
/* {Debug Objects}
*
* The debugging evaluator throws these on frame traps.
*/
-long scm_tc16_debugobj;
+scm_t_bits scm_tc16_debugobj;
static int
-prindebugobj (SCM obj,SCM port,scm_print_state *pstate)
+debugobj_print (SCM obj, SCM port, scm_print_state *pstate SCM_UNUSED)
{
scm_puts ("#<debug-object ", port);
- scm_intprint ((int) SCM_DEBUGOBJ_FRAME (obj), 16, port);
+ scm_intprint ((long) SCM_DEBUGOBJ_FRAME (obj), 16, port);
scm_putc ('>', port);
return 1;
}
SCM_DEFINE (scm_debug_object_p, "debug-object?", 1, 0, 0,
(SCM obj),
- "")
+ "Return @code{#t} if @var{obj} is a debug object.")
#define FUNC_NAME s_scm_debug_object_p
{
- return SCM_BOOL(SCM_DEBUGOBJP (obj));
+ return scm_from_bool(SCM_DEBUGOBJP (obj));
}
#undef FUNC_NAME
SCM
-scm_make_debugobj (scm_debug_frame *frame)
+scm_make_debugobj (scm_t_debug_frame *frame)
{
- register SCM z;
- SCM_NEWCELL (z);
- SCM_ENTER_A_SECTION;
- SCM_SET_DEBUGOBJ_FRAME (z, (SCM) frame);
- SCM_SETCAR (z, scm_tc16_debugobj);
- SCM_EXIT_A_SECTION;
- return z;
+ return scm_cell (scm_tc16_debugobj, (scm_t_bits) frame);
}
\f
#ifdef GUILE_DEBUG
SCM_DEFINE (scm_debug_hang, "debug-hang", 0, 1, 0,
(SCM obj),
- "")
+ "Go into an endless loop, which can be only terminated with\n"
+ "a debugger.")
#define FUNC_NAME s_scm_debug_hang
{
int go = 0;
void
scm_init_debug ()
{
- scm_init_opts (scm_debug_options, scm_debug_opts, SCM_N_DEBUG_OPTIONS);
-
- scm_tc16_memoized = scm_make_smob_type_mfpe ("memoized", 0,
- scm_markcdr, NULL, prinmemoized, NULL);
+ scm_init_opts (scm_debug_options, scm_debug_opts);
- scm_tc16_debugobj = scm_make_smob_type_mfpe ("debug-object", 0,
- NULL, NULL, prindebugobj, NULL);
+ scm_tc16_memoized = scm_make_smob_type ("memoized", 0);
+ scm_set_smob_mark (scm_tc16_memoized, scm_markcdr);
+ scm_set_smob_print (scm_tc16_memoized, memoized_print);
- scm_sym_procname = SCM_CAR (scm_sysintern ("procname", SCM_UNDEFINED));
- scm_sym_dots = SCM_CAR (scm_sysintern ("...", SCM_UNDEFINED));
- scm_sym_source = SCM_CAR (scm_sysintern ("source", SCM_UNDEFINED));
+ scm_tc16_debugobj = scm_make_smob_type ("debug-object", 0);
+ scm_set_smob_print (scm_tc16_debugobj, debugobj_print);
#ifdef GUILE_DEBUG
- scm_sysintern ("SCM_IM_AND", SCM_IM_AND);
- scm_sysintern ("SCM_IM_BEGIN", SCM_IM_BEGIN);
- scm_sysintern ("SCM_IM_CASE", SCM_IM_CASE);
- scm_sysintern ("SCM_IM_COND", SCM_IM_COND);
- scm_sysintern ("SCM_IM_DO", SCM_IM_DO);
- scm_sysintern ("SCM_IM_IF", SCM_IM_IF);
- scm_sysintern ("SCM_IM_LAMBDA", SCM_IM_LAMBDA);
- scm_sysintern ("SCM_IM_LET", SCM_IM_LET);
- scm_sysintern ("SCM_IM_LETSTAR", SCM_IM_LETSTAR);
- scm_sysintern ("SCM_IM_LETREC", SCM_IM_LETREC);
- scm_sysintern ("SCM_IM_OR", SCM_IM_OR);
- scm_sysintern ("SCM_IM_QUOTE", SCM_IM_QUOTE);
- scm_sysintern ("SCM_IM_SET_X", SCM_IM_SET_X);
- scm_sysintern ("SCM_IM_DEFINE", SCM_IM_DEFINE);
- scm_sysintern ("SCM_IM_APPLY", SCM_IM_APPLY);
- scm_sysintern ("SCM_IM_CONT", SCM_IM_CONT);
- scm_sysintern ("SCM_IM_DISPATCH", SCM_IM_DISPATCH);
+ scm_c_define ("SCM_IM_AND", SCM_IM_AND);
+ scm_c_define ("SCM_IM_BEGIN", SCM_IM_BEGIN);
+ scm_c_define ("SCM_IM_CASE", SCM_IM_CASE);
+ scm_c_define ("SCM_IM_COND", SCM_IM_COND);
+ scm_c_define ("SCM_IM_DO", SCM_IM_DO);
+ scm_c_define ("SCM_IM_IF", SCM_IM_IF);
+ scm_c_define ("SCM_IM_LAMBDA", SCM_IM_LAMBDA);
+ scm_c_define ("SCM_IM_LET", SCM_IM_LET);
+ scm_c_define ("SCM_IM_LETSTAR", SCM_IM_LETSTAR);
+ scm_c_define ("SCM_IM_LETREC", SCM_IM_LETREC);
+ scm_c_define ("SCM_IM_OR", SCM_IM_OR);
+ scm_c_define ("SCM_IM_QUOTE", SCM_IM_QUOTE);
+ scm_c_define ("SCM_IM_SET_X", SCM_IM_SET_X);
+ scm_c_define ("SCM_IM_DEFINE", SCM_IM_DEFINE);
+ scm_c_define ("SCM_IM_APPLY", SCM_IM_APPLY);
+ scm_c_define ("SCM_IM_CONT", SCM_IM_CONT);
+ scm_c_define ("SCM_IM_DISPATCH", SCM_IM_DISPATCH);
#endif
scm_add_feature ("debug-extensions");
-#include "debug.x"
+#include "libguile/debug.x"
}
/*
HCoop / bpt / guile.git / blobdiff