-/* Copyright (C) 1995-1999,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999,2000,2001, 2002, 2003, 2004, 2006, 2008, 2009 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
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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, 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.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
*
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * 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. */
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
\f
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include <errno.h>
+#include <uniconv.h>
+#include <unictype.h>
#include "libguile/_scm.h"
#include "libguile/chars.h"
#include "libguile/procprop.h"
#include "libguile/read.h"
#include "libguile/weaks.h"
+#include "libguile/programs.h"
#include "libguile/unif.h"
#include "libguile/alist.h"
#include "libguile/struct.h"
#include "libguile/strings.h"
#include "libguile/strports.h"
#include "libguile/vectors.h"
+#include "libguile/lang.h"
+#include "libguile/numbers.h"
#include "libguile/validate.h"
#include "libguile/print.h"
+
+#include "libguile/private-options.h"
+
\f
/* {Names of immediate symbols}
* This table must agree with the declarations in scm.h: {Immediate Symbols}.
*/
-char *scm_isymnames[] =
+/* This table must agree with the list of flags in tags.h. */
+static const char *iflagnames[] =
{
- /* This table must agree with the declarations */
- "#@and",
- "#@begin",
- "#@case",
- "#@cond",
- "#@do",
- "#@if",
- "#@lambda",
- "#@let",
- "#@let*",
- "#@letrec",
- "#@or",
- "#@quote",
- "#@set!",
- "#@define",
-#if 0
- "#@literal-variable-ref",
- "#@literal-variable-set!",
-#endif
- "#@apply",
- "#@call-with-current-continuation",
-
- /* user visible ISYMS */
- /* other keywords */
- /* Flags */
-
"#f",
"#t",
"#<undefined>",
"#<eof>",
"()",
"#<unspecified>",
- "#@dispatch",
- "#@slot-ref",
- "#@slot-set!",
- /* Multi-language support */
-
- "#@nil-cond",
- "#@nil-ify",
- "#@t-ify",
- "#@0-cond",
- "#@0-ify",
- "#@1-ify",
- "#@bind",
-
- "#@delay",
- "#@call-with-values",
+ /* Unbound slot marker for GOOPS. For internal use in GOOPS only. */
+ "#<unbound>",
- "#<unbound>"
+ /* Elisp nil value. This is its Scheme name; whenever it's printed in
+ * Elisp, it should appear as the symbol `nil'. */
+ "#nil"
};
+SCM_SYMBOL (sym_reader, "reader");
+
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." }
+ "Print closures with source." },
+ { SCM_OPTION_SCM, "highlight-prefix", (unsigned long)SCM_BOOL_F,
+ "The string to print before highlighted values." },
+ { SCM_OPTION_SCM, "highlight-suffix", (unsigned long)SCM_BOOL_F,
+ "The string to print after highlighted values." },
+ { SCM_OPTION_SCM, "quote-keywordish-symbols", (unsigned long)SCM_BOOL_F,
+ "How to print symbols that have a colon as their first or last character. "
+ "The value '#f' does not quote the colons; '#t' quotes them; "
+ "'reader' quotes them when the reader option 'keywords' is not '#f'."
+ },
+ { 0 },
+
};
SCM_DEFINE (scm_print_options, "print-options-interface", 0, 1, 0,
{
SCM ans = scm_options (setting,
scm_print_opts,
- SCM_N_PRINT_OPTIONS,
FUNC_NAME);
return ans;
}
* 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); \
+#define PUSH_REF(pstate, obj) \
+do \
+{ \
+ PSTATE_STACK_SET (pstate, pstate->top, obj); \
+ pstate->top++; \
+ if (pstate->top == pstate->ceiling) \
+ grow_ref_stack (pstate); \
} while(0)
-#define ENTER_NESTED_DATA(pstate, obj, label) \
-do { \
- register unsigned long i; \
- for (i = 0; i < pstate->top; ++i) \
- if (SCM_EQ_P (pstate->ref_stack[i], (obj))) \
- goto label; \
- if (pstate->fancyp) \
- { \
- if (pstate->top - pstate->list_offset >= pstate->level) \
- { \
- scm_putc ('#', port); \
- return; \
- } \
- } \
- PUSH_REF(pstate, obj); \
+#define ENTER_NESTED_DATA(pstate, obj, label) \
+do \
+{ \
+ register unsigned long i; \
+ for (i = 0; i < pstate->top; ++i) \
+ if (scm_is_eq (PSTATE_STACK_REF (pstate, i), (obj))) \
+ goto label; \
+ if (pstate->fancyp) \
+ { \
+ if (pstate->top - pstate->list_offset >= pstate->level) \
+ { \
+ scm_putc ('#', port); \
+ return; \
+ } \
+ } \
+ PUSH_REF(pstate, obj); \
} while(0)
-#define EXIT_NESTED_DATA(pstate) { --pstate->top; }
+#define EXIT_NESTED_DATA(pstate) \
+do \
+{ \
+ --pstate->top; \
+ PSTATE_STACK_SET (pstate, pstate->top, SCM_UNDEFINED); \
+} \
+while (0)
SCM scm_print_state_vtable = SCM_BOOL_F;
static SCM print_state_pool = SCM_EOL;
+scm_i_pthread_mutex_t print_state_mutex = SCM_I_PTHREAD_MUTEX_INITIALIZER;
#ifdef GUILE_DEBUG /* Used for debugging purposes */
"included in @code{--enable-guile-debug} builds.")
#define FUNC_NAME s_scm_current_pstate
{
- if (!SCM_NULLP (print_state_pool))
+ if (!scm_is_null (print_state_pool))
return SCM_CAR (print_state_pool);
else
return SCM_BOOL_F;
= 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->ceiling = SCM_VECTOR_LENGTH (pstate->ref_vect);
+ pstate->ceiling = SCM_SIMPLE_VECTOR_LENGTH (pstate->ref_vect);
+ pstate->highlight_objects = SCM_EOL;
return print_state;
}
SCM answer = SCM_BOOL_F;
/* First try to allocate a print state from the pool */
- SCM_DEFER_INTS;
- if (!SCM_NULLP (print_state_pool))
+ scm_i_pthread_mutex_lock (&print_state_mutex);
+ if (!scm_is_null (print_state_pool))
{
answer = SCM_CAR (print_state_pool);
print_state_pool = SCM_CDR (print_state_pool);
}
- SCM_ALLOW_INTS;
+ scm_i_pthread_mutex_unlock (&print_state_mutex);
- return SCM_FALSEP (answer) ? make_print_state () : answer;
+ return scm_is_false (answer) ? make_print_state () : answer;
}
void
*/
pstate->fancyp = 0;
pstate->revealed = 0;
- SCM_NEWCELL (handle);
- SCM_DEFER_INTS;
- SCM_SET_CELL_WORD_0 (handle, print_state);
- SCM_SET_CELL_WORD_1 (handle, print_state_pool);
+ pstate->highlight_objects = SCM_EOL;
+ scm_i_pthread_mutex_lock (&print_state_mutex);
+ handle = scm_cons (print_state, print_state_pool);
print_state_pool = handle;
- SCM_ALLOW_INTS;
+ scm_i_pthread_mutex_unlock (&print_state_mutex);
+}
+
+SCM
+scm_i_port_with_print_state (SCM port, SCM print_state)
+{
+ if (SCM_UNBNDP (print_state))
+ {
+ if (SCM_PORT_WITH_PS_P (port))
+ return port;
+ else
+ print_state = scm_make_print_state ();
+ /* port does not need to be coerced since it doesn't have ps */
+ }
+ else
+ port = SCM_COERCE_OUTPORT (port);
+ SCM_RETURN_NEWSMOB (scm_tc16_port_with_ps,
+ SCM_UNPACK (scm_cons (port, print_state)));
}
static void
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 old_vect = pstate->ref_vect;
+ size_t old_size = SCM_SIMPLE_VECTOR_LENGTH (old_vect);
+ size_t 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_SIMPLE_VECTOR_SET (new_vect, i, SCM_SIMPLE_VECTOR_REF (old_vect, i));
pstate->ref_vect = new_vect;
- pstate->ref_stack = new_elts;
pstate->ceiling = new_size;
}
+#define PSTATE_STACK_REF(p,i) SCM_SIMPLE_VECTOR_REF((p)->ref_vect, (i))
+#define PSTATE_STACK_SET(p,i,v) SCM_SIMPLE_VECTOR_SET((p)->ref_vect, (i), (v))
static void
-print_circref (SCM port,scm_print_state *pstate,SCM ref)
+print_circref (SCM port, scm_print_state *pstate, SCM ref)
{
register long i;
long self = pstate->top - 1;
i = pstate->top - 1;
- if (SCM_CONSP (pstate->ref_stack[i]))
+ if (scm_is_pair (PSTATE_STACK_REF (pstate, i)))
{
while (i > 0)
{
- if (!SCM_CONSP (pstate->ref_stack[i - 1])
- || !SCM_EQ_P (SCM_CDR (pstate->ref_stack[i - 1]),
- pstate->ref_stack[i]))
+ if (!scm_is_pair (PSTATE_STACK_REF (pstate, i-1))
+ || !scm_is_eq (SCM_CDR (PSTATE_STACK_REF (pstate, i-1)),
+ SCM_CDR (PSTATE_STACK_REF (pstate, i))))
break;
--i;
}
self = i;
}
for (i = pstate->top - 1; 1; --i)
- if (SCM_EQ_P (pstate->ref_stack[i], ref))
+ if (scm_is_eq (PSTATE_STACK_REF(pstate, i), ref))
break;
scm_putc ('#', port);
scm_intprint (i - self, 10, port);
/* Print the name of a symbol. */
+static int
+quote_keywordish_symbol (SCM symbol)
+{
+ SCM option;
+
+ if (scm_i_symbol_ref (symbol, 0) != ':'
+ && scm_i_symbol_ref (symbol, scm_i_symbol_length (symbol) - 1) != ':')
+ return 0;
+
+ option = SCM_PRINT_KEYWORD_STYLE;
+ if (scm_is_false (option))
+ return 0;
+ if (scm_is_eq (option, sym_reader))
+ return scm_is_true (SCM_PACK (SCM_KEYWORD_STYLE));
+ return 1;
+}
+
void
-scm_print_symbol_name (const char *str, size_t len, SCM port)
+scm_i_print_symbol_name (SCM str, SCM port)
{
- size_t pos;
+ /* This points to the first character that has not yet been written to the
+ * port. */
+ size_t pos = 0;
+ /* This points to the character we're currently looking at. */
size_t end;
- int weird;
- int maybe_weird;
+ /* If the name contains weird characters, we'll escape them with
+ * backslashes and set this flag; it indicates that we should surround the
+ * name with "#{" and "}#". */
+ int weird = 0;
+ /* Backslashes are not sufficient to make a name weird, but if a name is
+ * weird because of other characters, backslahes need to be escaped too.
+ * The first time we see a backslash, we set maybe_weird, and mw_pos points
+ * to the backslash. Then if the name turns out to be weird, we re-process
+ * everything starting from mw_pos.
+ * We could instead make backslashes always weird. This is not necessary
+ * to ensure that the output is (read)-able, but it would make this code
+ * simpler and faster. */
+ int maybe_weird = 0;
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". */
+ size_t len = scm_i_symbol_length (str);
+ scm_t_wchar str0 = scm_i_symbol_ref (str, 0);
- if (len == 0)
- scm_lfwrite ("#{}#", 4, port);
- else if (str[0] == '#' || str[0] == ':' || str[len-1] == ':')
+ if (len == 0 || str0 == '\'' || str0 == '`' || str0 == ','
+ || quote_keywordish_symbol (str)
+ || (str0 == '.' && len == 1)
+ || scm_is_true (scm_i_string_to_number (scm_symbol_to_string (str), 10)))
{
scm_lfwrite ("#{", 2, port);
weird = 1;
}
-
+
for (end = pos; end < len; ++end)
- switch (str[end])
+ switch (scm_i_symbol_ref (str, end))
{
#ifdef BRACKETS_AS_PARENS
case '[':
case ')':
case '"':
case ';':
+ case '#':
case SCM_WHITE_SPACES:
case SCM_LINE_INCREMENTORS:
weird_handler:
weird = 1;
}
if (pos < end)
- {
- scm_lfwrite (str + pos, end - pos, port);
- }
+ scm_lfwrite_substr (scm_symbol_to_string (str), pos, end, port);
{
char buf[2];
buf[0] = '\\';
- buf[1] = str[end];
+ buf[1] = (char) (unsigned char) scm_i_symbol_ref (str, end);
scm_lfwrite (buf, 2, port);
}
pos = end + 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_lfwrite_substr (scm_symbol_to_string (str), pos, end, port);
if (weird)
scm_lfwrite ("}#", 2, port);
}
+void
+scm_print_symbol_name (const char *str, size_t len, SCM port)
+{
+ SCM symbol = scm_from_locale_symboln (str, len);
+ return scm_i_print_symbol_name (symbol, 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);
+static void iprin1 (SCM exp, SCM port, scm_print_state *pstate);
+
void
scm_iprin1 (SCM exp, SCM port, scm_print_state *pstate)
+{
+ if (pstate->fancyp
+ && scm_is_true (scm_memq (exp, pstate->highlight_objects)))
+ {
+ scm_display (SCM_PRINT_HIGHLIGHT_PREFIX, port);
+ iprin1 (exp, port, pstate);
+ scm_display (SCM_PRINT_HIGHLIGHT_SUFFIX, port);
+ }
+ else
+ iprin1 (exp, port, pstate);
+}
+
+static void
+iprin1 (SCM exp, SCM port, scm_print_state *pstate)
{
switch (SCM_ITAG3 (exp))
{
break;
case scm_tc3_int_1:
case scm_tc3_int_2:
- scm_intprint (SCM_INUM (exp), 10, port);
+ scm_intprint (SCM_I_INUM (exp), 10, port);
break;
case scm_tc3_imm24:
if (SCM_CHARP (exp))
{
- long i = SCM_CHAR (exp);
+ scm_t_wchar i = SCM_CHAR (exp);
+ const char *name;
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);
+ name = scm_i_charname (exp);
+ if (name != NULL)
+ scm_puts (name, port);
+ else if (uc_is_general_category_withtable (i, UC_CATEGORY_MASK_L
+ | UC_CATEGORY_MASK_M
+ | UC_CATEGORY_MASK_N
+ | UC_CATEGORY_MASK_P
+ | UC_CATEGORY_MASK_S))
+ /* Print the character if is graphic character. */
+ {
+ if (i<256)
+ /* Character is graphic. Print it. */
+ scm_putc (i, port);
+ else
+ /* Character is graphic but unrepresentable in
+ this port's encoding. */
+ scm_intprint (i, 8, port);
+ }
+ else
+ /* Character is a non-graphical character. */
+ scm_intprint (i, 8, port);
}
else
scm_putc (i, port);
}
else if (SCM_IFLAGP (exp)
- && ((size_t) SCM_ISYMNUM (exp) < (sizeof scm_isymnames / sizeof (char *))))
- scm_puts (SCM_ISYMCHARS (exp), port);
+ && ((size_t) SCM_IFLAGNUM (exp) < (sizeof iflagnames / sizeof (char *))))
+ {
+ scm_puts (iflagnames [SCM_IFLAGNUM (exp)], port);
+ }
+ else if (SCM_ISYMP (exp))
+ {
+ scm_i_print_isym (exp, port);
+ }
else if (SCM_ILOCP (exp))
{
- scm_puts ("#@", port);
- scm_intprint ((long) SCM_IFRAME (exp), 10, port);
- scm_putc (SCM_ICDRP (exp) ? '-' : '+', port);
- scm_intprint ((long) SCM_IDIST (exp), 10, port);
+ scm_i_print_iloc (exp, port);
}
else
{
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)));
+ pwps = scm_i_port_with_print_state (port, pstate->handle);
pstate->revealed = 1;
scm_call_generic_2 (print, exp, pwps);
}
print_circref (port, pstate, exp);
break;
case scm_tcs_closures:
- if (SCM_FALSEP (scm_procedure_p (SCM_PRINT_CLOSURE))
- || SCM_FALSEP (scm_printer_apply (SCM_PRINT_CLOSURE,
+ if (scm_is_false (scm_procedure_p (SCM_PRINT_CLOSURE))
+ || scm_is_false (scm_printer_apply (SCM_PRINT_CLOSURE,
exp, port, pstate)))
{
SCM formals = SCM_CLOSURE_FORMALS (exp);
{
SCM env = SCM_ENV (exp);
SCM xenv = SCM_EXTEND_ENV (formals, SCM_EOL, env);
- SCM src = scm_unmemocopy (SCM_CODE (exp), xenv);
+ SCM src = scm_i_unmemocopy_body (SCM_CODE (exp), xenv);
ENTER_NESTED_DATA (pstate, exp, circref);
scm_iprin1 (src, port, pstate);
EXIT_NESTED_DATA (pstate);
scm_putc ('>', port);
}
break;
- case scm_tc7_string:
- if (SCM_WRITINGP (pstate))
+ case scm_tc7_number:
+ switch SCM_TYP16 (exp) {
+ case scm_tc16_big:
+ scm_bigprint (exp, port, pstate);
+ break;
+ case scm_tc16_real:
+ scm_print_real (exp, port, pstate);
+ break;
+ case scm_tc16_complex:
+ scm_print_complex (exp, port, pstate);
+ break;
+ case scm_tc16_fraction:
+ scm_i_print_fraction (exp, port, pstate);
+ break;
+ }
+ break;
+ case scm_tc7_string:
+ if (SCM_WRITINGP (pstate))
+ {
+ size_t i, j, len;
+ static char const hex[] = "0123456789abcdef";
+ char buf[8];
+
+
+ scm_putc ('"', port);
+ len = scm_i_string_length (exp);
+ for (i = 0; i < len; ++i)
+ {
+ scm_t_wchar ch = scm_i_string_ref (exp, i);
+ int printed = 0;
+
+ if (ch == ' ' || ch == '\n')
+ {
+ scm_putc (ch, port);
+ printed = 1;
+ }
+ else if (ch == '"' || ch == '\\')
+ {
+ scm_putc ('\\', port);
+ scm_i_charprint (ch, port);
+ printed = 1;
+ }
+ else
+ if (uc_is_general_category_withtable
+ (ch,
+ UC_CATEGORY_MASK_L | UC_CATEGORY_MASK_M |
+ UC_CATEGORY_MASK_N | UC_CATEGORY_MASK_P |
+ UC_CATEGORY_MASK_S))
+ {
+ /* Print the character since it is a graphic
+ character. */
+ scm_t_wchar *wbuf;
+ SCM wstr = scm_i_make_wide_string (1, &wbuf);
+ char *buf;
+ size_t len;
+
+ wbuf[0] = ch;
+
+ buf = u32_conv_to_encoding ("ISO-8859-1",
+ iconveh_error,
+ (scm_t_uint32 *) wbuf,
+ 1, NULL, NULL, &len);
+ if (buf != NULL)
+ {
+ /* Character is graphic and representable in
+ this encoding. Print it. */
+ scm_lfwrite_str (wstr, port);
+ free (buf);
+ printed = 1;
+ }
+ }
+
+ if (!printed)
+ {
+ /* Character is graphic but unrepresentable in
+ this port's encoding or is not graphic. */
+ if (ch <= 0xFF)
+ {
+ buf[0] = '\\';
+ buf[1] = 'x';
+ buf[2] = hex[ch / 16];
+ buf[3] = hex[ch % 16];
+ scm_lfwrite (buf, 4, port);
+ }
+ else if (ch <= 0xFFFF)
+ {
+ buf[0] = '\\';
+ buf[1] = 'u';
+ buf[2] = hex[(ch & 0xF000) >> 12];
+ buf[3] = hex[(ch & 0xF00) >> 8];
+ buf[4] = hex[(ch & 0xF0) >> 4];
+ buf[5] = hex[(ch & 0xF)];
+ scm_lfwrite (buf, 6, port);
+ j = i + 1;
+ }
+ else if (ch > 0xFFFF)
+ {
+ buf[0] = '\\';
+ buf[1] = 'U';
+ buf[2] = hex[(ch & 0xF00000) >> 20];
+ buf[3] = hex[(ch & 0xF0000) >> 16];
+ buf[4] = hex[(ch & 0xF000) >> 12];
+ buf[5] = hex[(ch & 0xF00) >> 8];
+ buf[6] = hex[(ch & 0xF0) >> 4];
+ buf[7] = hex[(ch & 0xF)];
+ scm_lfwrite (buf, 8, port);
+ j = i + 1;
+ }
+ }
+ }
+ scm_putc ('"', port);
+ scm_remember_upto_here_1 (exp);
+ }
+ else
+ scm_lfwrite_str (exp, port);
+ scm_remember_upto_here_1 (exp);
+ break;
+ case scm_tc7_symbol:
+ if (scm_i_symbol_is_interned (exp))
{
- size_t i;
-
- scm_putc ('"', port);
- for (i = 0; i < SCM_STRING_LENGTH (exp); ++i)
- switch (SCM_STRING_CHARS (exp)[i])
- {
- case '"':
- case '\\':
- scm_putc ('\\', port);
- default:
- scm_putc (SCM_STRING_CHARS (exp)[i], port);
- }
- scm_putc ('"', port);
- break;
+ scm_i_print_symbol_name (exp, port);
+ scm_remember_upto_here_1 (exp);
}
else
- scm_lfwrite (SCM_STRING_CHARS (exp), SCM_STRING_LENGTH (exp), port);
- break;
- case scm_tc7_symbol:
- scm_print_symbol_name (SCM_SYMBOL_CHARS (exp),
- SCM_SYMBOL_LENGTH (exp),
- port);
- scm_remember_upto_here_1 (exp);
+ {
+ scm_puts ("#<uninterned-symbol ", port);
+ scm_i_print_symbol_name (exp, port);
+ scm_putc (' ', port);
+ scm_uintprint (SCM_UNPACK (exp), 16, port);
+ scm_putc ('>', port);
+ }
break;
case scm_tc7_variable:
scm_i_variable_print (exp, port, pstate);
break;
+ case scm_tc7_program:
+ scm_i_program_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;
- long last = SCM_VECTOR_LENGTH (exp) - 1;
+ long last = SCM_SIMPLE_VECTOR_LENGTH (exp) - 1;
int cutp = 0;
- if (pstate->fancyp && SCM_VECTOR_LENGTH (exp) > pstate->length)
+ if (pstate->fancyp
+ && SCM_SIMPLE_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_iprin1 (SCM_SIMPLE_VECTOR_REF (exp, i), port, pstate);
scm_putc (' ', port);
}
if (i == last)
{
/* CHECK_INTS; */
- scm_iprin1 (SCM_VELTS (exp)[i], port, pstate);
+ scm_iprin1 (SCM_SIMPLE_VECTOR_REF (exp, i), port, pstate);
}
if (cutp)
scm_puts (" ...", port);
}
EXIT_NESTED_DATA (pstate);
break;
-#ifdef HAVE_ARRAYS
- case scm_tc7_bvect:
- case scm_tc7_byvect:
- case scm_tc7_svect:
- case scm_tc7_ivect:
- case scm_tc7_uvect:
- case scm_tc7_fvect:
- case scm_tc7_dvect:
- case scm_tc7_cvect:
-#ifdef HAVE_LONG_LONGS
- case scm_tc7_llvect:
-#endif
- scm_raprin1 (exp, port, pstate);
- break;
-#endif
case scm_tcs_subrs:
- 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 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_FALSEP (name))
- {
- scm_putc (' ', port);
- scm_puts (SCM_SYMBOL_CHARS (name), port);
- }
- }
- else
- {
- scm_puts ("#<compiled-closure ", port);
- scm_iprin1 (proc, port, pstate);
- }
+ SCM name = scm_symbol_to_string (SCM_SUBR_NAME (exp));
+ scm_puts (SCM_SUBR_GENERIC (exp)
+ ? "#<primitive-generic "
+ : "#<primitive-procedure ",
+ port);
+ scm_lfwrite_str (name, port);
scm_putc ('>', port);
+ break;
}
- break;
-#endif
case scm_tc7_pws:
scm_puts ("#<procedure-with-setter", port);
{
SCM name = scm_procedure_name (exp);
- if (!SCM_FALSEP (name))
+ if (scm_is_true (name))
{
scm_putc (' ', port);
scm_display (name, port);
SCM handle = SCM_BOOL_F; /* Will GC protect the handle whilst unlinked */
SCM pstate_scm;
scm_print_state *pstate;
+ int old_writingp;
/* If PORT is a print-state/port pair, use that. Else create a new
print-state. */
else
{
/* First try to allocate a print state from the pool */
- SCM_DEFER_INTS;
- if (!SCM_NULLP (print_state_pool))
+ scm_i_pthread_mutex_lock (&print_state_mutex);
+ if (!scm_is_null (print_state_pool))
{
handle = print_state_pool;
print_state_pool = SCM_CDR (print_state_pool);
}
- SCM_ALLOW_INTS;
- if (SCM_FALSEP (handle))
+ scm_i_pthread_mutex_unlock (&print_state_mutex);
+ if (scm_is_false (handle))
handle = scm_list_1 (make_print_state ());
pstate_scm = SCM_CAR (handle);
}
pstate = SCM_PRINT_STATE (pstate_scm);
+ old_writingp = pstate->writingp;
pstate->writingp = writingp;
scm_iprin1 (exp, port, pstate);
+ pstate->writingp = old_writingp;
/* Return print state to pool if it has been created above and
hasn't escaped to Scheme. */
- if (!SCM_FALSEP (handle) && !pstate->revealed)
+ if (scm_is_true (handle) && !pstate->revealed)
{
- SCM_DEFER_INTS;
+ scm_i_pthread_mutex_lock (&print_state_mutex);
SCM_SETCDR (handle, print_state_pool);
print_state_pool = handle;
- SCM_ALLOW_INTS;
+ scm_i_pthread_mutex_unlock (&print_state_mutex);
}
}
+/* Print a character.
+ */
+void
+scm_i_charprint (scm_t_uint32 ch, SCM port)
+{
+ scm_t_wchar *wbuf;
+ SCM wstr = scm_i_make_wide_string (1, &wbuf);
+
+ wbuf[0] = ch;
+ scm_lfwrite_str (wstr, port);
+}
/* Print an integer.
*/
void
-scm_intprint (long n, int radix, SCM port)
+scm_intprint (scm_t_intmax n, int radix, SCM port)
{
char num_buf[SCM_INTBUFLEN];
scm_lfwrite (num_buf, scm_iint2str (n, radix, num_buf), port);
}
+void
+scm_uintprint (scm_t_uintmax n, int radix, SCM port)
+{
+ char num_buf[SCM_INTBUFLEN];
+ scm_lfwrite (num_buf, scm_iuint2str (n, radix, num_buf), port);
+}
+
/* Print an object of unrecognized type.
*/
{
scm_puts ("#<unknown-", port);
scm_puts (hdr, port);
- if (scm_cellp (ptr))
+ if (scm_in_heap_p (ptr))
{
scm_puts (" (0x", port);
- scm_intprint (SCM_CELL_WORD_0 (ptr), 16, port);
+ scm_uintprint (SCM_CELL_WORD_0 (ptr), 16, port);
scm_puts (" . 0x", port);
- scm_intprint (SCM_CELL_WORD_1 (ptr), 16, port);
+ scm_uintprint (SCM_CELL_WORD_1 (ptr), 16, port);
scm_puts (") @", port);
}
scm_puts (" 0x", port);
- scm_intprint (SCM_UNPACK (ptr), 16, port);
+ scm_uintprint (SCM_UNPACK (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;
long floor = pstate->top - 2;
O(depth * N) instead of O(N^2). */
hare = SCM_CDR (exp);
tortoise = exp;
- while (SCM_CONSP (hare))
+ while (scm_is_pair (hare))
{
- if (SCM_EQ_P (hare, tortoise))
+ if (scm_is_eq (hare, tortoise))
goto fancy_printing;
hare = SCM_CDR (hare);
- if (!SCM_CONSP (hare))
+ if (!scm_is_pair (hare))
break;
hare = SCM_CDR (hare);
tortoise = SCM_CDR (tortoise);
/* No cdr cycles intrinsic to this list */
scm_iprin1 (SCM_CAR (exp), port, pstate);
- for (exp = SCM_CDR (exp); SCM_CONSP (exp); exp = SCM_CDR (exp))
+ for (exp = SCM_CDR (exp); scm_is_pair (exp); exp = SCM_CDR (exp))
{
register long i;
for (i = floor; i >= 0; --i)
- if (SCM_EQ_P (pstate->ref_stack[i], exp))
+ if (scm_is_eq (PSTATE_STACK_REF(pstate, i), exp))
goto circref;
PUSH_REF (pstate, exp);
scm_putc (' ', port);
/* CHECK_INTS; */
scm_iprin1 (SCM_CAR (exp), port, pstate);
}
- if (!SCM_NULLP (exp))
+ if (!SCM_NULL_OR_NIL_P (exp))
{
scm_puts (" . ", port);
scm_iprin1 (exp, port, pstate);
scm_iprin1 (SCM_CAR (exp), port, pstate);
exp = SCM_CDR (exp); --n;
- for (; SCM_CONSP (exp); exp = SCM_CDR (exp))
+ for (; scm_is_pair (exp); exp = SCM_CDR (exp))
{
register unsigned long i;
for (i = 0; i < pstate->top; ++i)
- if (SCM_EQ_P (pstate->ref_stack[i], exp))
+ if (scm_is_eq (PSTATE_STACK_REF(pstate, i), exp))
goto fancy_circref;
if (pstate->fancyp)
{
scm_iprin1 (SCM_CAR (exp), port, pstate);
}
}
- if (!SCM_NULLP (exp))
+ if (!SCM_NULL_OR_NIL_P (exp))
{
scm_puts (" . ", port);
scm_iprin1 (exp, port, pstate);
scm_write (SCM obj, SCM port)
{
if (SCM_UNBNDP (port))
- port = scm_cur_outp;
+ port = scm_current_output_port ();
SCM_ASSERT (scm_valid_oport_value_p (port), port, SCM_ARG2, s_write);
scm_prin1 (obj, port, 1);
+#if 0
#ifdef HAVE_PIPE
# ifdef EPIPE
if (EPIPE == errno)
scm_close_port (port);
# endif
+#endif
#endif
return SCM_UNSPECIFIED;
}
scm_display (SCM obj, SCM port)
{
if (SCM_UNBNDP (port))
- port = scm_cur_outp;
+ port = scm_current_output_port ();
SCM_ASSERT (scm_valid_oport_value_p (port), port, SCM_ARG2, s_display);
scm_prin1 (obj, port, 0);
+#if 0
#ifdef HAVE_PIPE
# ifdef EPIPE
if (EPIPE == errno)
scm_close_port (port);
# endif
+#endif
#endif
return SCM_UNSPECIFIED;
}
"containing the formatted text. Does not add a trailing newline.")
#define FUNC_NAME s_scm_simple_format
{
- SCM answer = SCM_UNSPECIFIED;
+ SCM port, answer = SCM_UNSPECIFIED;
int fReturnString = 0;
int writingp;
- char *start;
- char *end;
- char *p;
+ const char *start;
+ const char *end;
+ const char *p;
- if (SCM_EQ_P (destination, SCM_BOOL_T))
+ if (scm_is_eq (destination, SCM_BOOL_T))
{
- destination = scm_cur_outp;
+ destination = port = scm_current_output_port ();
}
- else if (SCM_FALSEP (destination))
+ else if (scm_is_false (destination))
{
fReturnString = 1;
- destination = scm_mkstrport (SCM_INUM0,
- scm_make_string (SCM_INUM0, SCM_UNDEFINED),
- SCM_OPN | SCM_WRTNG,
- FUNC_NAME);
+ port = scm_mkstrport (SCM_INUM0,
+ scm_make_string (SCM_INUM0, SCM_UNDEFINED),
+ SCM_OPN | SCM_WRTNG,
+ FUNC_NAME);
+ destination = port;
}
else
{
SCM_VALIDATE_OPORT_VALUE (1, destination);
- destination = SCM_COERCE_OUTPORT (destination);
+ port = 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);
+ start = scm_i_string_chars (message);
+ end = start + scm_i_string_length (message);
for (p = start; p != end; ++p)
if (*p == '~')
{
writingp = 1;
break;
case '~':
- scm_lfwrite (start, p - start, destination);
+ scm_lfwrite (start, p - start, port);
start = p + 1;
continue;
case '%':
- scm_newline (destination);
+ scm_lfwrite (start, p - start - 1, port);
+ scm_newline (port);
start = p + 1;
continue;
default:
}
- if (!SCM_CONSP (args))
+ if (!scm_is_pair (args))
SCM_MISC_ERROR ("FORMAT: Missing argument for ~~~A",
scm_list_1 (SCM_MAKE_CHAR (*p)));
- scm_lfwrite (start, p - start - 1, destination);
+ scm_lfwrite (start, p - start - 1, port);
+ /* we pass destination here */
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_lfwrite (start, p - start, port);
+ if (!scm_is_eq (args, SCM_EOL))
SCM_MISC_ERROR ("FORMAT: ~A superfluous arguments",
scm_list_1 (scm_length (args)));
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;
+ port = scm_current_output_port ();
- SCM_VALIDATE_OPORT_VALUE (1,port);
+ SCM_VALIDATE_OPORT_VALUE (1, port);
scm_putc ('\n', SCM_COERCE_OUTPORT (port));
return SCM_UNSPECIFIED;
#define FUNC_NAME s_scm_write_char
{
if (SCM_UNBNDP (port))
- port = scm_cur_outp;
+ port = scm_current_output_port ();
- 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));
+#if 0
#ifdef HAVE_PIPE
# ifdef EPIPE
if (EPIPE == errno)
scm_close_port (port);
# endif
+#endif
#endif
return SCM_UNSPECIFIED;
}
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_call_2 (proc, exp, pwps);
+ return scm_call_2 (proc, exp,
+ scm_i_port_with_print_state (port, pstate->handle));
}
-SCM_DEFINE (scm_port_with_print_state, "port-with-print-state", 2, 0, 0,
+SCM_DEFINE (scm_port_with_print_state, "port-with-print-state", 1, 1, 0,
(SCM port, SCM pstate),
"Create a new port which behaves like @var{port}, but with an\n"
- "included print state @var{pstate}.")
+ "included print state @var{pstate}. @var{pstate} is optional.\n"
+ "If @var{pstate} isn't supplied and @var{port} already has\n"
+ "a print state, the old print state is reused.")
#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;
+ SCM_VALIDATE_OPORT_VALUE (1, port);
+ if (!SCM_UNBNDP (pstate))
+ SCM_VALIDATE_PRINTSTATE (2, pstate);
+ return scm_i_port_with_print_state (port, pstate);
}
#undef FUNC_NAME
{
SCM vtable, layout, type;
- scm_init_opts (scm_print_options, scm_print_opts, SCM_N_PRINT_OPTIONS);
+ scm_init_opts (scm_print_options, scm_print_opts);
+
+ scm_print_options (scm_list_4 (scm_from_locale_symbol ("highlight-prefix"),
+ scm_from_locale_string ("{"),
+ scm_from_locale_symbol ("highlight-suffix"),
+ scm_from_locale_string ("}")));
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));
+ layout =
+ scm_make_struct_layout (scm_from_locale_string (SCM_PRINT_STATE_LAYOUT));
type = scm_make_struct (vtable, SCM_INUM0, scm_list_1 (layout));
- scm_set_struct_vtable_name_x (type, scm_str2symbol ("print-state"));
+ scm_set_struct_vtable_name_x (type, scm_from_locale_symbol ("print-state"));
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
+
+ scm_print_opts[SCM_PRINT_KEYWORD_STYLE_I].val = SCM_UNPACK (sym_reader);
}
/*