-/* Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000 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
* If you write modifications of your own for GUILE, it is your choice
* 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 <stdio.h>
-#include "_scm.h"
-#include "chars.h"
-#include "genio.h"
-#include "smob.h"
-#include "eval.h"
-#include "procprop.h"
-#include "read.h"
-#include "weaks.h"
-#include "unif.h"
-#include "alist.h"
-#include "struct.h"
-
-#include "print.h"
+#include "libguile/_scm.h"
+#include "libguile/chars.h"
+#include "libguile/smob.h"
+#include "libguile/eval.h"
+#include "libguile/macros.h"
+#include "libguile/procprop.h"
+#include "libguile/read.h"
+#include "libguile/weaks.h"
+#include "libguile/unif.h"
+#include "libguile/alist.h"
+#include "libguile/struct.h"
+#include "libguile/objects.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+#include "libguile/strports.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/print.h"
\f
/* {Names of immediate symbols}
"#<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",
+
+ "#<unbound>"
};
scm_option scm_print_opts[] = {
- { SCM_OPTION_SCM, "closure-hook", SCM_BOOL_F,
+ { SCM_OPTION_SCM, "closure-hook", SCM_UNPACK(SCM_BOOL_F),
"Hook for printing closures." },
{ SCM_OPTION_BOOLEAN, "source", 0,
"Print closures with source." }
};
-SCM_PROC (s_print_options, "print-options-interface", 0, 1, 0, scm_print_options);
-
-SCM
-scm_print_options (setting)
- SCM setting;
+SCM_DEFINE (scm_print_options, "print-options-interface", 0, 1, 0,
+ (SCM setting),
+"")
+#define FUNC_NAME s_scm_print_options
{
SCM ans = scm_options (setting,
scm_print_opts,
SCM_N_PRINT_OPTIONS,
- s_print_options);
+ FUNC_NAME);
return ans;
}
+#undef FUNC_NAME
\f
/* {Printing of Scheme Objects}
/* Detection of circular references.
*
* Due to other constraints in the implementation, this code has bad
- * time complexity (O (depth * N)), The printer code will be
- * completely rewritten before next release of Guile. The new code
- * will be O(N).
+ * time complexity (O (depth * N)), The printer code can be
+ * rewritten to be O(N).
*/
#define PUSH_REF(pstate, obj) \
-{ \
+do { \
pstate->ref_stack[pstate->top++] = (obj); \
if (pstate->top == pstate->ceiling) \
grow_ref_stack (pstate); \
-}
+} while(0)
#define ENTER_NESTED_DATA(pstate, obj, label) \
-{ \
- register int i; \
+do { \
+ register unsigned long i; \
for (i = 0; i < pstate->top; ++i) \
- if (pstate->ref_stack[i] == (obj)) \
+ if (SCM_EQ_P (pstate->ref_stack[i], (obj))) \
goto label; \
if (pstate->fancyp) \
{ \
} \
} \
PUSH_REF(pstate, obj); \
-} \
+} while(0)
#define EXIT_NESTED_DATA(pstate) { --pstate->top; }
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);
-SCM
-scm_current_pstate ()
+SCM_DEFINE (scm_current_pstate, "current-pstate", 0, 0, 0,
+ (),
+ "Return the current-pstate--the `cadr' of the print_state_pool.\n"
+ "`current-pstate' is only included in GUILE_DEBUG builds.")
+#define FUNC_NAME s_scm_current_pstate
{
- return SCM_CADR (print_state_pool);
+ if (SCM_NNULLP (SCM_CDR (print_state_pool)))
+ return SCM_CADR (print_state_pool);
+ else
+ return SCM_BOOL_F;
}
+#undef FUNC_NAME
+
#endif
#define PSTATE_SIZE 50L
-static SCM make_print_state SCM_P ((void));
-
static SCM
-make_print_state ()
+make_print_state (void)
{
SCM print_state = scm_make_struct (SCM_CAR (print_state_pool), /* pstate type */
SCM_INUM0,
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);
SCM
scm_make_print_state ()
{
- SCM answer = 0;
+ SCM answer = SCM_BOOL_F;
/* First try to allocate a print state from the pool */
SCM_DEFER_INTS;
}
SCM_ALLOW_INTS;
- 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;
+ return SCM_FALSEP (answer) ? make_print_state () : answer;
}
void
-scm_free_print_state (print_state)
- SCM print_state;
+scm_free_print_state (SCM print_state)
{
SCM handle;
scm_print_state *pstate = SCM_PRINT_STATE (print_state);
SCM_ALLOW_INTS;
}
-static void grow_ref_stack SCM_P ((scm_print_state *pstate));
-
static void
-grow_ref_stack (pstate)
- scm_print_state *pstate;
+grow_ref_stack (scm_print_state *pstate)
{
int new_size = 2 * pstate->ceiling;
scm_vector_set_length_x (pstate->ref_vect, SCM_MAKINUM (new_size));
}
-static void print_circref SCM_P ((SCM port, scm_print_state *pstate, SCM ref));
-
static void
-print_circref (port, pstate, ref)
- 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;
while (i > 0)
{
if (SCM_NCONSP (pstate->ref_stack[i - 1])
- || SCM_CDR (pstate->ref_stack[i - 1]) != pstate->ref_stack[i])
+ || !SCM_EQ_P (SCM_CDR (pstate->ref_stack[i - 1]),
+ pstate->ref_stack[i]))
break;
--i;
}
self = i;
}
for (i = pstate->top - 1; 1; --i)
- if (pstate->ref_stack[i] == ref)
+ if (SCM_EQ_P (pstate->ref_stack[i], ref))
break;
scm_putc ('#', port);
scm_intprint (i - self, 10, 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 exp;
- SCM port;
- scm_print_state *pstate;
+scm_iprin1 (SCM exp, SCM port, scm_print_state *pstate)
{
- register long i;
taloop:
- switch (7 & (int) exp)
+ switch (SCM_ITAG3 (exp))
{
case 2:
case 6:
scm_intprint (SCM_INUM (exp), 10, port);
break;
case 4:
- if (SCM_ICHRP (exp))
+ if (SCM_CHARP (exp))
{
- i = SCM_ICHR (exp);
+ register long i;
+
+ i = SCM_CHAR (exp);
if (SCM_WRITINGP (pstate))
{
scm_puts ("#\\", port);
scm_putc (i, port);
}
else if (SCM_IFLAGP (exp)
- && (SCM_ISYMNUM (exp) < (sizeof scm_isymnames / sizeof (char *))))
+ && ((size_t) SCM_ISYMNUM (exp) < (sizeof scm_isymnames / sizeof (char *))))
scm_puts (SCM_ISYMCHARS (exp), port);
else if (SCM_ILOCP (exp))
{
scm_puts ("#@", port);
- scm_intprint ((long) SCM_IFRAME (exp), 10, port);
+ scm_intprint (SCM_IFRAME (exp), 10, port);
scm_putc (SCM_ICDRP (exp) ? '-' : '+', port);
- scm_intprint ((long) SCM_IDIST (exp), 10, port);
+ scm_intprint (SCM_IDIST (exp), 10, port);
}
else
goto idef;
case 1:
/* gloc */
scm_puts ("#@", port);
- exp = SCM_CAR (exp - 1);
+ exp = SCM_GLOC_SYM (exp);
goto taloop;
default:
idef:
{
case scm_tcs_cons_gloc:
- if (SCM_CDR (SCM_CAR (exp) - 1L) == 0)
+ if (SCM_STRUCT_VTABLE_DATA (exp) [scm_vtable_index_vcell] == 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_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;
}
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)
name = scm_macro_name (exp);
if (!SCM_CLOSUREP (SCM_CDR (exp)))
{
- code = env = 0;
+ code = env = SCM_UNDEFINED;
scm_puts ("#<primitive-", port);
}
else
env = SCM_ENV (SCM_CDR (exp));
scm_puts ("#<", port);
}
- if (SCM_CAR (exp) & (3L << 16))
+ if (SCM_CELL_WORD_0 (exp) & (3L << 16))
scm_puts ("macro", port);
else
scm_puts ("syntax", port);
- if (SCM_CAR (exp) & (2L << 16))
+ if (SCM_CELL_WORD_0 (exp) & (2L << 16))
scm_putc ('!', port);
}
else
env = SCM_ENV (exp);
scm_puts ("#<procedure", port);
}
- if (SCM_NIMP (name) && SCM_ROSTRINGP (name))
+ if (SCM_ROSTRINGP (name))
{
scm_putc (' ', port);
scm_puts (SCM_ROCHARS (name), port);
}
- if (code)
+ if (!SCM_UNBNDP (code))
{
if (SCM_PRINT_SOURCE_P)
{
case scm_tc7_string:
if (SCM_WRITINGP (pstate))
{
+ scm_sizet i;
+
scm_putc ('"', port);
for (i = 0; i < SCM_ROLENGTH (exp); ++i)
switch (SCM_ROCHARS (exp)[i])
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)
}
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_puts ("#<primitive-procedure ", 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_puts ("#<compiled-closure ", port);
- scm_iprin1 (SCM_CCLO_SUBR (exp), port, pstate);
- scm_putc ('>', port);
+ {
+ SCM proc = SCM_CCLO_SUBR (exp);
+ if (SCM_EQ_P (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_puts ("#<continuation ", port);
scm_intprint (SCM_LENGTH (exp), 10, 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);
* useful for continuing a chain of print calls from Scheme. */
void
-scm_prin1 (exp, port, writingp)
- SCM exp;
- SCM port;
- int writingp;
+scm_prin1 (SCM exp, SCM port, int writingp)
{
SCM handle = SCM_BOOL_F; /* Will GC protect the handle whilst unlinked */
SCM pstate_scm;
/* 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_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_SETCDR (print_state_pool, SCM_CDDR (print_state_pool));
}
SCM_ALLOW_INTS;
- if (handle == SCM_BOOL_F)
+ if (SCM_FALSEP (handle))
handle = scm_cons (make_print_state (), SCM_EOL);
pstate_scm = SCM_CAR (handle);
}
/* Return print state to pool if it has been created above and
hasn't escaped to Scheme. */
- if (handle != SCM_BOOL_F && !pstate->revealed)
+ if (!SCM_FALSEP (handle) && !pstate->revealed)
{
SCM_DEFER_INTS;
SCM_SETCDR (handle, SCM_CDR (print_state_pool));
*/
void
-scm_intprint (n, radix, port)
- long n;
- int radix;
- SCM port;
+scm_intprint (long n, int radix, SCM port)
{
char num_buf[SCM_INTBUFLEN];
scm_lfwrite (num_buf, scm_iint2str (n, radix, num_buf), port);
*/
void
-scm_ipruk (hdr, ptr, port)
- char *hdr;
- SCM ptr;
- SCM port;
+scm_ipruk (char *hdr, SCM ptr, SCM port)
{
scm_puts ("#<unknown-", port);
scm_puts (hdr, port);
if (SCM_CELLP (ptr))
{
scm_puts (" (0x", port);
- scm_intprint (SCM_CAR (ptr), 16, port);
+ scm_intprint (SCM_CELL_WORD_0 (ptr), 16, port);
scm_puts (" . 0x", port);
- scm_intprint (SCM_CDR (ptr), 16, port);
+ scm_intprint (SCM_CELL_WORD_1 (ptr), 16, port);
scm_puts (") @", port);
}
scm_puts (" 0x", port);
- scm_intprint (ptr, 16, port);
+ scm_intprint (SCM_UNPACK (ptr), 16, port);
scm_putc ('>', port);
}
void
-scm_iprlist (hdr, exp, tlr, port, pstate)
- 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 int i;
register SCM hare, tortoise;
int floor = pstate->top - 2;
scm_puts (hdr, port);
O(depth * N) instead of O(N^2). */
hare = SCM_CDR (exp);
tortoise = exp;
- while (SCM_NIMP (hare) && SCM_ECONSP (hare))
+ while (SCM_ECONSP (hare))
{
- if (hare == tortoise)
+ if (SCM_EQ_P (hare, tortoise))
goto fancy_printing;
hare = SCM_CDR (hare);
if (SCM_IMP (hare) || SCM_NECONSP (hare))
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)
+ if (SCM_EQ_P (pstate->ref_stack[i], exp))
goto circref;
PUSH_REF (pstate, exp);
scm_putc (' ', port);
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 (pstate->ref_stack[i] == exp)
+ if (SCM_EQ_P (pstate->ref_stack[i], exp))
goto fancy_circref;
if (pstate->fancyp)
{
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)))));
+ return (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)
- SCM obj;
- SCM port;
+scm_write (SCM obj, SCM 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)
- SCM obj;
- SCM port;
+scm_display (SCM obj, SCM 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
return SCM_UNSPECIFIED;
}
-SCM_PROC(s_newline, "newline", 0, 1, 0, scm_newline);
-SCM
-scm_newline (port)
- SCM port;
+SCM_DEFINE (scm_simple_format, "simple-format", 2, 0, 1,
+ (SCM destination, SCM message, SCM args),
+ "Write MESSAGE to DESTINATION, defaulting to `current-output-port'.\n"
+ "MESSAGE can contain ~A (was %s) and ~S (was %S) escapes. When printed,\n"
+ "the escapes are replaced with corresponding members of ARGS:\n"
+ "~A formats using `display' and ~S formats using `write'.\n"
+ "If DESTINATION is #t, then use the `current-output-port',\n"
+ "if DESTINATION is #f, then return a string containing the formatted text.\n"
+ "Does not add a trailing newline.")
+#define FUNC_NAME s_scm_simple_format
+{
+ SCM answer = SCM_UNSPECIFIED;
+ int fReturnString = 0;
+ int writingp;
+ char *start;
+ char *p;
+
+ if (SCM_EQ_P (destination, SCM_BOOL_T))
+ {
+ destination = scm_cur_outp;
+ }
+ else if (SCM_FALSEP (destination))
+ {
+ fReturnString = 1;
+ destination = scm_mkstrport (SCM_INUM0,
+ scm_make_string (SCM_INUM0, SCM_UNDEFINED),
+ SCM_OPN | SCM_WRTNG,
+ FUNC_NAME);
+ }
+ else
+ {
+ SCM_VALIDATE_OPORT_VALUE (1, destination);
+ destination = SCM_COERCE_OUTPORT (destination);
+ }
+ SCM_VALIDATE_STRING (2, message);
+ SCM_VALIDATE_REST_ARGUMENT (args);
+
+ start = SCM_ROCHARS (message);
+ for (p = start; *p != '\0'; ++p)
+ if (*p == '~')
+ {
+ if (SCM_IMP (args) || SCM_NCONSP (args))
+ continue;
+
+ ++p;
+ if (*p == 'A' || *p == 'a')
+ writingp = 0;
+ else if (*p == 'S' || *p == 's')
+ writingp = 1;
+ else
+ continue;
+
+ 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 (fReturnString)
+ answer = scm_strport_to_string (destination);
+
+ return scm_return_first (answer, message);
+}
+#undef FUNC_NAME
+
+
+SCM_DEFINE (scm_newline, "newline", 0, 1, 0,
+ (SCM port),
+ "Send a newline to PORT.")
+#define FUNC_NAME s_scm_newline
{
if (SCM_UNBNDP (port))
port = scm_cur_outp;
- else
- 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_close_port (port);
- else
-# endif
-#endif
- if (port == scm_cur_outp)
- scm_fflush (port);
+ SCM_VALIDATE_OPORT_VALUE (1,port);
+
+ scm_putc ('\n', SCM_COERCE_OUTPORT (port));
return SCM_UNSPECIFIED;
}
+#undef FUNC_NAME
-SCM_PROC(s_write_char, "write-char", 1, 1, 0, scm_write_char);
-
-SCM
-scm_write_char (chr, port)
- SCM chr;
- SCM port;
+SCM_DEFINE (scm_write_char, "write-char", 1, 1, 0,
+ (SCM chr, SCM port),
+ "Send character CHR to PORT.")
+#define FUNC_NAME s_scm_write_char
{
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_ICHRP (chr), chr, SCM_ARG1, s_write_char);
- scm_putc ((int) SCM_ICHR (chr), SCM_COERCE_OPORT (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
# ifdef EPIPE
if (EPIPE == errno)
#endif
return SCM_UNSPECIFIED;
}
+#undef FUNC_NAME
\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_printer_apply (SCM proc, SCM exp, SCM port, scm_print_state *pstate)
{
+ SCM pwps;
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 (pair, scm_listofnull));
+ return scm_apply (proc, exp, scm_cons (pwps, scm_listofnull));
+}
+
+SCM_DEFINE (scm_port_with_print_state, "port-with-print-state", 2, 0, 0,
+ (SCM port, SCM pstate),
+ "")
+#define FUNC_NAME s_scm_port_with_print_state
+{
+ SCM pwps;
+ 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;
}
+#undef FUNC_NAME
+
+SCM_DEFINE (scm_get_print_state, "get-print-state", 1, 0, 0,
+ (SCM port),
+ "")
+#define FUNC_NAME s_scm_get_print_state
+{
+ if (SCM_PORT_WITH_PS_P (port))
+ return SCM_PORT_WITH_PS_PS (port);
+ if (SCM_OUTPUT_PORT_P (port))
+ return SCM_BOOL_F;
+ RETURN_SCM_WTA (1,port);
+}
+#undef FUNC_NAME
\f
void
scm_init_print ()
{
- SCM vtable, layout, printer, 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);
+ vtable = scm_make_vtable_vtable (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));
+ 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;
-#include "print.x"
+ /* 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 "libguile/print.x"
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
HCoop / bpt / guile.git / blobdiff