mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 14:50:19 +02:00
Code Activity

* print.c (scm_iprin1): Turned write' and display' into

Browse source 
primitive generics and use their associated generic functions in
scm_iprin1 for GOOPS objects.
This commit is contained in:
Mikael Djurfeldt 1999-09-15 17:33:58 +00:00
parent 44fdbfc668
commit 8b840115f8
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libguile/print.c
View file

@ -53,6 +53,7 @@
#include "unif.h" #include "unif.h"
#include "alist.h" #include "alist.h"
#include "struct.h" #include "struct.h"
#include "objects.h"
#include "print.h" #include "print.h"
@ -283,7 +284,8 @@ print_circref (port, pstate, ref)
/* Print generally. Handles both write and display according to PSTATE. /* Print generally. Handles both write and display according to PSTATE.
*/ */
SCM_GPROC(s_write, "write", 1, 1, 0, scm_write, g_write);
SCM_GPROC(s_display, "display", 1, 1, 0, scm_display, g_display);
void void
scm_iprin1 (exp, port, pstate) scm_iprin1 (exp, port, pstate)
@ -347,7 +349,21 @@ taloop:
if (SCM_CDR (SCM_CAR (exp) - 1L) == 0) if (SCM_CDR (SCM_CAR (exp) - 1L) == 0)
{ {
ENTER_NESTED_DATA (pstate, exp, circref); ENTER_NESTED_DATA (pstate, exp, circref);
scm_print_struct (exp, port, pstate); if (SCM_OBJ_CLASS_FLAGS (exp) & SCM_CLASSF_GOOPS)
{
SCM pwps, print = pstate->writingp ? g_write : g_display;
if (!print)
goto print_struct;
SCM_NEWSMOB (pwps,
scm_tc16_port_with_ps,
scm_cons (port, pstate->handle));
scm_call_generic_2 (print, exp, pwps);
}
else
{
print_struct:
scm_print_struct (exp, port, pstate);
}
EXIT_NESTED_DATA (pstate); EXIT_NESTED_DATA (pstate);
break; break;
} }
@ -892,7 +908,7 @@ scm_valid_oport_value_p (SCM val)
&& SCM_OPOUTPORTP (SCM_PORT_WITH_PS_PORT (val))))); && SCM_OPOUTPORTP (SCM_PORT_WITH_PS_PORT (val)))));
} }
SCM_PROC(s_write, "write", 1, 1, 0, scm_write); /* SCM_GPROC(s_write, "write", 1, 1, 0, scm_write, g_write); */
SCM SCM
scm_write (obj, port) scm_write (obj, port)
@ -915,7 +931,7 @@ scm_write (obj, port)
} }
SCM_PROC(s_display, "display", 1, 1, 0, scm_display); /* SCM_GPROC(s_display, "display", 1, 1, 0, scm_display, g_display); */
SCM SCM
scm_display (obj, port) scm_display (obj, port)