-/* Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999 Free Software Foundation, Inc.
*
* 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
#include "_scm.h"
#include "chars.h"
#include "genio.h"
-#include "mbstrings.h"
#include "smob.h"
#include "eval.h"
+#include "macros.h"
#include "procprop.h"
#include "read.h"
#include "weaks.h"
#include "unif.h"
#include "alist.h"
#include "struct.h"
+#include "objects.h"
#include "print.h"
\f
"#<undefined>",
"#<eof>",
"()",
- "#<unspecified>"
+ "#<unspecified>",
+ "#@dispatch",
+ "#@slot-ref",
+ "#@slot-set!",
+
+ /* Multi-language support */
+
+ "#@nil-cond",
+ "#@nil-ify",
+ "#@t-ify",
+ "#@0-cond",
+ "#@0-ify",
+ "#@1-ify",
+ "#@bind",
+
+ "#@delay"
};
scm_option scm_print_opts[] = {
#define ENTER_NESTED_DATA(pstate, obj, label) \
{ \
- register int i; \
+ register unsigned long i; \
for (i = 0; i < pstate->top; ++i) \
if (pstate->ref_stack[i] == (obj)) \
goto label; \
{ \
if (pstate->top - pstate->list_offset >= pstate->level) \
{ \
- scm_gen_putc ('#', port); \
+ scm_putc ('#', port); \
return; \
} \
} \
SCM_EOL);
scm_print_state *pstate = SCM_PRINT_STATE (print_state);
pstate->ref_vect = scm_make_vector (SCM_MAKINUM (PSTATE_SIZE),
- SCM_UNDEFINED,
SCM_UNDEFINED);
pstate->ref_stack = SCM_VELTS (pstate->ref_vect);
pstate->ceiling = SCM_LENGTH (pstate->ref_vect);
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.
*/
-
+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
scm_iprin1 (exp, port, pstate)
SCM port;
scm_print_state *pstate;
{
- register long i;
taloop:
switch (7 & (int) exp)
{
case 4:
if (SCM_ICHRP (exp))
{
- i = SCM_ICHR (exp);
- scm_put_wchar (i, port, SCM_WRITINGP (pstate));
+ register long i;
+ i = SCM_ICHR (exp);
+ 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);
+ && ((size_t) SCM_ISYMNUM (exp) < (sizeof scm_isymnames / sizeof (char *))))
+ 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:
if (SCM_CDR (SCM_CAR (exp) - 1L) == 0)
{
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);
break;
}
macro closures as well. */
if (SCM_FALSEP (scm_procedure_p (SCM_PRINT_CLOSURE))
|| SCM_FALSEP (scm_printer_apply (SCM_PRINT_CLOSURE,
- exp, port, pstate)));
+ exp, port, pstate)))
{
SCM name, code, env;
if (SCM_TYP16 (exp) == scm_tc16_macro)
if (!SCM_CLOSUREP (SCM_CDR (exp)))
{
code = env = 0;
- scm_gen_puts (scm_regular_string, "#<primitive-",
- port);
+ scm_puts ("#<primitive-", port);
}
else
{
code = SCM_CODE (SCM_CDR (exp));
env = SCM_ENV (SCM_CDR (exp));
- scm_gen_puts (scm_regular_string, "#<", port);
+ scm_puts ("#<", port);
}
if (SCM_CAR (exp) & (3L << 16))
- scm_gen_puts (scm_regular_string, "macro", port);
+ scm_puts ("macro", port);
else
- scm_gen_puts (scm_regular_string, "syntax", port);
+ scm_puts ("syntax", port);
if (SCM_CAR (exp) & (2L << 16))
- scm_gen_putc ('!', port);
+ scm_putc ('!', port);
}
else
{
name = scm_procedure_name (exp);
code = SCM_CODE (exp);
env = SCM_ENV (exp);
- scm_gen_puts (scm_regular_string, "#<procedure",
- port);
+ scm_puts ("#<procedure", port);
}
if (SCM_NIMP (name) && SCM_ROSTRINGP (name))
{
- scm_gen_putc (' ', port);
- scm_gen_puts (scm_regular_string, SCM_ROCHARS (name), port);
+ scm_putc (' ', port);
+ scm_puts (SCM_ROCHARS (name), port);
}
if (code)
{
{
if (SCM_TYP16 (exp) != scm_tc16_macro)
{
- scm_gen_putc (' ', port);
+ scm_putc (' ', port);
scm_iprin1 (SCM_CAR (code), port, pstate);
}
- scm_gen_putc ('>', port);
+ scm_putc ('>', port);
}
}
else
- scm_gen_putc ('>', port);
+ scm_putc ('>', port);
}
break;
- case scm_tc7_mb_string:
- case scm_tc7_mb_substring:
- scm_print_mb_string (exp, port, SCM_WRITINGP (pstate));
- break;
case scm_tc7_substring:
case scm_tc7_string:
if (SCM_WRITINGP (pstate))
{
- scm_gen_putc ('"', port);
+ scm_sizet i;
+
+ 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:
{
+ register long i;
int last = SCM_LENGTH (exp) - 1;
int cutp = 0;
if (pstate->fancyp && SCM_LENGTH (exp) > pstate->length)
{
/* 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;
+#ifdef HAVE_ARRAYS
case scm_tc7_bvect:
case scm_tc7_byvect:
case scm_tc7_svect:
case scm_tc7_fvect:
case scm_tc7_dvect:
case scm_tc7_cvect:
-#ifdef LONGLONGS
+#ifdef HAVE_LONG_LONGS
case scm_tc7_llvect:
#endif
scm_raprin1 (exp, port, pstate);
break;
+#endif
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 (SCM_SUBR_GENERIC (exp) && *SCM_SUBR_GENERIC (exp)
+ ? "#<primitive-generic "
+ : "#<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_iprin1 (SCM_CCLO_SUBR (exp), port, pstate);
- scm_gen_putc ('>', port);
+ {
+ SCM proc = SCM_CCLO_SUBR (exp);
+ if (proc == scm_f_gsubr_apply)
+ {
+ /* Print gsubrs as primitives */
+ SCM name = scm_procedure_name (exp);
+ scm_puts ("#<primitive-procedure", port);
+ if (SCM_NFALSEP (name))
+ {
+ scm_putc (' ', port);
+ scm_puts (SCM_CHARS (name), port);
+ }
+ }
+ else
+ {
+ scm_puts ("#<compiled-closure ", port);
+ scm_iprin1 (proc, port, pstate);
+ }
+ scm_putc ('>', port);
+ }
break;
#endif
+ case scm_tc7_pws:
+ scm_puts ("#<procedure-with-setter", port);
+ {
+ SCM name = scm_procedure_name (exp);
+ if (SCM_NFALSEP (name))
+ {
+ scm_putc (' ', port);
+ scm_puts (SCM_ROCHARS (name), port);
+ }
+ }
+ scm_putc ('>', port);
+ break;
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);
- if (i < scm_numptob
- && scm_ptobs[i].print
- && (scm_ptobs[i].print) (exp, port, pstate))
- break;
- goto punk;
- case scm_tc7_smob:
- ENTER_NESTED_DATA (pstate, exp, circref);
- i = SCM_SMOBNUM (exp);
- if (i < scm_numsmob && scm_smobs[i].print
- && (scm_smobs[i].print) (exp, port, pstate))
- {
- EXIT_NESTED_DATA (pstate);
+ {
+ register long i = SCM_PTOBNUM (exp);
+ if (i < scm_numptob
+ && scm_ptobs[i].print
+ && (scm_ptobs[i].print) (exp, port, pstate))
break;
- }
- EXIT_NESTED_DATA (pstate);
- /* Macros have their print field set to NULL. They are
- handled at the same place as closures in order to achieve
- non-redundancy. Placing the condition here won't slow
- down printing of other smobs. */
- if (SCM_TYP16 (exp) == scm_tc16_macro)
- goto macros;
+ goto punk;
+ }
+ case scm_tc7_smob:
+ {
+ register long i;
+ ENTER_NESTED_DATA (pstate, exp, circref);
+ i = SCM_SMOBNUM (exp);
+ if (i < scm_numsmob && scm_smobs[i].print
+ && (scm_smobs[i].print) (exp, port, pstate))
+ {
+ EXIT_NESTED_DATA (pstate);
+ break;
+ }
+ EXIT_NESTED_DATA (pstate);
+ /* Macros have their print field set to NULL. They are
+ handled at the same place as closures in order to achieve
+ non-redundancy. Placing the condition here won't slow
+ down printing of other smobs. */
+ if (SCM_TYP16 (exp) == scm_tc16_macro)
+ goto macros;
+ }
default:
punk:
scm_ipruk ("type", exp, port);
/* If PORT is a print-state/port pair, use that. Else create a new
print-state. */
- if (SCM_NIMP (port) && SCM_CONSP (port))
+ if (SCM_NIMP (port) && SCM_PORT_WITH_PS_P (port))
{
- pstate_scm = SCM_CDR (port);
- port = SCM_CAR (port);
+ pstate_scm = SCM_PORT_WITH_PS_PS (port);
+ port = SCM_PORT_WITH_PS_PORT (port);
}
else
{
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.
SCM port;
scm_print_state *pstate;
{
- 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;
exp = SCM_CDR (exp);
for (; SCM_NIMP (exp); exp = SCM_CDR (exp))
{
+ register int i;
+
if (SCM_NECONSP (exp))
break;
for (i = floor; i >= 0; --i)
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;
exp = SCM_CDR (exp); --n;
for (; SCM_NIMP (exp); exp = SCM_CDR (exp))
{
+ register unsigned long i;
+
if (SCM_NECONSP (exp))
break;
for (i = 0; i < pstate->top; ++i)
{
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;
}
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_PRINT_STATE_P (SCM_CDR (val))));
+ return (SCM_NIMP (val)
+ && (SCM_OPOUTPORTP (val)
+ || (SCM_PORT_WITH_PS_P (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_write (obj, port)
{
if (SCM_UNBNDP (port))
port = scm_cur_outp;
- else
- SCM_ASSERT (scm_valid_oport_value_p (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
}
-SCM_PROC(s_display, "display", 1, 1, 0, scm_display);
+/* SCM_GPROC(s_display, "display", 1, 1, 0, scm_display, g_display); */
SCM
scm_display (obj, port)
{
if (SCM_UNBNDP (port))
port = scm_cur_outp;
- else
- SCM_ASSERT (scm_valid_oport_value_p (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
{
if (SCM_UNBNDP (port))
port = scm_cur_outp;
- else
- SCM_ASSERT (scm_valid_oport_value_p (port), port, SCM_ARG1, s_newline);
- scm_gen_putc ('\n', SCM_COERCE_OPORT (port));
-#ifdef HAVE_PIPE
-# ifdef EPIPE
- if (EPIPE == errno)
- scm_close_port (port);
- else
-# endif
-#endif
- if (port == scm_cur_outp)
- scm_fflush (port);
+ SCM_ASSERT (scm_valid_oport_value_p (port), port, SCM_ARG1, s_newline);
+
+ scm_putc ('\n', SCM_COERCE_OUTPORT (port));
return SCM_UNSPECIFIED;
}
{
if (SCM_UNBNDP (port))
port = scm_cur_outp;
- else
- SCM_ASSERT (scm_valid_oport_value_p (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), SCM_COERCE_OPORT (port));
+ scm_putc ((int) SCM_ICHR (chr), SCM_COERCE_OUTPORT (port));
#ifdef HAVE_PIPE
# ifdef EPIPE
if (EPIPE == errno)
\f
/* 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. */
+ * (like structs). SCM_PRINTER_APPLY applies PROC to EXP and a smob
+ * containing PORT and PSTATE. This object 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.
+ */
+
+long scm_tc16_port_with_ps;
+
+/* Print exactly as the port itself would */
+
+static int
+print_port_with_ps (SCM obj, SCM port, scm_print_state *pstate)
+{
+ obj = SCM_PORT_WITH_PS_PORT (obj);
+ return scm_ptobs[SCM_PTOBNUM (obj)].print (obj, port, pstate);
+}
SCM
scm_printer_apply (proc, exp, port, pstate)
SCM proc, exp, port;
scm_print_state *pstate;
{
+ SCM pwps;
SCM pair = scm_cons (port, pstate->handle);
+ SCM_NEWSMOB (pwps, scm_tc16_port_with_ps, pair);
pstate->revealed = 1;
- return scm_apply (proc, exp, scm_cons (pair, scm_listofnull));
+ return scm_apply (proc, exp, scm_cons (pwps, scm_listofnull));
+}
+
+SCM_PROC (s_port_with_print_state, "port-with-print-state", 2, 0, 0, scm_port_with_print_state);
+
+SCM
+scm_port_with_print_state (SCM port, SCM pstate)
+{
+ SCM pwps;
+ SCM_ASSERT (scm_valid_oport_value_p (port),
+ port, SCM_ARG1, s_port_with_print_state);
+ SCM_ASSERT (SCM_NIMP (pstate) && SCM_PRINT_STATE_P (pstate),
+ pstate, SCM_ARG2, s_port_with_print_state);
+ port = SCM_COERCE_OUTPORT (port);
+ SCM_NEWSMOB (pwps, scm_tc16_port_with_ps, scm_cons (port, pstate));
+ return pwps;
+}
+
+SCM_PROC (s_get_print_state, "get-print-state", 1, 0, 0, scm_get_print_state);
+
+SCM
+scm_get_print_state (SCM port)
+{
+ if (SCM_NIMP (port))
+ {
+ if (SCM_PORT_WITH_PS_P (port))
+ return SCM_PORT_WITH_PS_PS (port);
+ if (SCM_OUTPORTP (port))
+ return SCM_BOOL_F;
+ }
+ return scm_wta (port, (char *) SCM_ARG1, s_get_print_state);
}
\f
void
scm_init_print ()
{
- SCM vtable, type;
-
+ SCM vtable, layout, 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));
+ type = scm_make_struct (vtable, SCM_INUM0, SCM_LIST1 (layout));
+ scm_set_struct_vtable_name_x (type, SCM_CAR (scm_intern0 ("print-state")));
print_state_pool = scm_permanent_object (scm_cons (type, SCM_EOL));
scm_print_state_vtable = type;
+ /* Don't want to bind a wrapper class in GOOPS, so pass 0 as arg1. */
+ scm_tc16_port_with_ps = scm_make_smob_type (0, 0);
+ scm_set_smob_mark (scm_tc16_port_with_ps, scm_markcdr);
+ scm_set_smob_print (scm_tc16_port_with_ps, print_port_with_ps);
+
#include "print.x"
}
HCoop / bpt / guile.git / blobdiff