-/* Copyright (C) 1995,1996 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
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
*
* 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.
- */
+ * 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 "mbstrings.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 <errno.h>
+
+#include "libguile/_scm.h"
+#include "libguile/chars.h"
+#include "libguile/continuations.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,
- "Hook for printing closures." },
+scm_option_t 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." }
};
-SCM_PROC (s_print_options, "print-options-interface", 0, 1, 0, scm_print_options);
-#ifdef __STDC__
-SCM
-scm_print_options (SCM setting)
-#else
-SCM
-scm_print_options (setting)
- SCM setting;
-#endif
+SCM_DEFINE (scm_print_options, "print-options-interface", 0, 1, 0,
+ (SCM setting),
+ "Option interface for the print options. Instead of using\n"
+ "this procedure directly, use the procedures\n"
+ "@code{print-enable}, @code{print-disable}, @code{print-set!}\n"
+ "and @code{print-options}.")
+#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) \
{ \
if (pstate->top - pstate->list_offset >= pstate->level) \
{ \
- scm_gen_putc ('#', port); \
+ scm_putc ('#', port); \
return; \
} \
} \
PUSH_REF(pstate, obj); \
-} \
+} while(0)
#define EXIT_NESTED_DATA(pstate) { --pstate->top; }
+SCM scm_print_state_vtable;
+
static SCM print_state_pool;
-#if 1 /* Used for debugging purposes */
-SCM_PROC(s_current_pstate, "current-pstate", 0, 0, 0, scm_current_pstate);
-#ifdef __STDC__
-SCM
-scm_current_pstate (void)
-#else
-SCM
-scm_current_pstate ()
-#endif
+#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"
+ "@code{print_state_pool}. @code{current-pstate} is only\n"
+ "included in @code{--enable-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
-#ifdef __STDC__
-SCM
-scm_make_print_state (void)
-#else
+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 *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->ceiling = SCM_VECTOR_LENGTH (pstate->ref_vect);
+ return print_state;
+}
+
SCM
scm_make_print_state ()
-#endif
{
- return scm_make_struct (SCM_CAR (print_state_pool), /* pstate type */
- SCM_MAKINUM (PSTATE_SIZE),
- SCM_EOL);
+ SCM answer = SCM_BOOL_F;
+
+ /* First try to allocate a print state from the pool */
+ SCM_DEFER_INTS;
+ if (SCM_NNULLP (SCM_CDR (print_state_pool)))
+ {
+ answer = SCM_CADR (print_state_pool);
+ SCM_SETCDR (print_state_pool, SCM_CDDR (print_state_pool));
+ }
+ SCM_ALLOW_INTS;
+
+ return SCM_FALSEP (answer) ? make_print_state () : answer;
}
-#ifdef __STDC__
-static void
-grow_ref_stack (scm_print_state *pstate)
-#else
-static void
-grow_ref_stack (pstate)
- scm_print_state *pstate;
-#endif
+void
+scm_free_print_state (SCM print_state)
{
- int i, size = pstate->ceiling;
- int total_size;
SCM handle;
- SCM *data;
+ scm_print_state *pstate = SCM_PRINT_STATE (print_state);
+ /* Cleanup before returning print state to pool.
+ * It is better to do it here. Doing it in scm_prin1
+ * would cost more since that function is called much more
+ * often.
+ */
+ pstate->fancyp = 0;
+ pstate->revealed = 0;
+ SCM_NEWCELL (handle);
SCM_DEFER_INTS;
- handle = pstate->handle;
- data = (SCM *) pstate - scm_struct_n_extra_words;
- total_size = ((SCM *) pstate)[scm_struct_i_n_words];
- data = (SCM *) scm_must_realloc ((char *) data,
- total_size,
- total_size + size,
- "grow_ref_stack");
- pstate = (scm_print_state *) (data + scm_struct_n_extra_words);
- ((SCM *) pstate)[scm_struct_i_n_words] = total_size + size;
- pstate->ceiling += size;
- for (i = size; i < pstate->ceiling; ++i)
- pstate->ref_stack[i] = SCM_BOOL_F;
- SCM_SETCDR (handle, pstate);
+ SCM_SET_CELL_WORD_0 (handle, print_state);
+ SCM_SET_CELL_WORD_1 (handle, SCM_CDR (print_state_pool));
+ SCM_SETCDR (print_state_pool, handle);
SCM_ALLOW_INTS;
}
-#ifdef __STDC__
static void
-print_circref (SCM port, scm_print_state *pstate, SCM ref)
-#else
+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);
+ 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];
+
+ pstate->ref_vect = new_vect;
+ pstate->ref_stack = new_elts;
+ pstate->ceiling = new_size;
+}
+
+
static void
-print_circref (port, pstate, ref)
- SCM port;
- scm_print_state *pstate;
- SCM ref;
-#endif
+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])
- || 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_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);
+
-#ifdef __STDC__
void
scm_iprin1 (SCM exp, SCM port, scm_print_state *pstate)
-#else
-void
-scm_iprin1 (exp, port, pstate)
- SCM exp;
- SCM port;
- scm_print_state *pstate;
-#endif
{
- register long i;
taloop:
- switch (7 & (int) exp)
+ switch (SCM_ITAG3 (exp))
{
- case 2:
- case 6:
+ case scm_tc3_closure:
+ case scm_tc3_tc7_1:
+ case scm_tc3_tc7_2:
+ /* These tc3 tags should never occur in an immediate value. They are
+ * only used in cell types of non-immediates, i. e. the value returned
+ * by SCM_CELL_TYPE (exp) can use these tags.
+ */
+ scm_ipruk ("immediate", exp, port);
+ break;
+ case scm_tc3_int_1:
+ case scm_tc3_int_2:
scm_intprint (SCM_INUM (exp), 10, port);
break;
- case 4:
- if (SCM_ICHRP (exp))
+ case scm_tc3_imm24:
+ if (SCM_CHARP (exp))
{
- i = SCM_ICHR (exp);
- scm_put_wchar (i, port, SCM_WRITINGP (pstate));
+ long i = SCM_CHAR (exp);
+ if (SCM_WRITINGP (pstate))
+ {
+ scm_puts ("#\\", port);
+ if ((i >= 0) && (i <= ' ') && scm_charnames[i])
+ scm_puts (scm_charnames[i], port);
+#ifndef EBCDIC
+ else if (i == '\177')
+ scm_puts (scm_charnames[scm_n_charnames - 1], port);
+#endif
+ 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
- goto idef;
+ {
+ /* unknown immediate value */
+ scm_ipruk ("immediate", exp, port);
+ }
break;
- case 1:
+ case scm_tc3_cons_gloc:
/* gloc */
- scm_gen_puts (scm_regular_string, "#@", port);
- exp = SCM_CAR (exp - 1);
+ scm_puts ("#@", port);
+ exp = scm_module_reverse_lookup (scm_current_module (),
+ SCM_GLOC_VAR (exp));
goto taloop;
- default:
- idef:
- scm_ipruk ("immediate", exp, port);
- break;
- case 0:
+ case scm_tc3_cons:
switch (SCM_TYP7 (exp))
{
case scm_tcs_cons_gloc:
- if (SCM_CDR (SCM_CAR (exp) - 1L) == 0)
+ if (SCM_STRUCT_VTABLE_DATA (exp) [scm_vtable_index_vcell] == 0)
{
- scm_gen_write (scm_regular_string, "#<struct ", sizeof ("#<struct ") - 1, port);
- scm_intprint(exp, 16, port);
- scm_gen_putc ('>', port);
+ 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;
}
print_circref (port, pstate, exp);
break;
case scm_tcs_closures:
- 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
+ if (SCM_FALSEP (scm_procedure_p (SCM_PRINT_CLOSURE))
+ || SCM_FALSEP (scm_printer_apply (SCM_PRINT_CLOSURE,
+ exp, port, pstate)))
{
- SCM name, code;
- name = scm_procedure_property (exp, scm_i_name);
- code = SCM_CODE (exp);
- scm_gen_puts (scm_regular_string, "#<procedure ", port);
- if (SCM_NIMP (name) && SCM_ROSTRINGP (name))
- {
- scm_gen_puts (scm_regular_string, SCM_ROCHARS (name), port);
- scm_gen_putc (' ', port);
- }
- scm_iprin1 (SCM_CAR (code), port, pstate);
+ 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)
{
- code = scm_unmemocopy (SCM_CDR (code),
- SCM_EXTEND_ENV (SCM_CAR (code),
- SCM_EOL,
- SCM_ENV (exp)));
+ 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_iprlist (" ", code, '>', port, pstate);
+ scm_iprin1 (src, port, pstate);
EXIT_NESTED_DATA (pstate);
}
else
- scm_gen_putc ('>', port);
+ scm_iprin1 (formals, port, pstate);
+ 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);
- for (i = 0; i < SCM_ROLENGTH (exp); ++i)
- switch (SCM_ROCHARS (exp)[i])
+ size_t i;
+
+ scm_putc ('"', port);
+ for (i = 0; i < SCM_STRING_LENGTH (exp); ++i)
+ switch (SCM_STRING_CHARS (exp)[i])
{
case '"':
case '\\':
- scm_gen_putc ('\\', port);
+ scm_putc ('\\', port);
default:
- scm_gen_putc (SCM_ROCHARS (exp)[i], port);
+ scm_putc (SCM_STRING_CHARS (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_STRING_CHARS (exp), SCM_STRING_LENGTH (exp), port);
break;
- case scm_tcs_symbols:
- if (SCM_MB_STRINGP (exp))
+ case scm_tc7_symbol:
{
- scm_print_mb_symbol (exp, port);
- break;
- }
- else
- {
- int pos;
- int end;
- int len;
+ size_t pos;
+ size_t end;
+ size_t len;
char * str;
int weird;
int maybe_weird;
- int mw_pos;
+ size_t mw_pos = 0;
- len = SCM_LENGTH (exp);
- str = SCM_CHARS (exp);
- scm_remember (&exp);
+ len = SCM_SYMBOL_LENGTH (exp);
+ str = SCM_SYMBOL_CHARS (exp);
pos = 0;
weird = 0;
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);
+ scm_remember_upto_here_1 (exp);
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:
- for (i = 0; i + 1 < SCM_LENGTH (exp); ++i)
- {
- /* CHECK_INTS; */
- scm_iprin1 (SCM_VELTS (exp)[i], port, pstate);
- scm_gen_putc (' ', port);
- }
- if (i < SCM_LENGTH (exp))
- {
- /* CHECK_INTS; */
- scm_iprin1 (SCM_VELTS (exp)[i], port, pstate);
- }
- scm_gen_putc (')', port);
+ {
+ register long i;
+ long last = SCM_VECTOR_LENGTH (exp) - 1;
+ int cutp = 0;
+ if (pstate->fancyp && SCM_VECTOR_LENGTH (exp) > pstate->length)
+ {
+ last = pstate->length - 1;
+ cutp = 1;
+ }
+ for (i = 0; i < last; ++i)
+ {
+ /* CHECK_INTS; */
+ scm_iprin1 (SCM_VELTS (exp)[i], port, pstate);
+ scm_putc (' ', port);
+ }
+ if (i == last)
+ {
+ /* CHECK_INTS; */
+ scm_iprin1 (SCM_VELTS (exp)[i], port, pstate);
+ }
+ if (cutp)
+ 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_SYMBOL_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 (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_SYMBOL_CHARS (name), port);
+ }
+ }
+ else
+ {
+ scm_puts ("#<compiled-closure ", port);
+ scm_iprin1 (proc, port, pstate);
+ }
+ scm_putc ('>', port);
+ }
break;
#endif
- case scm_tc7_contin:
- scm_gen_puts (scm_regular_string, "#<continuation ", port);
- scm_intprint (SCM_LENGTH (exp), 10, port);
- scm_gen_puts (scm_regular_string, " @ ", port);
- scm_intprint ((long) SCM_CHARS (exp), 16, port);
- scm_gen_putc ('>', port);
+ case scm_tc7_pws:
+ scm_puts ("#<procedure-with-setter", port);
+ {
+ SCM name = scm_procedure_name (exp);
+ if (SCM_NFALSEP (name))
+ {
+ scm_putc (' ', port);
+ scm_display (name, 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;
+ {
+ register long 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);
- break;
- }
+ SCM_SMOB_DESCRIPTOR (exp).print (exp, port, pstate);
EXIT_NESTED_DATA (pstate);
+ break;
default:
punk:
scm_ipruk ("type", exp, port);
* They are also expensive to allocate. Therefore print states are
* kept in a pool so that they can be reused.
*/
-#ifdef __STDC__
+
+/* 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 (SCM exp, SCM port, int writingp)
-#else
-void
-scm_prin1 (exp, port, writingp)
- SCM exp;
- SCM port;
- int writingp;
-#endif
{
- SCM handle = 0; /* Will GC protect the handle whilst unlinked */
+ SCM handle = SCM_BOOL_F; /* Will GC protect the handle whilst unlinked */
+ SCM pstate_scm;
scm_print_state *pstate;
- /* First try to allocate a print state from the pool */
- SCM_DEFER_INTS;
- if (SCM_NNULLP (SCM_CDR (print_state_pool)))
+ /* If PORT is a print-state/port pair, use that. Else create a new
+ print-state. */
+
+ if (SCM_PORT_WITH_PS_P (port))
{
- handle = SCM_CDR (print_state_pool);
- SCM_SETCDR (print_state_pool, SCM_CDDR (print_state_pool));
+ pstate_scm = SCM_PORT_WITH_PS_PS (port);
+ port = SCM_PORT_WITH_PS_PORT (port);
+ }
+ else
+ {
+ /* First try to allocate a print state from the pool */
+ SCM_DEFER_INTS;
+ if (SCM_NNULLP (SCM_CDR (print_state_pool)))
+ {
+ handle = SCM_CDR (print_state_pool);
+ SCM_SETCDR (print_state_pool, SCM_CDDR (print_state_pool));
+ }
+ SCM_ALLOW_INTS;
+ if (SCM_FALSEP (handle))
+ handle = scm_cons (make_print_state (), SCM_EOL);
+ pstate_scm = SCM_CAR (handle);
}
- SCM_ALLOW_INTS;
-
- if (!handle)
- handle = scm_cons (scm_make_print_state (), SCM_EOL);
- pstate = (scm_print_state *) SCM_STRUCT_DATA (SCM_CAR (handle));
+ pstate = SCM_PRINT_STATE (pstate_scm);
pstate->writingp = writingp;
scm_iprin1 (exp, port, pstate);
- /* Return print state to pool */
- SCM_DEFER_INTS;
- SCM_SETCDR (handle, SCM_CDR (print_state_pool));
- SCM_SETCDR (print_state_pool, handle);
- SCM_ALLOW_INTS;
+ /* Return print state to pool if it has been created above and
+ hasn't escaped to Scheme. */
+
+ if (!SCM_FALSEP (handle) && !pstate->revealed)
+ {
+ SCM_DEFER_INTS;
+ SCM_SETCDR (handle, SCM_CDR (print_state_pool));
+ SCM_SETCDR (print_state_pool, handle);
+ SCM_ALLOW_INTS;
+ }
}
/* Print an integer.
*/
-#ifdef __STDC__
+
void
scm_intprint (long n, int radix, SCM port)
-#else
-void
-scm_intprint (n, radix, port)
- long n;
- int radix;
- SCM port;
-#endif
{
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.
*/
-#ifdef __STDC__
+
void
scm_ipruk (char *hdr, SCM ptr, SCM port)
-#else
-void
-scm_ipruk (hdr, ptr, port)
- char *hdr;
- SCM ptr;
- SCM port;
-#endif
{
- 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_intprint (SCM_CAR (ptr), 16, port);
- scm_gen_puts (scm_regular_string, " . 0x", port);
- scm_intprint (SCM_CDR (ptr), 16, port);
- scm_gen_puts (scm_regular_string, ") @", port);
+ scm_puts (" (0x", port);
+ scm_intprint (SCM_CELL_WORD_0 (ptr), 16, port);
+ scm_puts (" . 0x", port);
+ scm_intprint (SCM_CELL_WORD_1 (ptr), 16, port);
+ scm_puts (") @", port);
}
- scm_gen_puts (scm_regular_string, " 0x", port);
- scm_intprint (ptr, 16, port);
- scm_gen_putc ('>', port);
+ scm_puts (" 0x", port);
+ scm_intprint (SCM_UNPACK (ptr), 16, port);
+ scm_putc ('>', port);
}
-/* Print a list.
- */
-#ifdef __STDC__
-void
-scm_iprlist (char *hdr, SCM exp, char tlr, SCM port, scm_print_state *pstate)
-#else
+/* Print a list. The list may be either a list of ordinary data, or it may be
+ a list that represents code. Lists that represent code may contain gloc
+ cells.
+ */
void
-scm_iprlist (hdr, exp, tlr, port, pstate)
- char *hdr;
- SCM exp;
- char tlr;
- SCM port;
- scm_print_state *pstate;
-#endif
+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_gen_puts (scm_regular_string, hdr, port);
+ long floor = pstate->top - 2;
+ scm_puts (hdr, port);
/* CHECK_INTS; */
if (pstate->fancyp)
goto fancy_printing;
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))
/* 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_ECONSP (exp); exp = SCM_CDR (exp))
{
- if (SCM_NECONSP (exp))
- break;
+ register long i;
+
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_gen_putc (' ', port);
+ scm_putc (' ', port);
/* CHECK_INTS; */
scm_iprin1 (SCM_CAR (exp), port, pstate);
}
- if (SCM_NNULLP (exp))
+ if (!SCM_NULLP (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;
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_ECONSP (exp); exp = SCM_CDR (exp))
{
- if (SCM_NECONSP (exp))
- break;
+ register unsigned long i;
+
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)
{
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
-SCM_PROC(s_write, "write", 1, 1, 0, scm_write);
-#ifdef __STDC__
+int
+scm_valid_oport_value_p (SCM val)
+{
+ return (SCM_OPOUTPORTP (val)
+ || (SCM_PORT_WITH_PS_P (val)
+ && SCM_OPOUTPORTP (SCM_PORT_WITH_PS_PORT (val))));
+}
+
+/* SCM_GPROC(s_write, "write", 1, 1, 0, scm_write, g_write); */
+
SCM
scm_write (SCM obj, SCM port)
-#else
-SCM
-scm_write (obj, port)
- SCM obj;
- SCM port;
-#endif
{
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
}
-SCM_PROC(s_display, "display", 1, 1, 0, scm_display);
-#ifdef __STDC__
+/* SCM_GPROC(s_display, "display", 1, 1, 0, scm_display, g_display); */
+
SCM
scm_display (SCM obj, SCM port)
-#else
-SCM
-scm_display (obj, port)
- SCM obj;
- SCM port;
-#endif
{
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
return SCM_UNSPECIFIED;
}
-SCM_PROC(s_newline, "newline", 0, 1, 0, scm_newline);
-#ifdef __STDC__
-SCM
-scm_newline(SCM port)
-#else
-SCM
-scm_newline (port)
- SCM port;
-#endif
+
+SCM_DEFINE (scm_simple_format, "simple-format", 2, 0, 1,
+ (SCM destination, SCM message, SCM args),
+ "Write @var{message} to @var{destination}, defaulting to\n"
+ "the current output port.\n"
+ "@var{message} can contain @code{~A} (was @code{%s}) and\n"
+ "@code{~S} (was @code{%S}) escapes. When printed,\n"
+ "the escapes are replaced with corresponding members of\n"
+ "@var{ARGS}:\n"
+ "@code{~A} formats using @code{display} and @code{~S} formats\n"
+ "using @code{write}.\n"
+ "If @var{destination} is @code{#t}, then use the current output\n"
+ "port, if @var{destination} is @code{#f}, then return a string\n"
+ "containing the formatted text. Does not add a trailing newline.")
+#define FUNC_NAME s_scm_simple_format
{
- if (SCM_UNBNDP (port))
- port = scm_cur_outp;
- else
- SCM_ASSERT (SCM_NIMP (port) && SCM_OPOUTPORTP (port), port, SCM_ARG1, s_newline);
- scm_gen_putc ('\n', port);
-#ifdef HAVE_PIPE
-# ifdef EPIPE
- if (EPIPE == errno)
- scm_close_port (port);
+ SCM answer = SCM_UNSPECIFIED;
+ int fReturnString = 0;
+ int writingp;
+ char *start;
+ char *end;
+ 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
-# endif
-#endif
- if (port == scm_cur_outp)
- scm_fflush (port);
+ {
+ SCM_VALIDATE_OPORT_VALUE (1, destination);
+ destination = SCM_COERCE_OUTPORT (destination);
+ }
+ SCM_VALIDATE_STRING (2, message);
+ SCM_VALIDATE_REST_ARGUMENT (args);
+
+ start = SCM_STRING_CHARS (message);
+ end = start + SCM_STRING_LENGTH (message);
+ 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;
+
+ 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 @var{port}.")
+#define FUNC_NAME s_scm_newline
+{
+ if (SCM_UNBNDP (port))
+ port = scm_cur_outp;
+
+ 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);
-#ifdef __STDC__
-SCM
-scm_write_char (SCM chr, SCM port)
-#else
-SCM
-scm_write_char (chr, port)
- SCM chr;
- SCM port;
-#endif
+SCM_DEFINE (scm_write_char, "write-char", 1, 1, 0,
+ (SCM chr, SCM port),
+ "Send character @var{chr} to @var{port}.")
+#define FUNC_NAME s_scm_write_char
{
if (SCM_UNBNDP (port))
- port = scm_cur_outp;
- else
- SCM_ASSERT (SCM_NIMP (port) && SCM_OPOUTPORTP (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);
+ port = scm_cur_outp;
+
+ 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 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.
+ */
+
+scm_bits_t scm_tc16_port_with_ps;
+/* Print exactly as the port itself would */
+
+static int
+port_with_ps_print (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 (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 (pwps, scm_listofnull));
+}
+
+SCM_DEFINE (scm_port_with_print_state, "port-with-print-state", 2, 0, 0,
+ (SCM port, SCM pstate),
+ "Create a new port which behaves like @var{port}, but with an\n"
+ "included print state @var{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),
+ "Return the print state of the port @var{port}. If @var{port}\n"
+ "has no associated print state, @code{#f} is returned.")
+#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;
+ SCM_WRONG_TYPE_ARG (1, port);
+}
+#undef FUNC_NAME
\f
-#ifdef __STDC__
-void
-scm_init_print (void)
-#else
void
scm_init_print ()
-#endif
{
- 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_makfrom0str ("")), 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_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_str2symbol ("print-state"));
print_state_pool = scm_permanent_object (scm_cons (type, SCM_EOL));
-#include "print.x"
+
+ 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, port_with_ps_print);
+
+#ifndef SCM_MAGIC_SNARFER
+#include "libguile/print.x"
+#endif
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/