summaryrefslogtreecommitdiff
path: root/libguile/debug.c
diff options
context:
space:
mode:
authorGreg J. Badros <gjb@cs.washington.edu>1999-12-14 17:41:59 +0000
committerGreg J. Badros <gjb@cs.washington.edu>1999-12-14 17:41:59 +0000
commite8e9b690b4f0394f958e0613bc2a4d5e8c524518 (patch)
tree9368d40ade081bf917992e8f6092cc6d95104963 /libguile/debug.c
parent5623a9b4590618773e7969b512850cd92bfd79ed (diff)
downloadguile-e8e9b690b4f0394f958e0613bc2a4d5e8c524518.tar.gz
* backtrace.c (scm_set_print_params_x): Renamed from
set_print_params_x. * guile-doc-snarf.in: Use guile-snarf.awk, not guile-doc-snarf.awk. Pass the basename of $filename * load.h: Added prototypes for scm_sys_library_dir, scm_sys_site_dir. * load.c (scm_sys_library_dir, scm_sys_site_dir): Added these functions, and took out the old scm_library_dir, scm_site_dir, scm_pkgdata_dir. Now the primitives are %package-data-dir (already existed), %library-dir, and %site-dir. * debug.c: Use SCM_MISC_ERROR when possible instead of using s_scm_* in a scm_misc_error() call. * Makefile.am: Use guile-snarf.awk, not guile-doc-snarf.awk. Make using guile-doc-snarf send stdout to $@ to create the .x file like guile-snarf does. * guile-snarf.awk.in: Added.
Diffstat (limited to 'libguile/debug.c')
-rw-r--r--libguile/debug.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/libguile/debug.c b/libguile/debug.c
index d88b055f0..dd2c13ff8 100644
--- a/libguile/debug.c
+++ b/libguile/debug.c
@@ -312,8 +312,7 @@ GUILE_PROC (scm_memcons, "memcons", 2, 1, 0,
{
/*fixme* environments may be two different but equal top-level envs */
if (!SCM_UNBNDP (env) && SCM_MEMOIZED_ENV (car) != env)
- scm_misc_error (s_scm_memcons,
- "environment mismatch arg1 <-> arg3",
+ SCM_MISC_ERROR ("environment mismatch arg1 <-> arg3",
scm_cons2 (car, env, SCM_EOL));
else
env = SCM_MEMOIZED_ENV (car);
@@ -322,8 +321,7 @@ GUILE_PROC (scm_memcons, "memcons", 2, 1, 0,
if (SCM_NIMP (cdr) && SCM_MEMOIZEDP (cdr))
{
if (!SCM_UNBNDP (env) && SCM_MEMOIZED_ENV (cdr) != env)
- scm_misc_error (s_scm_memcons,
- "environment mismatch arg2 <-> arg3",
+ SCM_MISC_ERROR ("environment mismatch arg2 <-> arg3",
scm_cons2 (cdr, env, SCM_EOL));
else
env = SCM_MEMOIZED_ENV (cdr);
@@ -332,10 +330,7 @@ GUILE_PROC (scm_memcons, "memcons", 2, 1, 0,
if (SCM_UNBNDP (env))
env = scm_top_level_env (SCM_CDR (scm_top_level_lookup_closure_var));
else
- SCM_ASSERT (SCM_NULLP (env) || (SCM_NIMP (env) && SCM_CONSP (env)),
- env,
- SCM_ARG3,
- s_scm_make_iloc);
+ SCM_VALIDATE_NULLORCONS(3,env);
return scm_make_memoized (scm_cons (car, cdr), env);
}
#undef FUNC_NAME
@@ -350,8 +345,7 @@ GUILE_PROC (scm_mem_to_proc, "mem->proc", 1, 0, 0,
env = SCM_MEMOIZED_ENV (obj);
obj = SCM_MEMOIZED_EXP (obj);
if (!(SCM_NIMP (obj) && SCM_CAR (obj) == SCM_IM_LAMBDA))
- scm_misc_error (s_scm_mem_to_proc,
- "expected lambda expression",
+ SCM_MISC_ERROR ("expected lambda expression",
scm_cons (obj, SCM_EOL));
return scm_closure (SCM_CDR (obj), env);
}