-/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999,2000,2001 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
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice. */
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
- gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
\f
#include "libguile/strings.h"
#include "libguile/strports.h"
#include "libguile/vectors.h"
+#include "libguile/lang.h"
#include "libguile/validate.h"
#include "libguile/print.h"
char *scm_isymnames[] =
{
- /* This table must agree with the declarations */
+ /* This table must agree with the list of SCM_IM_ constants in tags.h */
"#@and",
"#@begin",
"#@case",
/* Multi-language support */
"#@nil-cond",
- "#@nil-ify",
- "#@t-ify",
- "#@0-cond",
- "#@0-ify",
- "#@1-ify",
"#@bind",
"#@delay",
-
- "#<unbound>"
+ "#@call-with-values",
+
+ "#<unbound>",
+
+ /* Elisp nil value. This is its Scheme name; whenever it's printed
+ in Elisp, it should appear as the symbol `nil'. */
+
+ "#nil"
};
-scm_option scm_print_opts[] = {
- { SCM_OPTION_SCM, "closure-hook", SCM_UNPACK(SCM_BOOL_F),
- "Hook for printing closures." },
+scm_t_option scm_print_opts[] = {
+ { SCM_OPTION_SCM, "closure-hook", SCM_UNPACK (SCM_BOOL_F),
+ "Hook for printing closures (should handle macros as well)." },
{ SCM_OPTION_BOOLEAN, "source", 0,
"Print closures with source." }
};
#define EXIT_NESTED_DATA(pstate) { --pstate->top; }
-SCM scm_print_state_vtable;
-
-static SCM print_state_pool;
+SCM scm_print_state_vtable = SCM_BOOL_F;
+static SCM print_state_pool = SCM_EOL;
#ifdef GUILE_DEBUG /* Used for debugging purposes */
SCM_DEFINE (scm_current_pstate, "current-pstate", 0, 0, 0,
(),
- "Return the current-pstate -- the cadr of the\n"
+ "Return the current-pstate -- the car of the\n"
"@code{print_state_pool}. @code{current-pstate} is only\n"
"included in @code{--enable-guile-debug} builds.")
#define FUNC_NAME s_scm_current_pstate
{
- if (SCM_NNULLP (SCM_CDR (print_state_pool)))
- return SCM_CADR (print_state_pool);
+ if (!SCM_NULLP (print_state_pool))
+ return SCM_CAR (print_state_pool);
else
return SCM_BOOL_F;
}
static SCM
make_print_state (void)
{
- SCM print_state = scm_make_struct (SCM_CAR (print_state_pool), /* pstate type */
- SCM_INUM0,
- SCM_EOL);
+ SCM print_state
+ = scm_make_struct (scm_print_state_vtable, SCM_INUM0, SCM_EOL);
scm_print_state *pstate = SCM_PRINT_STATE (print_state);
pstate->ref_vect = scm_c_make_vector (PSTATE_SIZE, SCM_UNDEFINED);
- pstate->ref_stack = SCM_VELTS (pstate->ref_vect);
+ pstate->ref_stack = SCM_WRITABLE_VELTS (pstate->ref_vect);
pstate->ceiling = SCM_VECTOR_LENGTH (pstate->ref_vect);
return print_state;
}
/* First try to allocate a print state from the pool */
SCM_DEFER_INTS;
- if (SCM_NNULLP (SCM_CDR (print_state_pool)))
+ if (!SCM_NULLP (print_state_pool))
{
- answer = SCM_CADR (print_state_pool);
- SCM_SETCDR (print_state_pool, SCM_CDDR (print_state_pool));
+ answer = SCM_CAR (print_state_pool);
+ print_state_pool = SCM_CDR (print_state_pool);
}
SCM_ALLOW_INTS;
*/
pstate->fancyp = 0;
pstate->revealed = 0;
- SCM_NEWCELL (handle);
SCM_DEFER_INTS;
- SCM_SETCAR (handle, print_state);
- SCM_SETCDR (handle, SCM_CDR (print_state_pool));
- SCM_SETCDR (print_state_pool, handle);
+ handle = scm_cons (print_state, print_state_pool);
+ print_state_pool = handle;
SCM_ALLOW_INTS;
}
grow_ref_stack (scm_print_state *pstate)
{
unsigned long int old_size = SCM_VECTOR_LENGTH (pstate->ref_vect);
- SCM *old_elts = SCM_VELTS (pstate->ref_vect);
+ SCM const *old_elts = SCM_VELTS (pstate->ref_vect);
unsigned long int new_size = 2 * pstate->ceiling;
SCM new_vect = scm_c_make_vector (new_size, SCM_UNDEFINED);
- SCM *new_elts = SCM_VELTS (new_vect);
unsigned long int i;
for (i = 0; i != old_size; ++i)
- new_elts [i] = old_elts [i];
+ SCM_VECTOR_SET (new_vect, i, old_elts [i]);
pstate->ref_vect = new_vect;
- pstate->ref_stack = new_elts;
+ pstate->ref_stack = SCM_WRITABLE_VELTS(new_vect);
pstate->ceiling = new_size;
}
static void
-print_circref (SCM port,scm_print_state *pstate,SCM ref)
+print_circref (SCM port, scm_print_state *pstate, SCM ref)
{
- register int i;
- int self = pstate->top - 1;
+ register long i;
+ long self = pstate->top - 1;
i = pstate->top - 1;
if (SCM_CONSP (pstate->ref_stack[i]))
{
while (i > 0)
{
- if (SCM_NCONSP (pstate->ref_stack[i - 1])
+ if (!SCM_CONSP (pstate->ref_stack[i - 1])
|| !SCM_EQ_P (SCM_CDR (pstate->ref_stack[i - 1]),
pstate->ref_stack[i]))
break;
scm_putc ('#', port);
}
+/* Print the name of a symbol. */
+
+void
+scm_print_symbol_name (const char *str, size_t len, SCM port)
+{
+ size_t pos;
+ size_t end;
+ int weird;
+ int maybe_weird;
+ size_t mw_pos = 0;
+
+ pos = 0;
+ weird = 0;
+ maybe_weird = 0;
+
+ /* XXX - Lots of weird symbol names are missed, such as "12" or
+ "'a". */
+
+ if (len == 0)
+ scm_lfwrite ("#{}#", 4, port);
+ else if (str[0] == '#' || str[0] == ':' || str[len-1] == ':')
+ {
+ scm_lfwrite ("#{", 2, port);
+ weird = 1;
+ }
+
+ for (end = pos; end < len; ++end)
+ switch (str[end])
+ {
+#ifdef BRACKETS_AS_PARENS
+ case '[':
+ case ']':
+#endif
+ case '(':
+ case ')':
+ case '"':
+ case ';':
+ case SCM_WHITE_SPACES:
+ case SCM_LINE_INCREMENTORS:
+ weird_handler:
+ if (maybe_weird)
+ {
+ end = mw_pos;
+ maybe_weird = 0;
+ }
+ if (!weird)
+ {
+ scm_lfwrite ("#{", 2, port);
+ weird = 1;
+ }
+ if (pos < end)
+ {
+ scm_lfwrite (str + pos, end - pos, port);
+ }
+ {
+ char buf[2];
+ buf[0] = '\\';
+ buf[1] = str[end];
+ scm_lfwrite (buf, 2, port);
+ }
+ pos = end + 1;
+ break;
+ case '\\':
+ if (weird)
+ goto weird_handler;
+ if (!maybe_weird)
+ {
+ maybe_weird = 1;
+ mw_pos = pos;
+ }
+ break;
+ case '}':
+ case '#':
+ if (weird)
+ goto weird_handler;
+ break;
+ default:
+ break;
+ }
+ if (pos < end)
+ scm_lfwrite (str + pos, end - pos, port);
+ if (weird)
+ scm_lfwrite ("}#", 2, port);
+}
+
/* Print generally. Handles both write and display according to PSTATE.
*/
SCM_GPROC(s_write, "write", 1, 1, 0, scm_write, g_write);
void
scm_iprin1 (SCM exp, SCM port, scm_print_state *pstate)
{
-taloop:
switch (SCM_ITAG3 (exp))
{
case scm_tc3_closure:
else if (SCM_ILOCP (exp))
{
scm_puts ("#@", port);
- scm_intprint (SCM_IFRAME (exp), 10, port);
+ scm_intprint ((long) SCM_IFRAME (exp), 10, port);
scm_putc (SCM_ICDRP (exp) ? '-' : '+', port);
- scm_intprint (SCM_IDIST (exp), 10, port);
+ scm_intprint ((long) SCM_IDIST (exp), 10, port);
}
else
{
scm_ipruk ("immediate", exp, port);
}
break;
- case scm_tc3_cons_gloc:
- /* gloc */
- scm_puts ("#@", port);
- exp = SCM_GLOC_SYM (exp);
- goto taloop;
case scm_tc3_cons:
switch (SCM_TYP7 (exp))
{
- case scm_tcs_cons_gloc:
-
- if (SCM_STRUCT_VTABLE_DATA (exp) [scm_vtable_index_vcell] == 0)
- {
- ENTER_NESTED_DATA (pstate, exp, circref);
- 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_UNPACK (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;
- }
-
+ case scm_tcs_struct:
+ {
+ ENTER_NESTED_DATA (pstate, exp, circref);
+ 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_UNPACK (scm_cons (port, pstate->handle)));
+ pstate->revealed = 1;
+ scm_call_generic_2 (print, exp, pwps);
+ }
+ else
+ {
+ print_struct:
+ scm_print_struct (exp, port, pstate);
+ }
+ EXIT_NESTED_DATA (pstate);
+ }
+ break;
case scm_tcs_cons_imcar:
case scm_tcs_cons_nimcar:
ENTER_NESTED_DATA (pstate, exp, circref);
circref:
print_circref (port, pstate, exp);
break;
- macros:
- 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_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 = SCM_UNDEFINED;
- scm_puts ("#<primitive-", port);
- }
- else
- {
- code = SCM_CODE (SCM_CDR (exp));
- env = SCM_ENV (SCM_CDR (exp));
- scm_puts ("#<", port);
- }
- if (SCM_CELL_WORD_0 (exp) & (3L << 16))
- scm_puts ("macro", port);
- else
- scm_puts ("syntax", port);
- if (SCM_CELL_WORD_0 (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_SYMBOLP (name))
- {
- scm_putc (' ', port);
- scm_lfwrite (SCM_SYMBOL_CHARS (name), SCM_SYMBOL_LENGTH (name), port);
- }
- else if (SCM_STRINGP (name))
- {
- scm_putc (' ', port);
- scm_lfwrite (SCM_STRING_CHARS (name), SCM_STRING_LENGTH (name), port);
- }
- if (!SCM_UNBNDP (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 formals = SCM_CLOSURE_FORMALS (exp);
+ scm_puts ("#<procedure", port);
+ scm_putc (' ', port);
+ scm_iprin1 (scm_procedure_name (exp), port, pstate);
+ scm_putc (' ', port);
+ if (SCM_PRINT_SOURCE_P)
+ {
+ SCM env = SCM_ENV (exp);
+ SCM xenv = SCM_EXTEND_ENV (formals, SCM_EOL, env);
+ SCM src = scm_unmemocopy (SCM_CODE (exp), xenv);
+ ENTER_NESTED_DATA (pstate, exp, circref);
+ scm_iprin1 (src, port, pstate);
+ EXIT_NESTED_DATA (pstate);
+ }
+ else
+ scm_iprin1 (formals, port, pstate);
scm_putc ('>', port);
- }
+ }
break;
- case scm_tc7_substring:
case scm_tc7_string:
if (SCM_WRITINGP (pstate))
{
- scm_sizet i;
+ size_t i;
scm_putc ('"', port);
for (i = 0; i < SCM_STRING_LENGTH (exp); ++i)
scm_lfwrite (SCM_STRING_CHARS (exp), SCM_STRING_LENGTH (exp), port);
break;
case scm_tc7_symbol:
+ if (SCM_SYMBOL_INTERNED_P (exp))
{
- int pos;
- int end;
- int len;
- char * str;
- int weird;
- int maybe_weird;
- int mw_pos = 0;
-
- len = SCM_SYMBOL_LENGTH (exp);
- str = SCM_SYMBOL_CHARS (exp);
- pos = 0;
- weird = 0;
- maybe_weird = 0;
-
- if (len == 0)
- scm_lfwrite ("#{}#", 4, port);
-
- for (end = pos; end < len; ++end)
- switch (str[end])
- {
-#ifdef BRACKETS_AS_PARENS
- case '[':
- case ']':
-#endif
- case '(':
- case ')':
- case '"':
- case ';':
- case SCM_WHITE_SPACES:
- case SCM_LINE_INCREMENTORS:
- weird_handler:
- if (maybe_weird)
- {
- end = mw_pos;
- maybe_weird = 0;
- }
- if (!weird)
- {
- scm_lfwrite ("#{", 2, port);
- weird = 1;
- }
- if (pos < end)
- {
- scm_lfwrite (str + pos, end - pos, port);
- }
- {
- char buf[2];
- buf[0] = '\\';
- buf[1] = str[end];
- scm_lfwrite (buf, 2, port);
- }
- pos = end + 1;
- break;
- case '\\':
- if (weird)
- goto weird_handler;
- if (!maybe_weird)
- {
- maybe_weird = 1;
- mw_pos = pos;
- }
- break;
- case '}':
- case '#':
- if (weird)
- goto weird_handler;
- break;
- default:
- break;
- }
- if (pos < end)
- scm_lfwrite (str + pos, end - pos, port);
+ scm_print_symbol_name (SCM_SYMBOL_CHARS (exp),
+ SCM_SYMBOL_LENGTH (exp),
+ port);
scm_remember_upto_here_1 (exp);
- if (weird)
- scm_lfwrite ("}#", 2, port);
- break;
}
+ else
+ {
+ scm_puts ("#<uninterned-symbol ", port);
+ scm_print_symbol_name (SCM_SYMBOL_CHARS (exp),
+ SCM_SYMBOL_LENGTH (exp),
+ port);
+ scm_putc (' ', port);
+ scm_intprint ((long)exp, 16, port);
+ scm_putc ('>', port);
+ }
+ break;
+ case scm_tc7_variable:
+ scm_i_variable_print (exp, port, pstate);
+ break;
case scm_tc7_wvect:
ENTER_NESTED_DATA (pstate, exp, circref);
if (SCM_IS_WHVEC (exp))
common_vector_printer:
{
register long i;
- int last = SCM_VECTOR_LENGTH (exp) - 1;
+ long last = SCM_VECTOR_LENGTH (exp) - 1;
int cutp = 0;
if (pstate->fancyp && SCM_VECTOR_LENGTH (exp) > pstate->length)
{
/* Print gsubrs as primitives */
SCM name = scm_procedure_name (exp);
scm_puts ("#<primitive-procedure", port);
- if (SCM_NFALSEP (name))
+ if (!SCM_FALSEP (name))
{
scm_putc (' ', port);
scm_puts (SCM_SYMBOL_CHARS (name), port);
scm_puts ("#<procedure-with-setter", port);
{
SCM name = scm_procedure_name (exp);
- if (SCM_NFALSEP (name))
+ if (!SCM_FALSEP (name))
{
scm_putc (' ', port);
scm_display (name, port);
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;
- }
+ ENTER_NESTED_DATA (pstate, exp, circref);
+ SCM_SMOB_DESCRIPTOR (exp).print (exp, port, pstate);
+ EXIT_NESTED_DATA (pstate);
+ break;
default:
punk:
scm_ipruk ("type", exp, port);
{
/* First try to allocate a print state from the pool */
SCM_DEFER_INTS;
- if (SCM_NNULLP (SCM_CDR (print_state_pool)))
+ if (!SCM_NULLP (print_state_pool))
{
- handle = SCM_CDR (print_state_pool);
- SCM_SETCDR (print_state_pool, SCM_CDDR (print_state_pool));
+ handle = print_state_pool;
+ print_state_pool = SCM_CDR (print_state_pool);
}
SCM_ALLOW_INTS;
if (SCM_FALSEP (handle))
- handle = scm_cons (make_print_state (), SCM_EOL);
+ handle = scm_list_1 (make_print_state ());
pstate_scm = SCM_CAR (handle);
}
if (!SCM_FALSEP (handle) && !pstate->revealed)
{
SCM_DEFER_INTS;
- SCM_SETCDR (handle, SCM_CDR (print_state_pool));
- SCM_SETCDR (print_state_pool, handle);
+ SCM_SETCDR (handle, print_state_pool);
+ print_state_pool = handle;
SCM_ALLOW_INTS;
}
}
{
scm_puts ("#<unknown-", port);
scm_puts (hdr, port);
- if (SCM_CELLP (ptr))
+ if (scm_cellp (ptr))
{
scm_puts (" (0x", port);
scm_intprint (SCM_CELL_WORD_0 (ptr), 16, port);
scm_putc ('>', port);
}
+
/* Print a list.
*/
-
-
void
-scm_iprlist (char *hdr,SCM exp,int tlr,SCM port,scm_print_state *pstate)
+scm_iprlist (char *hdr, SCM exp, int tlr, SCM port, scm_print_state *pstate)
{
register SCM hare, tortoise;
- int floor = pstate->top - 2;
+ long floor = pstate->top - 2;
scm_puts (hdr, port);
/* CHECK_INTS; */
if (pstate->fancyp)
O(depth * N) instead of O(N^2). */
hare = SCM_CDR (exp);
tortoise = exp;
- while (SCM_ECONSP (hare))
+ while (SCM_CONSP (hare))
{
if (SCM_EQ_P (hare, tortoise))
goto fancy_printing;
hare = SCM_CDR (hare);
- if (SCM_IMP (hare) || SCM_NECONSP (hare))
+ if (!SCM_CONSP (hare))
break;
hare = SCM_CDR (hare);
tortoise = SCM_CDR (tortoise);
/* No cdr cycles intrinsic to this list */
scm_iprin1 (SCM_CAR (exp), port, pstate);
- exp = SCM_CDR (exp);
- for (; SCM_NIMP (exp); exp = SCM_CDR (exp))
+ for (exp = SCM_CDR (exp); SCM_CONSP (exp); exp = SCM_CDR (exp))
{
- register int i;
+ register long i;
- if (SCM_NECONSP (exp))
- break;
for (i = floor; i >= 0; --i)
if (SCM_EQ_P (pstate->ref_stack[i], exp))
goto circref;
/* CHECK_INTS; */
scm_iprin1 (SCM_CAR (exp), port, pstate);
}
- if (SCM_NNULLP (exp))
+ if (!SCM_NULL_OR_NIL_P (exp))
{
scm_puts (" . ", port);
scm_iprin1 (exp, port, pstate);
fancy_printing:
{
- int n = pstate->length;
+ long n = pstate->length;
scm_iprin1 (SCM_CAR (exp), port, pstate);
exp = SCM_CDR (exp); --n;
- for (; SCM_NIMP (exp); exp = SCM_CDR (exp))
+ for (; SCM_CONSP (exp); exp = SCM_CDR (exp))
{
register unsigned long i;
- if (SCM_NECONSP (exp))
- break;
for (i = 0; i < pstate->top; ++i)
if (SCM_EQ_P (pstate->ref_stack[i], exp))
goto fancy_circref;
scm_iprin1 (SCM_CAR (exp), port, pstate);
}
}
- if (SCM_NNULLP (exp))
+ if (!SCM_NULL_OR_NIL_P (exp))
{
scm_puts (" . ", port);
scm_iprin1 (exp, port, pstate);
for (p = start; p != end; ++p)
if (*p == '~')
{
- if (!SCM_CONSP (args))
- continue;
-
if (++p == end)
- continue;
-
- if (*p == 'A' || *p == 'a')
- writingp = 0;
- else if (*p == 'S' || *p == 's')
- writingp = 1;
- else
- continue;
+ break;
+
+ switch (*p)
+ {
+ case 'A': case 'a':
+ writingp = 0;
+ break;
+ case 'S': case 's':
+ writingp = 1;
+ break;
+ case '~':
+ scm_lfwrite (start, p - start, destination);
+ start = p + 1;
+ continue;
+ case '%':
+ scm_lfwrite (start, p - start - 1, destination);
+ scm_newline (destination);
+ start = p + 1;
+ continue;
+ default:
+ SCM_MISC_ERROR ("FORMAT: Unsupported format option ~~~A - use (ice-9 format) instead",
+ scm_list_1 (SCM_MAKE_CHAR (*p)));
+
+ }
+
+ if (!SCM_CONSP (args))
+ SCM_MISC_ERROR ("FORMAT: Missing argument for ~~~A",
+ scm_list_1 (SCM_MAKE_CHAR (*p)));
+
scm_lfwrite (start, p - start - 1, destination);
scm_prin1 (SCM_CAR (args), destination, writingp);
args = SCM_CDR (args);
start = p + 1;
}
+
scm_lfwrite (start, p - start, destination);
+ if (!SCM_EQ_P (args, SCM_EOL))
+ SCM_MISC_ERROR ("FORMAT: ~A superfluous arguments",
+ scm_list_1 (scm_length (args)));
if (fReturnString)
answer = scm_strport_to_string (destination);
SCM_DEFINE (scm_newline, "newline", 0, 1, 0,
(SCM port),
- "Send a newline to @var{port}.")
+ "Send a newline to @var{port}.\n"
+ "If @var{port} is omitted, send to the current output port.")
#define FUNC_NAME s_scm_newline
{
if (SCM_UNBNDP (port))
port = scm_cur_outp;
- SCM_VALIDATE_OPORT_VALUE (1,port);
+ SCM_VALIDATE_OPORT_VALUE (1, port);
scm_putc ('\n', SCM_COERCE_OUTPORT (port));
return SCM_UNSPECIFIED;
if (SCM_UNBNDP (port))
port = scm_cur_outp;
- SCM_VALIDATE_CHAR (1,chr);
- SCM_VALIDATE_OPORT_VALUE (2,port);
+ SCM_VALIDATE_CHAR (1, chr);
+ SCM_VALIDATE_OPORT_VALUE (2, port);
scm_putc ((int) SCM_CHAR (chr), SCM_COERCE_OUTPORT (port));
#ifdef HAVE_PIPE
* escaped to Scheme and thus has to be freed by the GC.
*/
-scm_bits_t scm_tc16_port_with_ps;
+scm_t_bits scm_tc16_port_with_ps;
/* Print exactly as the port itself would */
SCM pair = scm_cons (port, pstate->handle);
SCM_NEWSMOB (pwps, scm_tc16_port_with_ps, SCM_UNPACK (pair));
pstate->revealed = 1;
- return scm_apply (proc, exp, scm_cons (pwps, scm_listofnull));
+ return scm_call_2 (proc, exp, pwps);
}
SCM_DEFINE (scm_port_with_print_state, "port-with-print-state", 2, 0, 0,
#define FUNC_NAME s_scm_port_with_print_state
{
SCM pwps;
- SCM_VALIDATE_OPORT_VALUE (1,port);
- SCM_VALIDATE_PRINTSTATE (2,pstate);
+ SCM_VALIDATE_OPORT_VALUE (1, port);
+ SCM_VALIDATE_PRINTSTATE (2, pstate);
port = SCM_COERCE_OUTPORT (port);
SCM_NEWSMOB (pwps, scm_tc16_port_with_ps, SCM_UNPACK (scm_cons (port, pstate)));
return pwps;
scm_init_print ()
{
SCM vtable, layout, type;
-
+
scm_init_opts (scm_print_options, scm_print_opts, SCM_N_PRINT_OPTIONS);
+
+ scm_gc_register_root (&print_state_pool);
+ scm_gc_register_root (&scm_print_state_vtable);
vtable = scm_make_vtable_vtable (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));
+ type = scm_make_struct (vtable, SCM_INUM0, scm_list_1 (layout));
scm_set_struct_vtable_name_x (type, scm_str2symbol ("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_set_smob_mark (scm_tc16_port_with_ps, scm_markcdr);
scm_set_smob_print (scm_tc16_port_with_ps, port_with_ps_print);
-#ifndef SCM_MAGIC_SNARFER
#include "libguile/print.x"
-#endif
}
/*