#include "_scm.h"
#include "chars.h"
#include "genio.h"
-#include "mbstrings.h"
#include "smob.h"
#include "eval.h"
#include "procprop.h"
#include "unif.h"
#include "alist.h"
#include "struct.h"
-#include "fluids.h"
#include "print.h"
\f
{ \
if (pstate->top - pstate->list_offset >= pstate->level) \
{ \
- scm_gen_putc ('#', port); \
+ scm_putc ('#', port); \
return; \
} \
} \
#define EXIT_NESTED_DATA(pstate) { --pstate->top; }
-static SCM print_state_pool;
-
-/* This fluid is an implicit parameter to scm_iprin (and thus
-scm_display and scm_write) and carries the current print_state when
-Scheme code is called to do some printing. That way, circular
-references are detected even when they reach across calls to `display'
-or `write'.
-
-The fluid is not visible to Scheme code, but maybe it should. */
+SCM scm_print_state_vtable;
-static SCM print_state_fluid;
-static int print_state_fluid_num;
+static SCM print_state_pool;
#ifdef GUILE_DEBUG /* Used for debugging purposes */
SCM_PROC(s_current_pstate, "current-pstate", 0, 0, 0, scm_current_pstate);
return answer ? answer : make_print_state ();
}
+static char s_print_state_printer[] = "print-state-printer";
+static SCM
+print_state_printer (obj, port)
+ SCM obj;
+ SCM port;
+{
+ /* This function can be made visible by means of struct-ref, so
+ we need to make sure that it gets what it wants. */
+ SCM_ASSERT (SCM_NIMP (obj) && SCM_PRINT_STATE_P (obj),
+ obj,
+ SCM_ARG1,
+ s_print_state_printer);
+ SCM_ASSERT (scm_valid_oport_value_p (port),
+ port,
+ SCM_ARG2,
+ s_print_state_printer);
+ port = SCM_COERCE_OPORT (port);
+ scm_puts ("#<print-state ", port);
+ scm_intprint (obj, 16, port);
+ scm_putc ('>', port);
+ return SCM_UNSPECIFIED;
+}
+
void
scm_free_print_state (print_state)
SCM print_state;
* often.
*/
pstate->fancyp = 0;
+ pstate->revealed = 0;
SCM_NEWCELL (handle);
SCM_DEFER_INTS;
SCM_SETCAR (handle, print_state);
for (i = pstate->top - 1; 1; --i)
if (pstate->ref_stack[i] == ref)
break;
- scm_gen_putc ('#', port);
+ scm_putc ('#', port);
scm_intprint (i - self, 10, port);
- scm_gen_putc ('#', port);
+ scm_putc ('#', port);
}
/* Print generally. Handles both write and display according to PSTATE.
if (SCM_ICHRP (exp))
{
i = SCM_ICHR (exp);
- scm_put_wchar (i, port, SCM_WRITINGP (pstate));
-
+ if (SCM_WRITINGP (pstate))
+ {
+ scm_puts ("#\\", port);
+ if ((i >= 0) && (i <= ' ') && scm_charnames[i])
+ scm_puts (scm_charnames[i], port);
+ else if (i < 0 || i > '\177')
+ scm_intprint (i, 8, port);
+ else
+ scm_putc (i, port);
+ }
+ else
+ scm_putc (i, port);
}
else if (SCM_IFLAGP (exp)
&& (SCM_ISYMNUM (exp) < (sizeof scm_isymnames / sizeof (char *))))
- scm_gen_puts (scm_regular_string, SCM_ISYMCHARS (exp), port);
+ scm_puts (SCM_ISYMCHARS (exp), port);
else if (SCM_ILOCP (exp))
{
- scm_gen_puts (scm_regular_string, "#@", port);
+ scm_puts ("#@", port);
scm_intprint ((long) SCM_IFRAME (exp), 10, port);
- scm_gen_putc (SCM_ICDRP (exp) ? '-' : '+', port);
+ scm_putc (SCM_ICDRP (exp) ? '-' : '+', port);
scm_intprint ((long) SCM_IDIST (exp), 10, port);
}
else
break;
case 1:
/* gloc */
- scm_gen_puts (scm_regular_string, "#@", port);
+ scm_puts ("#@", port);
exp = SCM_CAR (exp - 1);
goto taloop;
default:
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
macro closures as well. */
- if (SCM_NFALSEP (scm_procedure_p (SCM_PRINT_CLOSURE)))
- {
- SCM ans = scm_cons2 (exp, port,
- scm_cons (SCM_WRITINGP (pstate)
- ? SCM_BOOL_T
- : SCM_BOOL_F,
- SCM_EOL));
- ans = scm_apply (SCM_PRINT_CLOSURE, ans, SCM_EOL);
- }
- else
- {
- SCM name, code;
- if (SCM_TYP16 (exp) == scm_tc16_macro)
- {
- /* Printing a macro. */
- prinmacro:
- name = scm_procedure_name (SCM_CDR (exp));
- if (SCM_FALSEP (scm_closure_p (SCM_CDR (exp))))
- {
- code = 0;
- scm_gen_puts (scm_regular_string, "#<primitive-",
- port);
- }
- else
- {
- code = SCM_CODE (SCM_CDR (exp));
- scm_gen_puts (scm_regular_string, "#<", port);
- }
- if (SCM_CAR (exp) & (3L << 16))
- scm_gen_puts (scm_regular_string, "macro", port);
- else
- scm_gen_puts (scm_regular_string, "syntax", port);
- if (SCM_CAR (exp) & (2L << 16))
- scm_gen_putc ('!', port);
- }
- else
- {
- /* Printing a closure. */
- name = scm_procedure_name (exp);
- code = SCM_CODE (exp);
- scm_gen_puts (scm_regular_string, "#<procedure",
- port);
- }
- if (SCM_NIMP (name) && SCM_ROSTRINGP (name))
- {
- scm_gen_putc (' ', port);
- scm_gen_puts (scm_regular_string, SCM_ROCHARS (name), port);
- }
- if (code)
- {
- scm_gen_putc (' ', port);
- scm_iprin1 (SCM_CAR (code), port, pstate);
- }
- if (code && SCM_PRINT_SOURCE_P)
- {
- code = scm_unmemocopy (SCM_CDR (code),
- SCM_EXTEND_ENV (SCM_CAR (code),
- SCM_EOL,
- SCM_ENV (exp)));
- ENTER_NESTED_DATA (pstate, exp, circref);
- scm_iprlist (" ", code, '>', port, pstate);
- EXIT_NESTED_DATA (pstate);
- }
- else
- scm_gen_putc ('>', port);
- }
- break;
- case scm_tc7_mb_string:
- case scm_tc7_mb_substring:
- scm_print_mb_string (exp, port, SCM_WRITINGP (pstate));
+ if (SCM_FALSEP (scm_procedure_p (SCM_PRINT_CLOSURE))
+ || SCM_FALSEP (scm_printer_apply (SCM_PRINT_CLOSURE,
+ exp, port, pstate)));
+ {
+ SCM name, code, env;
+ if (SCM_TYP16 (exp) == scm_tc16_macro)
+ {
+ /* Printing a macro. */
+ prinmacro:
+ name = scm_macro_name (exp);
+ if (!SCM_CLOSUREP (SCM_CDR (exp)))
+ {
+ code = env = 0;
+ scm_puts ("#<primitive-", port);
+ }
+ else
+ {
+ code = SCM_CODE (SCM_CDR (exp));
+ env = SCM_ENV (SCM_CDR (exp));
+ scm_puts ("#<", port);
+ }
+ if (SCM_CAR (exp) & (3L << 16))
+ scm_puts ("macro", port);
+ else
+ scm_puts ("syntax", port);
+ if (SCM_CAR (exp) & (2L << 16))
+ scm_putc ('!', port);
+ }
+ else
+ {
+ /* Printing a closure. */
+ name = scm_procedure_name (exp);
+ code = SCM_CODE (exp);
+ env = SCM_ENV (exp);
+ scm_puts ("#<procedure", port);
+ }
+ if (SCM_NIMP (name) && SCM_ROSTRINGP (name))
+ {
+ scm_putc (' ', port);
+ scm_puts (SCM_ROCHARS (name), port);
+ }
+ if (code)
+ {
+ if (SCM_PRINT_SOURCE_P)
+ {
+ code = scm_unmemocopy (code,
+ SCM_EXTEND_ENV (SCM_CAR (code),
+ SCM_EOL,
+ env));
+ ENTER_NESTED_DATA (pstate, exp, circref);
+ scm_iprlist (" ", code, '>', port, pstate);
+ EXIT_NESTED_DATA (pstate);
+ }
+ else
+ {
+ if (SCM_TYP16 (exp) != scm_tc16_macro)
+ {
+ scm_putc (' ', port);
+ scm_iprin1 (SCM_CAR (code), port, pstate);
+ }
+ scm_putc ('>', port);
+ }
+ }
+ else
+ scm_putc ('>', port);
+ }
break;
case scm_tc7_substring:
case scm_tc7_string:
if (SCM_WRITINGP (pstate))
{
- scm_gen_putc ('"', port);
+ scm_putc ('"', port);
for (i = 0; i < SCM_ROLENGTH (exp); ++i)
switch (SCM_ROCHARS (exp)[i])
{
case '"':
case '\\':
- scm_gen_putc ('\\', port);
+ scm_putc ('\\', port);
default:
- scm_gen_putc (SCM_ROCHARS (exp)[i], port);
+ scm_putc (SCM_ROCHARS (exp)[i], port);
}
- scm_gen_putc ('"', port);
+ scm_putc ('"', port);
break;
}
else
- scm_gen_write (scm_regular_string, SCM_ROCHARS (exp),
- (scm_sizet) SCM_ROLENGTH (exp),
- port);
+ scm_lfwrite (SCM_ROCHARS (exp), (scm_sizet) SCM_ROLENGTH (exp),
+ port);
break;
case scm_tcs_symbols:
- if (SCM_MB_STRINGP (exp))
- {
- scm_print_mb_symbol (exp, port);
- break;
- }
- else
{
int pos;
int end;
maybe_weird = 0;
if (len == 0)
- scm_gen_write (scm_regular_string, "#{}#", 4, port);
+ scm_lfwrite ("#{}#", 4, port);
for (end = pos; end < len; ++end)
switch (str[end])
}
if (!weird)
{
- scm_gen_write (scm_regular_string, "#{", 2, port);
+ scm_lfwrite ("#{", 2, port);
weird = 1;
}
if (pos < end)
{
- scm_gen_write (scm_regular_string, str + pos, end - pos, port);
+ scm_lfwrite (str + pos, end - pos, port);
}
{
char buf[2];
buf[0] = '\\';
buf[1] = str[end];
- scm_gen_write (scm_regular_string, buf, 2, port);
+ scm_lfwrite (buf, 2, port);
}
pos = end + 1;
break;
break;
}
if (pos < end)
- scm_gen_write (scm_regular_string, str + pos, end - pos, port);
+ scm_lfwrite (str + pos, end - pos, port);
if (weird)
- scm_gen_write (scm_regular_string, "}#", 2, port);
+ scm_lfwrite ("}#", 2, port);
break;
}
case scm_tc7_wvect:
ENTER_NESTED_DATA (pstate, exp, circref);
if (SCM_IS_WHVEC (exp))
- scm_gen_puts (scm_regular_string, "#wh(", port);
+ scm_puts ("#wh(", port);
else
- scm_gen_puts (scm_regular_string, "#w(", port);
+ scm_puts ("#w(", port);
goto common_vector_printer;
case scm_tc7_vector:
ENTER_NESTED_DATA (pstate, exp, circref);
- scm_gen_puts (scm_regular_string, "#(", port);
+ scm_puts ("#(", port);
common_vector_printer:
{
int last = SCM_LENGTH (exp) - 1;
{
/* CHECK_INTS; */
scm_iprin1 (SCM_VELTS (exp)[i], port, pstate);
- scm_gen_putc (' ', port);
+ scm_putc (' ', port);
}
if (i == last)
{
scm_iprin1 (SCM_VELTS (exp)[i], port, pstate);
}
if (cutp)
- scm_gen_puts (scm_regular_string, " ...", port);
- scm_gen_putc (')', port);
+ scm_puts (" ...", port);
+ scm_putc (')', port);
}
EXIT_NESTED_DATA (pstate);
break;
scm_raprin1 (exp, port, pstate);
break;
case scm_tcs_subrs:
- scm_gen_puts (scm_regular_string, "#<primitive-procedure ", port);
- scm_gen_puts ((SCM_MB_STRINGP (SCM_SNAME(exp))
- ? scm_mb_string
- : scm_regular_string),
- SCM_CHARS (SCM_SNAME (exp)), port);
- scm_gen_putc ('>', port);
+ scm_puts ("#<primitive-procedure ", port);
+ scm_puts (SCM_CHARS (SCM_SNAME (exp)), port);
+ scm_putc ('>', port);
break;
#ifdef CCLO
case scm_tc7_cclo:
- scm_gen_puts (scm_regular_string, "#<compiled-closure ", port);
+ scm_puts ("#<compiled-closure ", port);
scm_iprin1 (SCM_CCLO_SUBR (exp), port, pstate);
- scm_gen_putc ('>', port);
+ scm_putc ('>', port);
break;
#endif
case scm_tc7_contin:
- scm_gen_puts (scm_regular_string, "#<continuation ", port);
+ scm_puts ("#<continuation ", port);
scm_intprint (SCM_LENGTH (exp), 10, port);
- scm_gen_puts (scm_regular_string, " @ ", port);
+ scm_puts (" @ ", port);
scm_intprint ((long) SCM_CHARS (exp), 16, port);
- scm_gen_putc ('>', port);
+ scm_putc ('>', port);
break;
case scm_tc7_port:
i = SCM_PTOBNUM (exp);
* kept in a pool so that they can be reused.
*/
+/* The PORT argument can also be a print-state/port pair, which will
+ * then be used instead of allocating a new print state. This is
+ * useful for continuing a chain of print calls from Scheme. */
+
void
scm_prin1 (exp, port, writingp)
SCM exp;
SCM pstate_scm;
scm_print_state *pstate;
- /* If there is currently a print state active, use that. Else
- create a new one. */
+ /* If PORT is a print-state/port pair, use that. Else create a new
+ print-state. */
- pstate_scm = SCM_FAST_FLUID_REF (print_state_fluid_num);
- if (pstate_scm == SCM_BOOL_F)
+ if (SCM_NIMP (port) && SCM_CONSP (port))
+ {
+ pstate_scm = SCM_CDR (port);
+ port = SCM_CAR (port);
+ }
+ else
{
/* First try to allocate a print state from the pool */
SCM_DEFER_INTS;
pstate->writingp = writingp;
scm_iprin1 (exp, port, pstate);
- /* Return print state to pool, if it has been created above. */
- if (handle != SCM_BOOL_F)
+ /* Return print state to pool if it has been created above and
+ hasn't escaped to Scheme. */
+
+ if (handle != SCM_BOOL_F && !pstate->revealed)
{
SCM_DEFER_INTS;
SCM_SETCDR (handle, SCM_CDR (print_state_pool));
SCM port;
{
char num_buf[SCM_INTBUFLEN];
- scm_gen_write (scm_regular_string, num_buf, scm_iint2str (n, radix, num_buf), port);
+ scm_lfwrite (num_buf, scm_iint2str (n, radix, num_buf), port);
}
/* Print an object of unrecognized type.
SCM ptr;
SCM port;
{
- scm_gen_puts (scm_regular_string, "#<unknown-", port);
- scm_gen_puts (scm_regular_string, hdr, port);
+ scm_puts ("#<unknown-", port);
+ scm_puts (hdr, port);
if (SCM_CELLP (ptr))
{
- scm_gen_puts (scm_regular_string, " (0x", port);
+ scm_puts (" (0x", port);
scm_intprint (SCM_CAR (ptr), 16, port);
- scm_gen_puts (scm_regular_string, " . 0x", port);
+ scm_puts (" . 0x", port);
scm_intprint (SCM_CDR (ptr), 16, port);
- scm_gen_puts (scm_regular_string, ") @", port);
+ scm_puts (") @", port);
}
- scm_gen_puts (scm_regular_string, " 0x", port);
+ scm_puts (" 0x", port);
scm_intprint (ptr, 16, port);
- scm_gen_putc ('>', port);
+ scm_putc ('>', port);
}
/* Print a list.
register int i;
register SCM hare, tortoise;
int floor = pstate->top - 2;
- scm_gen_puts (scm_regular_string, hdr, port);
+ scm_puts (hdr, port);
/* CHECK_INTS; */
if (pstate->fancyp)
goto fancy_printing;
if (pstate->ref_stack[i] == exp)
goto circref;
PUSH_REF (pstate, exp);
- scm_gen_putc (' ', port);
+ scm_putc (' ', port);
/* CHECK_INTS; */
scm_iprin1 (SCM_CAR (exp), port, pstate);
}
if (SCM_NNULLP (exp))
{
- scm_gen_puts (scm_regular_string, " . ", port);
+ scm_puts (" . ", port);
scm_iprin1 (exp, port, pstate);
}
end:
- scm_gen_putc (tlr, port);
+ scm_putc (tlr, port);
pstate->top = floor + 2;
return;
{
if (n == 0)
{
- scm_gen_puts (scm_regular_string, " ...", port);
+ scm_puts (" ...", port);
goto skip_tail;
}
else
}
PUSH_REF(pstate, exp);
++pstate->list_offset;
- scm_gen_putc (' ', port);
+ scm_putc (' ', port);
/* CHECK_INTS; */
scm_iprin1 (SCM_CAR (exp), port, pstate);
}
}
if (SCM_NNULLP (exp))
{
- scm_gen_puts (scm_regular_string, " . ", port);
+ scm_puts (" . ", port);
scm_iprin1 (exp, port, pstate);
}
skip_tail:
pstate->list_offset -= pstate->top - floor - 2;
circref:
- scm_gen_puts (scm_regular_string, " . ", port);
+ scm_puts (" . ", port);
print_circref (port, pstate, exp);
goto end;
}
\f
+int
+scm_valid_oport_value_p (SCM val)
+{
+ return (SCM_NIMP (val)
+ && (SCM_OPOUTPORTP (val)
+ || (SCM_CONSP (val)
+ && SCM_NIMP (SCM_CAR (val))
+ && SCM_OPOUTPORTP (SCM_CAR (val))
+ && SCM_NIMP (SCM_CDR (val))
+ && SCM_PRINT_STATE_P (SCM_CDR (val)))));
+}
+
SCM_PROC(s_write, "write", 1, 1, 0, scm_write);
SCM
if (SCM_UNBNDP (port))
port = scm_cur_outp;
else
- SCM_ASSERT (SCM_NIMP (port) && SCM_OPOUTPORTP (port), port, SCM_ARG2, s_write);
+ SCM_ASSERT (scm_valid_oport_value_p (port), port, SCM_ARG2, s_write);
+
scm_prin1 (obj, port, 1);
#ifdef HAVE_PIPE
# ifdef EPIPE
if (SCM_UNBNDP (port))
port = scm_cur_outp;
else
- SCM_ASSERT (SCM_NIMP (port) && SCM_OPOUTPORTP (port), port, SCM_ARG2, s_display);
+ SCM_ASSERT (scm_valid_oport_value_p (port), port, SCM_ARG2, s_display);
+
scm_prin1 (obj, port, 0);
#ifdef HAVE_PIPE
# ifdef EPIPE
SCM port;
{
if (SCM_UNBNDP (port))
- port = scm_cur_outp;
+ port = scm_cur_outp;
else
- SCM_ASSERT (SCM_NIMP (port) && SCM_OPOUTPORTP (port), port, SCM_ARG1, s_newline);
- scm_gen_putc ('\n', port);
+ SCM_ASSERT (scm_valid_oport_value_p (port), port, SCM_ARG1, s_newline);
+
+ scm_putc ('\n', SCM_COERCE_OPORT (port));
#ifdef HAVE_PIPE
# ifdef EPIPE
if (EPIPE == errno)
SCM port;
{
if (SCM_UNBNDP (port))
- port = scm_cur_outp;
+ port = scm_cur_outp;
else
- SCM_ASSERT (SCM_NIMP (port) && SCM_OPOUTPORTP (port), port, SCM_ARG2, s_write_char);
+ SCM_ASSERT (scm_valid_oport_value_p (port), port, SCM_ARG2, s_write_char);
+
SCM_ASSERT (SCM_ICHRP (chr), chr, SCM_ARG1, s_write_char);
- scm_gen_putc ((int) SCM_ICHR (chr), port);
+ scm_putc ((int) SCM_ICHR (chr), SCM_COERCE_OPORT (port));
#ifdef HAVE_PIPE
# ifdef EPIPE
if (EPIPE == errno)
\f
-/* Routines for calling back to Scheme code to do the printing of
-special objects (like structs). SCM_PRINTER_APPLY applies PROC to EXP
-and PORT while the print_state_fluid is set to PSTATE. When PROC
-inturn calls `display' or `write', this print_state is picked up and
-used to control the printing. */
-
-struct apply_data {
- SCM proc;
- SCM arg1;
- SCM args;
-};
-
-static SCM
-apply_stub (void *data)
-{
- struct apply_data *cl = (struct apply_data *)data;
- return scm_apply (cl->proc, cl->arg1, cl->args);
-}
+/* Call back to Scheme code to do the printing of special objects
+(like structs). SCM_PRINTER_APPLY applies PROC to EXP and a pair
+containing PORT and PSTATE. This pair can be used as the port for
+display/write etc to continue the current print chain. The REVEALED
+field of PSTATE is set to true to indicate that the print state has
+escaped to Scheme and thus has to be freed by the GC. */
SCM
scm_printer_apply (proc, exp, port, pstate)
SCM proc, exp, port;
scm_print_state *pstate;
{
- struct apply_data cl;
- cl.proc = proc;
- cl.arg1 = exp;
- cl.args = scm_cons (port, scm_listofnull);
- return scm_internal_with_fluids (scm_cons (print_state_fluid, SCM_EOL),
- scm_cons (pstate->handle, SCM_EOL),
- apply_stub, (void *)&cl);
+ SCM pair = scm_cons (port, pstate->handle);
+ pstate->revealed = 1;
+ return scm_apply (proc, exp, scm_cons (pair, scm_listofnull));
}
-
+
\f
void
scm_init_print ()
{
- SCM vtable, type;
-
+ SCM vtable, layout, printer, type;
+
scm_init_opts (scm_print_options, scm_print_opts, SCM_N_PRINT_OPTIONS);
- vtable = scm_make_vtable_vtable (scm_make_struct_layout (scm_nullstr), SCM_INUM0, SCM_EOL);
- type = scm_make_struct (vtable,
- SCM_INUM0,
- scm_cons (scm_make_struct_layout (scm_makfrom0str (SCM_PRINT_STATE_LAYOUT)),
- SCM_EOL));
+ vtable = scm_make_vtable_vtable (scm_make_struct_layout (scm_nullstr),
+ SCM_INUM0,
+ SCM_EOL);
+ layout = scm_make_struct_layout (scm_makfrom0str (SCM_PRINT_STATE_LAYOUT));
+ printer = scm_make_subr_opt (s_print_state_printer,
+ scm_tc7_subr_2,
+ (SCM (*) ()) print_state_printer,
+ 0 /* Don't bind the name. */);
+ type = scm_make_struct (vtable, SCM_INUM0, SCM_LIST2 (layout, printer));
print_state_pool = scm_permanent_object (scm_cons (type, SCM_EOL));
- print_state_fluid = scm_permanent_object (scm_make_fluid ());
- scm_fluid_set_x (print_state_fluid, SCM_BOOL_F);
- print_state_fluid_num = SCM_FLUID_NUM (print_state_fluid);
+ scm_print_state_vtable = type;
#include "print.x"
}
HCoop / bpt / guile.git / blobdiff