summaryrefslogtreecommitdiff
path: root/libguile/print.c
diff options
context:
space:
mode:
authorMikael Djurfeldt <djurfeldt@nada.kth.se>1997-09-11 00:09:57 +0000
committerMikael Djurfeldt <djurfeldt@nada.kth.se>1997-09-11 00:09:57 +0000
commit80ea260cdf5ff69b5c9c3a681204bbef63963d54 (patch)
treec197776b7ee1b21800f51ed858482c72092d583b /libguile/print.c
parent2c6300009875da1b834a0007715a08c47f8bf45d (diff)
downloadguile-80ea260cdf5ff69b5c9c3a681204bbef63963d54.tar.gz
* procprop.h: Added declaration of scm_i_inner_name.
* gsubr.c: New global symbol scm_i_inner_name. * debug.c (scm_procedure_name): Try procedure property `inner-name' if `name' fails. * print.c (scm_iprin1): Use scm_macro_name. * eval.c (scm_m_define): Give names to macros as well; Only the first top-level definition gives a procedure/macro a name. Otherwise confusing names can turn up in backtraces. (SCM_CEVAL): SCM_IM_DEFINE: Set `inner-name' property instead of `name'; Give names to macros as well. * procs.c (scm_closure_p), print.c (scm_iprin1), eval.c (scm_macro_transformer): Use SCM_CLOSUREP instead of scm_closure_p.
Diffstat (limited to 'libguile/print.c')
-rw-r--r--libguile/print.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/print.c b/libguile/print.c
index 026718652..7603ad9d9 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -348,7 +348,7 @@ taloop:
print_circref (port, pstate, exp);
break;
macros:
- if (SCM_FALSEP (scm_closure_p (SCM_CDR (exp))))
+ if (!SCM_CLOSUREP (SCM_CDR (exp)))
goto prinmacro;
case scm_tcs_closures:
/* The user supplied print closure procedure must handle
@@ -369,8 +369,8 @@ taloop:
{
/* Printing a macro. */
prinmacro:
- name = scm_procedure_name (SCM_CDR (exp));
- if (SCM_FALSEP (scm_closure_p (SCM_CDR (exp))))
+ name = scm_macro_name (exp);
+ if (!SCM_CLOSUREP (SCM_CDR (exp)))
{
code = 0;
scm_gen_puts (scm_regular_string, "#<primitive-",