/* Debugging extensions for Guile
- * Copyright (C) 1995, 1996, 1997 Free Software Foundation
+ * Copyright (C) 1995,1996,1997,1998,1999,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
* The author can be reached at djurfeldt@nada.kth.se
* Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
-#include <stdio.h>
-#include "_scm.h"
-#include "eval.h"
-#include "throw.h"
-#include "genio.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 "debug.h"
+/* 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"
+#include "libguile/eval.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/validate.h"
+#include "libguile/debug.h"
\f
/* {Run time control of the debugging evaluator}
*/
-SCM_PROC (s_debug_options, "debug-options-interface", 0, 1, 0, scm_debug_options);
-
-SCM
-scm_debug_options (setting)
- SCM setting;
+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 @var{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,
- s_debug_options);
+ FUNC_NAME);
#ifndef SCM_RECKLESS
if (!(1 <= SCM_N_FRAMES && SCM_N_FRAMES <= SCM_MAX_FRAME_SIZE))
{
- scm_options (ans, scm_debug_opts, SCM_N_DEBUG_OPTIONS, s_debug_options);
- scm_out_of_range (s_debug_options, setting);
+ scm_options (ans, scm_debug_opts, SCM_N_DEBUG_OPTIONS, FUNC_NAME);
+ SCM_OUT_OF_RANGE (1, setting);
}
#endif
SCM_RESET_DEBUG_MODE;
+ scm_stack_checking_enabled_p = SCM_STACK_CHECKING_P;
scm_debug_eframe_size = 2 * SCM_N_FRAMES;
- SCM_ALLOW_INTS
+ SCM_ALLOW_INTS;
return ans;
}
-
-SCM_PROC (s_with_traps, "with-traps", 1, 0, 0, scm_with_traps);
+#undef FUNC_NAME
static void
with_traps_before (void *data)
static SCM
with_traps_inner (void *data)
{
- SCM thunk = (SCM) data;
+ SCM thunk = SCM_PACK (data);
return scm_apply (thunk, SCM_EOL, SCM_EOL);
}
-SCM
-scm_with_traps (SCM 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_ASSERT (SCM_NFALSEP (scm_thunk_p (thunk)),
- thunk,
- SCM_ARG1,
- s_with_traps);
+ 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_i_source, scm_i_more;
-static SCM scm_i_proc, scm_i_args, scm_i_eval_args;
-static SCM scm_i_procname;
+
+SCM_SYMBOL (scm_sym_procname, "procname");
+SCM_SYMBOL (scm_sym_dots, "...");
+SCM_SYMBOL (scm_sym_source, "source");
/* {Memoized Source}
*/
-long scm_tc16_memoized;
-
-
-static int prinmemoized SCM_P ((SCM obj, SCM port, scm_print_state *pstate));
+scm_bits_t scm_tc16_memoized;
static int
-prinmemoized (obj, port, pstate)
- 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);
return 1;
}
-static scm_smobfuns memoizedsmob =
-{scm_markcdr, scm_free0, prinmemoized, 0};
-
-SCM_PROC (s_memoized_p, "memoized?", 1, 0, 0, scm_memoized_p);
-
-SCM
-scm_memoized_p (obj)
- SCM obj;
+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_NIMP (obj) && SCM_MEMOIZEDP (obj) ? SCM_BOOL_T : SCM_BOOL_F;
+ return SCM_BOOL(SCM_MEMOIZEDP (obj));
}
+#undef FUNC_NAME
SCM
-scm_make_memoized (exp, env)
- SCM exp;
- SCM env;
+scm_make_memoized (SCM exp, SCM env)
{
/* *fixme* Check that env is a valid environment. */
register SCM z, ans;
SCM_ENTER_A_SECTION;
- SCM_NEWCELL (z);
- SCM_SETCDR (z, env);
- SCM_SETCAR (z, exp);
- SCM_NEWCELL (ans);
- SCM_SETCDR (ans, z);
- SCM_SETCAR (ans, scm_tc16_memoized);
+ SCM_NEWSMOB (z, SCM_UNPACK (exp), SCM_UNPACK (env));
+ SCM_NEWSMOB (ans, scm_tc16_memoized, SCM_UNPACK (z));
SCM_EXIT_A_SECTION;
return ans;
}
* - constant: SCM_IM_DEFINE
* - constant: SCM_IM_APPLY
* - constant: SCM_IM_CONT
+ * - constant: SCM_IM_DISPATCH
*/
-#include "variable.h"
-#include "procs.h"
-
-SCM_PROC (s_make_gloc, "make-gloc", 1, 1, 0, scm_make_gloc);
+#include "libguile/variable.h"
+#include "libguile/procs.h"
-SCM
-scm_make_gloc (var, env)
- SCM var;
- SCM env;
+SCM_DEFINE (scm_make_gloc, "make-gloc", 1, 1, 0,
+ (SCM var, SCM env),
+ "Create a gloc for variable @var{var} in the environment\n"
+ "@var{env}.")
+#define FUNC_NAME s_scm_make_gloc
{
-#if 1 /* Unsafe */
- if (SCM_NIMP (var) && SCM_CONSP (var))
- var = scm_cons (SCM_BOOL_F, var);
- else
-#endif
- SCM_ASSERT (SCM_NIMP (var) && SCM_VARIABLEP (var),
- var,
- SCM_ARG1,
- s_make_gloc);
+ SCM_VALIDATE_VARIABLE (1,var);
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_ASSERT (SCM_NULLP (env) || (SCM_NIMP (env) && SCM_CONSP (env)),
- env,
- SCM_ARG2,
- s_make_gloc);
- return scm_make_memoized (SCM_VARVCELL (var) + 1, env);
+ SCM_VALIDATE_NULLORCONS (2,env);
+ return scm_make_memoized (SCM_PACK (SCM_UNPACK (var) + scm_tc3_cons_gloc), env);
}
+#undef FUNC_NAME
-SCM_PROC (s_gloc_p, "gloc?", 1, 0, 0, scm_gloc_p);
-
-SCM
-scm_gloc_p (obj)
- SCM obj;
+SCM_DEFINE (scm_gloc_p, "gloc?", 1, 0, 0,
+ (SCM obj),
+ "Return @code{#t} if @var{obj} is a gloc.")
+#define FUNC_NAME s_scm_gloc_p
{
- return ((SCM_NIMP (obj)
- && SCM_MEMOIZEDP (obj)
- && (SCM_MEMOIZED_EXP (obj) & 7) == 1)
- ? SCM_BOOL_T
- : SCM_BOOL_F);
+ return
+ SCM_BOOL (SCM_MEMOIZEDP (obj)
+ && ((SCM_UNPACK(SCM_MEMOIZED_EXP(obj))&7) == scm_tc3_cons_gloc));
}
+#undef FUNC_NAME
-SCM_PROC (s_make_iloc, "make-iloc", 3, 0, 0, scm_make_iloc);
-
-SCM
-scm_make_iloc (frame, binding, cdrp)
- SCM frame;
- SCM binding;
- SCM cdrp;
+SCM_DEFINE (scm_make_iloc, "make-iloc", 3, 0, 0,
+ (SCM frame, SCM binding, SCM cdrp),
+ "Return a new iloc with frame offset @var{frame}, binding\n"
+ "offset @var{binding} and the cdr flag @var{cdrp}.")
+#define FUNC_NAME s_scm_make_iloc
{
- SCM_ASSERT (SCM_INUMP (frame), frame, SCM_ARG1, s_make_iloc);
- SCM_ASSERT (SCM_INUMP (binding), binding, SCM_ARG2, s_make_iloc);
- return (SCM_ILOC00
- + SCM_IFRINC * SCM_INUM (frame)
- + (SCM_NFALSEP (cdrp) ? SCM_ICDR : 0)
- + SCM_IDINC * SCM_INUM (binding));
+ SCM_VALIDATE_INUM (1,frame);
+ SCM_VALIDATE_INUM (2,binding);
+ return SCM_PACK (SCM_UNPACK (SCM_ILOC00)
+ + SCM_IFRINC * SCM_INUM (frame)
+ + (SCM_NFALSEP (cdrp) ? SCM_ICDR : 0)
+ + SCM_IDINC * SCM_INUM (binding));
}
+#undef FUNC_NAME
-SCM_PROC (s_iloc_p, "iloc?", 1, 0, 0, scm_iloc_p);
-
-SCM
-scm_iloc_p (obj)
- SCM obj;
+SCM_DEFINE (scm_iloc_p, "iloc?", 1, 0, 0,
+ (SCM obj),
+ "Return @code{#t} if @var{obj} is an iloc.")
+#define FUNC_NAME s_scm_iloc_p
{
- return SCM_ILOCP (obj) ? SCM_BOOL_T : SCM_BOOL_F;
+ return SCM_BOOL(SCM_ILOCP (obj));
}
+#undef FUNC_NAME
-SCM_PROC (s_memcons, "memcons", 2, 1, 0, scm_memcons);
-
-SCM
-scm_memcons (car, cdr, env)
- SCM car;
- SCM cdr;
- SCM env;
+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_NIMP (car) && SCM_MEMOIZEDP (car))
+ 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 (s_memcons,
- "environment mismatch arg1 <-> arg3",
+ SCM_MISC_ERROR ("environment mismatch arg1 <-> arg3",
scm_cons2 (car, env, SCM_EOL));
else
env = SCM_MEMOIZED_ENV (car);
car = SCM_MEMOIZED_EXP (car);
}
- if (SCM_NIMP (cdr) && SCM_MEMOIZEDP (cdr))
+ if (SCM_MEMOIZEDP (cdr))
{
if (!SCM_UNBNDP (env) && SCM_MEMOIZED_ENV (cdr) != env)
- scm_misc_error (s_memcons,
- "environment mismatch arg2 <-> arg3",
+ SCM_MISC_ERROR ("environment mismatch arg2 <-> arg3",
scm_cons2 (cdr, env, SCM_EOL));
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_ASSERT (SCM_NULLP (env) || (SCM_NIMP (env) && SCM_CONSP (env)),
- env,
- SCM_ARG3,
- s_make_iloc);
+ SCM_VALIDATE_NULLORCONS (3,env);
return scm_make_memoized (scm_cons (car, cdr), env);
}
+#undef FUNC_NAME
-SCM_PROC (s_mem_to_proc, "mem->proc", 1, 0, 0, scm_mem_to_proc);
-
-SCM
-scm_mem_to_proc (obj)
- SCM obj;
+SCM_DEFINE (scm_mem_to_proc, "mem->proc", 1, 0, 0,
+ (SCM obj),
+ "Convert a memoized object (which must be a lambda expression)\n"
+ "to a procedure.")
+#define FUNC_NAME s_scm_mem_to_proc
{
SCM env;
- SCM_ASSERT (SCM_NIMP (obj) && SCM_MEMOIZEDP (obj),
- obj,
- SCM_ARG1,
- s_mem_to_proc);
+ 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 (s_mem_to_proc,
- "expected lambda expression",
+ SCM_MISC_ERROR ("expected lambda expression",
scm_cons (obj, SCM_EOL));
return scm_closure (SCM_CDR (obj), env);
}
+#undef FUNC_NAME
-SCM_PROC (s_proc_to_mem, "proc->mem", 1, 0, 0, scm_proc_to_mem);
-
-SCM
-scm_proc_to_mem (obj)
- SCM obj;
+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_ASSERT (SCM_NIMP (obj) && SCM_CLOSUREP (obj),
- obj,
- SCM_ARG1,
- s_proc_to_mem);
+ SCM_VALIDATE_CLOSURE (1, obj);
return scm_make_memoized (scm_cons (SCM_IM_LAMBDA, SCM_CODE (obj)),
SCM_ENV (obj));
}
+#undef FUNC_NAME
#endif /* GUILE_DEBUG */
-SCM_PROC (s_unmemoize, "unmemoize", 1, 0, 0, scm_unmemoize);
-
-SCM
-scm_unmemoize (m)
- SCM m;
+SCM_DEFINE (scm_unmemoize, "unmemoize", 1, 0, 0,
+ (SCM m),
+ "Unmemoize the memoized expression @var{m},")
+#define FUNC_NAME s_scm_unmemoize
{
- SCM_ASSERT (SCM_NIMP (m) && SCM_MEMOIZEDP (m), m, SCM_ARG1, s_unmemoize);
+ SCM_VALIDATE_MEMOIZED (1,m);
return scm_unmemocopy (SCM_MEMOIZED_EXP (m), SCM_MEMOIZED_ENV (m));
}
+#undef FUNC_NAME
-SCM_PROC (s_memoized_environment, "memoized-environment", 1, 0, 0, scm_memoized_environment);
-
-SCM
-scm_memoized_environment (m)
- SCM m;
+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_ASSERT (SCM_NIMP (m) && SCM_MEMOIZEDP (m), m, SCM_ARG1, s_unmemoize);
+ SCM_VALIDATE_MEMOIZED (1,m);
return SCM_MEMOIZED_ENV (m);
}
+#undef FUNC_NAME
-SCM_PROC (s_procedure_name, "procedure-name", 1, 0, 0, scm_procedure_name);
-
-SCM
-scm_procedure_name (proc)
- SCM proc;
+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_ASSERT(scm_procedure_p (proc) == SCM_BOOL_T,
- proc,
- SCM_ARG1,
- s_procedure_name);
+ SCM_VALIDATE_PROC (1,proc);
switch (SCM_TYP7 (proc)) {
- case scm_tcs_closures:
- case scm_tc7_cclo:
+ case scm_tcs_subrs:
+ return SCM_SNAME (proc);
+ default:
{
- SCM name = scm_procedure_property (proc, scm_i_name);
+ SCM name = scm_procedure_property (proc, scm_sym_name);
#if 0
- /* Source property scm_i_procname not implemented yet... */
- SCM name = scm_source_property (SCM_CAR (SCM_CDR (SCM_CODE (proc))), scm_i_procname);
+ /* 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))
- name = scm_procedure_property (proc, scm_i_name);
+ name = scm_procedure_property (proc, scm_sym_name);
#endif
- if (SCM_FALSEP (name))
- name = scm_procedure_property (proc, scm_i_inner_name);
+ if (SCM_FALSEP (name) && SCM_CLOSUREP (proc))
+ name = scm_reverse_lookup (SCM_ENV (proc), proc);
return name;
}
- case scm_tcs_subrs:
- return SCM_SNAME (proc);
- default:
- return SCM_BOOL_F;
}
}
+#undef FUNC_NAME
-SCM_PROC (s_procedure_source, "procedure-source", 1, 0, 0, scm_procedure_source);
-
-SCM
-scm_procedure_source (proc)
- SCM proc;
+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_ASSERT(SCM_NIMP (proc), proc, SCM_ARG1, s_procedure_source);
+ SCM_VALIDATE_NIM (1,proc);
switch (SCM_TYP7 (proc)) {
case scm_tcs_closures:
{
- SCM src;
- src = scm_source_property (SCM_CDR (SCM_CODE (proc)), scm_i_copy);
- if (src != SCM_BOOL_F)
- return scm_cons2 (scm_i_lambda, SCM_CAR (SCM_CODE (proc)), src);
- src = SCM_CODE (proc);
- return scm_cons (scm_i_lambda,
- scm_unmemocopy (src,
- SCM_EXTEND_ENV (SCM_CAR (src),
- SCM_EOL,
- SCM_ENV (proc))));
+ SCM formals = SCM_CLOSURE_FORMALS (proc);
+ SCM src = scm_source_property (SCM_CDR (SCM_CODE (proc)), scm_sym_copy);
+ if (!SCM_FALSEP (src))
+ return scm_cons2 (scm_sym_lambda, formals, src);
+ return scm_cons (scm_sym_lambda,
+ scm_unmemocopy (SCM_CODE (proc),
+ SCM_EXTEND_ENV (formals,
+ SCM_EOL,
+ SCM_ENV (proc))));
}
- case scm_tc7_contin:
case scm_tcs_subrs:
#ifdef CCLO
case scm_tc7_cclo:
#endif
/* It would indeed be a nice thing if we supplied source even for
built in procedures! */
- return scm_procedure_property (proc, scm_i_source);
+ return scm_procedure_property (proc, scm_sym_source);
default:
- scm_wta (proc, (char *) SCM_ARG1, s_procedure_source);
- return 0;
+ SCM_WRONG_TYPE_ARG (1, proc);
+ /* not reached */
}
}
+#undef FUNC_NAME
-SCM_PROC (s_procedure_environment, "procedure-environment", 1, 0, 0, scm_procedure_environment);
-
-SCM
-scm_procedure_environment (proc)
- SCM proc;
+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_ASSERT (SCM_NIMP (proc), proc, SCM_ARG1, s_procedure_environment);
+ 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 (proc, (char *) SCM_ARG1, s_procedure_environment);
- return 0;
+ SCM_WRONG_TYPE_ARG (1, proc);
+ /* not reached */
}
}
+#undef FUNC_NAME
\f
* the code before evaluating. One solution would be to have eval.c
* generate yet another evaluator. They are not very big actually.
*/
-SCM_PROC (s_local_eval, "local-eval", 1, 1, 0, scm_local_eval);
-
-SCM
-scm_local_eval (exp, env)
- SCM exp;
- SCM env;
+SCM_DEFINE (scm_local_eval, "local-eval", 1, 1, 0,
+ (SCM exp, SCM env),
+ "Evaluate @var{exp} in its environment. If @var{env} is supplied,\n"
+ "it is the environment in which to evaluate @var{exp}. Otherwise,\n"
+ "@var{exp} must be a memoized code object (in which case, its environment\n"
+ "is implicit).")
+#define FUNC_NAME s_scm_local_eval
{
if (SCM_UNBNDP (env))
{
- SCM_ASSERT (SCM_NIMP (exp) && SCM_MEMOIZEDP (exp), exp, SCM_ARG1, s_local_eval);
- 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
+
+#if 0
+SCM_REGISTER_PROC (s_reverse_lookup, "reverse-lookup", 2, 0, 0, scm_reverse_lookup);
+#endif
SCM
-scm_start_stack (id, exp, env)
- SCM id;
- SCM exp;
- SCM env;
+scm_reverse_lookup (SCM env, SCM data)
+{
+ while (SCM_CONSP (env) && SCM_CONSP (SCM_CAR (env)))
+ {
+ SCM names = SCM_CAAR (env);
+ SCM values = SCM_CDAR (env);
+ while (SCM_CONSP (names))
+ {
+ if (SCM_EQ_P (SCM_CAR (values), data))
+ return SCM_CAR (names);
+ names = SCM_CDR (names);
+ values = SCM_CDR (values);
+ }
+ if (!SCM_NULLP (names) && SCM_EQ_P (values, data))
+ return names;
+ env = SCM_CDR (env);
+ }
+ return SCM_BOOL_F;
+}
+
+SCM
+scm_start_stack (SCM id, SCM exp, SCM env)
{
SCM answer;
- scm_debug_frame vframe;
- scm_debug_info vframe_vect_body;
+ scm_debug_frame_t vframe;
+ scm_debug_info_t vframe_vect_body;
vframe.prev = scm_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, 0, env);
+ answer = scm_i_eval (exp, env);
scm_last_debug_frame = vframe.prev;
return answer;
}
-static char s_start_stack[] = "start-stack";
-SCM
-scm_m_start_stack (exp, env)
- SCM exp;
- SCM env;
+SCM_SYNTAX(s_start_stack, "start-stack", scm_makacro, scm_m_start_stack);
+
+static SCM
+scm_m_start_stack (SCM exp, SCM env)
+#define FUNC_NAME s_start_stack
{
exp = SCM_CDR (exp);
- SCM_ASSERT (SCM_NIMP (exp)
- && SCM_ECONSP (exp)
- && SCM_NIMP (SCM_CDR (exp))
- && SCM_ECONSP (SCM_CDR (exp))
- && SCM_NULLP (SCM_CDDR (exp)),
- exp,
- SCM_WNA,
- s_start_stack);
+ if (!SCM_ECONSP (exp)
+ || !SCM_ECONSP (SCM_CDR (exp))
+ || !SCM_NULLP (SCM_CDDR (exp)))
+ SCM_WRONG_NUM_ARGS ();
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;
-
-static int prindebugobj SCM_P ((SCM obj, SCM port, scm_print_state *pstate));
+scm_bits_t scm_tc16_debugobj;
static int
-prindebugobj (obj, port, pstate)
- SCM obj;
- SCM port;
- scm_print_state *pstate;
+debugobj_print (SCM obj, SCM port, scm_print_state *pstate)
{
scm_puts ("#<debug-object ", port);
- scm_intprint (SCM_DEBUGOBJ_FRAME (obj), 16, port);
+ scm_intprint ((int) SCM_DEBUGOBJ_FRAME (obj), 16, port);
scm_putc ('>', port);
return 1;
}
-static scm_smobfuns debugobjsmob =
-{0, scm_free0, prindebugobj, 0};
-
-SCM_PROC (s_debug_object_p, "debug-object?", 1, 0, 0, scm_debug_object_p);
-
-SCM
-scm_debug_object_p (obj)
- SCM obj;
+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_NIMP (obj) && SCM_DEBUGOBJP (obj) ? SCM_BOOL_T : SCM_BOOL_F;
+ return SCM_BOOL(SCM_DEBUGOBJP (obj));
}
+#undef FUNC_NAME
SCM
-scm_make_debugobj (frame)
- scm_debug_frame *frame;
+scm_make_debugobj (scm_debug_frame_t *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_SET_DEBUGOBJ_FRAME (z, frame);
+ SCM_SET_CELL_TYPE (z, scm_tc16_debugobj);
SCM_EXIT_A_SECTION;
return z;
}
/* Undocumented debugging procedure */
#ifdef GUILE_DEBUG
-SCM_PROC (s_debug_hang, "debug-hang", 0, 1, 0, scm_debug_hang);
-
-SCM
-scm_debug_hang (obj)
- SCM obj;
+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;
while (!go) ;
return SCM_UNSPECIFIED;
}
+#undef FUNC_NAME
#endif
\f
{
scm_init_opts (scm_debug_options, scm_debug_opts, SCM_N_DEBUG_OPTIONS);
- scm_tc16_memoized = scm_newsmob (&memoizedsmob);
- scm_tc16_debugobj = scm_newsmob (&debugobjsmob);
+ 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_i_procname = SCM_CAR (scm_sysintern ("procname", SCM_UNDEFINED));
- scm_i_more = SCM_CAR (scm_sysintern ("...", SCM_UNDEFINED));
- scm_i_source = SCM_CAR (scm_sysintern ("source", SCM_UNDEFINED));
- scm_i_proc = SCM_CAR (scm_sysintern ("proc", SCM_UNDEFINED));
- scm_i_args = SCM_CAR (scm_sysintern ("args", SCM_UNDEFINED));
- scm_i_eval_args = SCM_CAR (scm_sysintern ("eval-args", SCM_UNDEFINED));
-
- scm_make_synt (s_start_stack, scm_makacro, scm_m_start_stack);
+ 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", SCM_IM_SET);
- 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_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"
+#ifndef SCM_MAGIC_SNARFER
+#include "libguile/debug.x"
+#endif
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
HCoop / bpt / guile.git / blobdiff