X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7eb0330213eae25cac6204a2c97a737e7c501bf8..4985dde2d0220cf74334261e0f558c377d295815:/src/print.c diff --git a/src/print.c b/src/print.c index d3a7efc12c..3f8982849d 100644 --- a/src/print.c +++ b/src/print.c @@ -1,6 +1,7 @@ /* Lisp object printing and output streams. - Copyright (C) 1985, 86, 88, 93, 94, 95, 97, 1998 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -16,28 +17,22 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include #include #include "lisp.h" - -#ifndef standalone #include "buffer.h" #include "charset.h" +#include "keyboard.h" #include "frame.h" #include "window.h" #include "process.h" #include "dispextern.h" #include "termchar.h" -#include "keyboard.h" -#endif /* not standalone */ - -#ifdef USE_TEXT_PROPERTIES #include "intervals.h" -#endif Lisp_Object Vstandard_output, Qstandard_output; @@ -46,7 +41,6 @@ Lisp_Object Qtemp_buffer_setup_hook; /* These are used to print like we read. */ extern Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction; -#ifdef LISP_FLOAT_TYPE Lisp_Object Vfloat_output_format, Qfloat_output_format; /* Work around a problem that happens because math.h on hpux 7 @@ -63,7 +57,6 @@ Lisp_Object Vfloat_output_format, Qfloat_output_format; #if STDC_HEADERS #include -#include #endif /* Default to values appropriate for IEEE floating point. */ @@ -96,11 +89,12 @@ Lisp_Object Vfloat_output_format, Qfloat_output_format; #define DOUBLE_DIGITS_BOUND ((int) ceil (log10 (pow (FLT_RADIX, DBL_MANT_DIG)))) #endif -#endif /* LISP_FLOAT_TYPE */ - /* Avoid actual stack overflow in print. */ int print_depth; +/* Nonzero if inside outputting backquote in old style. */ +int old_backquote_output; + /* Detect most circularities to print finite output. */ #define PRINT_CIRCLE 200 Lisp_Object being_printed[PRINT_CIRCLE]; @@ -146,17 +140,33 @@ Lisp_Object Qprint_escape_multibyte, Qprint_escape_nonascii; int print_quoted; -/* Non-nil means print #: before uninterned symbols. - Neither t nor nil means so that and don't clear Vprint_gensym_alist - on entry to and exit from print functions. */ +/* Non-nil means print #: before uninterned symbols. */ Lisp_Object Vprint_gensym; -/* Association list of certain objects that are `eq' in the form being - printed and which should be `eq' when read back in, using the #n=object - and #n# reader forms. Each element has the form (object . n). */ +/* Non-nil means print recursive structures using #n= and #n# syntax. */ + +Lisp_Object Vprint_circle; + +/* Non-nil means keep continuous number for #n= and #n# syntax + between several print functions. */ + +Lisp_Object Vprint_continuous_numbering; + +/* Vprint_number_table is a vector like [OBJ1 STAT1 OBJ2 STAT2 ...], + where OBJn are objects going to be printed, and STATn are their status, + which may be different meanings during process. See the comments of + the functions print and print_preprocess for details. + print_number_index keeps the last position the next object should be added, + twice of which is the actual vector position in Vprint_number_table. */ +int print_number_index; +Lisp_Object Vprint_number_table; -Lisp_Object Vprint_gensym_alist; +/* PRINT_NUMBER_OBJECT returns the I'th object in Vprint_number_table TABLE. + PRINT_NUMBER_STATUS returns the status of the I'th object in TABLE. + See the comment of the variable Vprint_number_table. */ +#define PRINT_NUMBER_OBJECT(table,i) XVECTOR ((table))->contents[(i) * 2] +#define PRINT_NUMBER_STATUS(table,i) XVECTOR ((table))->contents[(i) * 2 + 1] /* Nonzero means print newline to stdout before next minibuffer message. Defined in xdisp.c */ @@ -171,58 +181,10 @@ static int max_print; #endif /* MAX_PRINT_CHARS */ void print_interval (); - -#if 0 -/* Convert between chars and GLYPHs */ - -int -glyphlen (glyphs) - register GLYPH *glyphs; -{ - register int i = 0; - - while (glyphs[i]) - i++; - return i; -} - -void -str_to_glyph_cpy (str, glyphs) - char *str; - GLYPH *glyphs; -{ - register GLYPH *gp = glyphs; - register char *cp = str; - - while (*cp) - *gp++ = *cp++; -} - -void -str_to_glyph_ncpy (str, glyphs, n) - char *str; - GLYPH *glyphs; - register int n; -{ - register GLYPH *gp = glyphs; - register char *cp = str; - - while (n-- > 0) - *gp++ = *cp++; -} -void -glyph_to_str_cpy (glyphs, str) - GLYPH *glyphs; - char *str; -{ - register GLYPH *gp = glyphs; - register char *cp = str; +/* GDB resets this to zero on W32 to disable OutputDebugString calls. */ +int print_output_debug_flag = 1; - while (*gp) - *str++ = *gp++ & 0377; -} -#endif /* Low level output routines for characters and strings */ @@ -231,67 +193,71 @@ glyph_to_str_cpy (glyphs, str) and must start with PRINTPREPARE, end with PRINTFINISH, and use PRINTDECLARE to declare common variables. Use PRINTCHAR to output one character, - or call strout to output a block of characters. -*/ - -#define PRINTDECLARE \ - struct buffer *old = current_buffer; \ - int old_point = -1, start_point; \ - int old_point_byte, start_point_byte; \ - int specpdl_count = specpdl_ptr - specpdl; \ - int free_print_buffer = 0; \ + or call strout to output a block of characters. */ + +#define PRINTDECLARE \ + struct buffer *old = current_buffer; \ + int old_point = -1, start_point = -1; \ + int old_point_byte = -1, start_point_byte = -1; \ + int specpdl_count = SPECPDL_INDEX (); \ + int free_print_buffer = 0; \ + int multibyte = !NILP (current_buffer->enable_multibyte_characters); \ Lisp_Object original -#define PRINTPREPARE \ - original = printcharfun; \ - if (NILP (printcharfun)) printcharfun = Qt; \ - if (BUFFERP (printcharfun)) \ - { \ - if (XBUFFER (printcharfun) != current_buffer) \ - Fset_buffer (printcharfun); \ - printcharfun = Qnil; \ - } \ - if (MARKERP (printcharfun)) \ - { \ - if (!(XMARKER (original)->buffer)) \ - error ("Marker does not point anywhere"); \ - if (XMARKER (original)->buffer != current_buffer) \ - set_buffer_internal (XMARKER (original)->buffer); \ - old_point = PT; \ - old_point_byte = PT_BYTE; \ - SET_PT_BOTH (marker_position (printcharfun), \ - marker_byte_position (printcharfun)); \ - start_point = PT; \ - start_point_byte = PT_BYTE; \ - printcharfun = Qnil; \ - } \ - if (NILP (printcharfun)) \ - { \ - Lisp_Object string; \ - if (NILP (current_buffer->enable_multibyte_characters) \ - && ! print_escape_multibyte) \ - specbind (Qprint_escape_multibyte, Qt); \ - if (! NILP (current_buffer->enable_multibyte_characters) \ - && ! print_escape_nonascii) \ - specbind (Qprint_escape_nonascii, Qt); \ - if (print_buffer != 0) \ - { \ - string = make_string_from_bytes (print_buffer, \ - print_buffer_pos, \ - print_buffer_pos_byte); \ - record_unwind_protect (print_unwind, string); \ - } \ - else \ - { \ - print_buffer_size = 1000; \ - print_buffer = (char *) xmalloc (print_buffer_size); \ - free_print_buffer = 1; \ - } \ - print_buffer_pos = 0; \ - print_buffer_pos_byte = 0; \ - } \ - if (!CONSP (Vprint_gensym)) \ - Vprint_gensym_alist = Qnil +#define PRINTPREPARE \ + original = printcharfun; \ + if (NILP (printcharfun)) printcharfun = Qt; \ + if (BUFFERP (printcharfun)) \ + { \ + if (XBUFFER (printcharfun) != current_buffer) \ + Fset_buffer (printcharfun); \ + printcharfun = Qnil; \ + } \ + if (MARKERP (printcharfun)) \ + { \ + EMACS_INT marker_pos; \ + if (!(XMARKER (printcharfun)->buffer)) \ + error ("Marker does not point anywhere"); \ + if (XMARKER (printcharfun)->buffer != current_buffer) \ + set_buffer_internal (XMARKER (printcharfun)->buffer); \ + marker_pos = marker_position (printcharfun); \ + if (marker_pos < BEGV || marker_pos > ZV) \ + error ("Marker is outside the accessible part of the buffer"); \ + old_point = PT; \ + old_point_byte = PT_BYTE; \ + SET_PT_BOTH (marker_pos, \ + marker_byte_position (printcharfun)); \ + start_point = PT; \ + start_point_byte = PT_BYTE; \ + printcharfun = Qnil; \ + } \ + if (NILP (printcharfun)) \ + { \ + Lisp_Object string; \ + if (NILP (current_buffer->enable_multibyte_characters) \ + && ! print_escape_multibyte) \ + specbind (Qprint_escape_multibyte, Qt); \ + if (! NILP (current_buffer->enable_multibyte_characters) \ + && ! print_escape_nonascii) \ + specbind (Qprint_escape_nonascii, Qt); \ + if (print_buffer != 0) \ + { \ + string = make_string_from_bytes (print_buffer, \ + print_buffer_pos, \ + print_buffer_pos_byte); \ + record_unwind_protect (print_unwind, string); \ + } \ + else \ + { \ + print_buffer_size = 1000; \ + print_buffer = (char *) xmalloc (print_buffer_size); \ + free_print_buffer = 1; \ + } \ + print_buffer_pos = 0; \ + print_buffer_pos_byte = 0; \ + } \ + if (EQ (printcharfun, Qt) && ! noninteractive) \ + setup_echo_area_for_printing (multibyte); #define PRINTFINISH \ if (NILP (printcharfun)) \ @@ -309,6 +275,7 @@ glyph_to_str_cpy (glyphs, str) else \ insert_1_both (print_buffer, print_buffer_pos, \ print_buffer_pos_byte, 0, 1, 0); \ + signal_after_change (PT - print_buffer_pos, 0, print_buffer_pos);\ } \ if (free_print_buffer) \ { \ @@ -324,156 +291,81 @@ glyph_to_str_cpy (glyphs, str) old_point_byte + (old_point_byte >= start_point_byte \ ? PT_BYTE - start_point_byte : 0)); \ if (old != current_buffer) \ - set_buffer_internal (old); \ - if (!CONSP (Vprint_gensym)) \ - Vprint_gensym_alist = Qnil + set_buffer_internal (old); #define PRINTCHAR(ch) printchar (ch, printcharfun) -/* Nonzero if there is no room to print any more characters - so print might as well return right away. */ - -#define PRINTFULLP() \ - (EQ (printcharfun, Qt) && !noninteractive \ - && printbufidx >= FRAME_WIDTH (XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window))))) - /* This is used to restore the saved contents of print_buffer when there is a recursive call to print. */ + static Lisp_Object print_unwind (saved_text) Lisp_Object saved_text; { - bcopy (XSTRING (saved_text)->data, print_buffer, XSTRING (saved_text)->size); + bcopy (SDATA (saved_text), print_buffer, SCHARS (saved_text)); + return Qnil; } -/* Index of first unused element of FRAME_MESSAGE_BUF (mini_frame). */ -static int printbufidx; + +/* Print character CH using method FUN. FUN nil means print to + print_buffer. FUN t means print to echo area or stdout if + non-interactive. If FUN is neither nil nor t, call FUN with CH as + argument. */ static void printchar (ch, fun) unsigned int ch; Lisp_Object fun; { - Lisp_Object ch1; - #ifdef MAX_PRINT_CHARS if (max_print) print_chars++; #endif /* MAX_PRINT_CHARS */ -#ifndef standalone - if (EQ (fun, Qnil)) - { - int len; - unsigned char work[4], *str; - QUIT; - len = CHAR_STRING (ch, work, str); - if (print_buffer_pos_byte + len >= print_buffer_size) - print_buffer = (char *) xrealloc (print_buffer, - print_buffer_size *= 2); - bcopy (str, print_buffer + print_buffer_pos_byte, len); - print_buffer_pos += 1; - print_buffer_pos_byte += len; - return; - } - - if (EQ (fun, Qt)) + if (!NILP (fun) && !EQ (fun, Qt)) + call1 (fun, make_number (ch)); + else { - FRAME_PTR mini_frame - = XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window))); - unsigned char work[4], *str; - int len = CHAR_STRING (ch, work, str); + unsigned char str[MAX_MULTIBYTE_LENGTH]; + int len = CHAR_STRING (ch, str); QUIT; - if (noninteractive) - { - while (len--) - putchar (*str), str++; - noninteractive_need_newline = 1; - return; - } - - if (echo_area_glyphs != FRAME_MESSAGE_BUF (mini_frame) - || !message_buf_print) + if (NILP (fun)) { - message_log_maybe_newline (); - echo_area_glyphs = FRAME_MESSAGE_BUF (mini_frame); - echo_area_message = Qnil; - printbufidx = 0; - echo_area_glyphs_length = 0; - message_buf_print = 1; - - if (minibuffer_auto_raise) - { - Lisp_Object mini_window; - - /* Get the frame containing the minibuffer - that the selected frame is using. */ - mini_window = FRAME_MINIBUF_WINDOW (selected_frame); - - Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window))); - } + if (print_buffer_pos_byte + len >= print_buffer_size) + print_buffer = (char *) xrealloc (print_buffer, + print_buffer_size *= 2); + bcopy (str, print_buffer + print_buffer_pos_byte, len); + print_buffer_pos += 1; + print_buffer_pos_byte += len; } - - if (len == 1 - && ! NILP (current_buffer->enable_multibyte_characters) - && ! CHAR_HEAD_P (*str)) + else if (noninteractive) { - /* Convert the unibyte character to multibyte. */ - unsigned char c = *str; - - len = count_size_as_multibyte (&c, 1); - copy_text (&c, work, 1, 0, 1); - str = work; + fwrite (str, 1, len, stdout); + noninteractive_need_newline = 1; } - - message_dolog (str, len, 0, len > 1); - - if (! NILP (current_buffer->enable_multibyte_characters) - && ! message_enable_multibyte) + else { - /* Record that the message buffer is multibyte. */ - message_enable_multibyte = 1; + int multibyte_p + = !NILP (current_buffer->enable_multibyte_characters); - /* If we have already had some message text in the messsage - buffer, we convert it to multibyte. */ - if (printbufidx > 0) - { - int size - = count_size_as_multibyte (FRAME_MESSAGE_BUF (mini_frame), - printbufidx); - unsigned char *tembuf = (unsigned char *) alloca (size + 1); - copy_text (FRAME_MESSAGE_BUF (mini_frame), tembuf, printbufidx, - 0, 1); - printbufidx = size; - if (printbufidx > FRAME_MESSAGE_BUF_SIZE (mini_frame)) - { - printbufidx = FRAME_MESSAGE_BUF_SIZE (mini_frame); - /* Rewind incomplete multi-byte form. */ - while (printbufidx > 0 && tembuf[printbufidx] >= 0xA0) - printbufidx--; - } - bcopy (tembuf, FRAME_MESSAGE_BUF (mini_frame), printbufidx); - } + setup_echo_area_for_printing (multibyte_p); + insert_char (ch); + message_dolog (str, len, 0, multibyte_p); } - - if (printbufidx < FRAME_MESSAGE_BUF_SIZE (mini_frame) - len) - { - bcopy (str, &FRAME_MESSAGE_BUF (mini_frame)[printbufidx], len); - printbufidx += len; - } - FRAME_MESSAGE_BUF (mini_frame)[printbufidx] = 0; - echo_area_glyphs_length = printbufidx; - - return; } -#endif /* not standalone */ - - XSETFASTINT (ch1, ch); - call1 (fun, ch1); } + +/* Output SIZE characters, SIZE_BYTE bytes from string PTR using + method PRINTCHARFUN. If SIZE < 0, use the string length of PTR for + both SIZE and SIZE_BYTE. PRINTCHARFUN nil means output to + print_buffer. PRINTCHARFUN t means output to the echo area or to + stdout if non-interactive. If neither nil nor t, call Lisp + function PRINTCHARFUN for each character printed. MULTIBYTE + non-zero means PTR contains multibyte characters. */ + static void strout (ptr, size, size_byte, printcharfun, multibyte) char *ptr; @@ -481,12 +373,10 @@ strout (ptr, size, size_byte, printcharfun, multibyte) Lisp_Object printcharfun; int multibyte; { - int i = 0; - if (size < 0) size_byte = size = strlen (ptr); - if (EQ (printcharfun, Qnil)) + if (NILP (printcharfun)) { if (print_buffer_pos_byte + size_byte > print_buffer_size) { @@ -502,113 +392,71 @@ strout (ptr, size, size_byte, printcharfun, multibyte) if (max_print) print_chars += size; #endif /* MAX_PRINT_CHARS */ - return; } - if (EQ (printcharfun, Qt)) + else if (noninteractive && EQ (printcharfun, Qt)) { - FRAME_PTR mini_frame - = XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window))); + fwrite (ptr, 1, size_byte, stdout); + noninteractive_need_newline = 1; + } + else if (EQ (printcharfun, Qt)) + { + /* Output to echo area. We're trying to avoid a little overhead + here, that's the reason we don't call printchar to do the + job. */ + int i; + int multibyte_p + = !NILP (current_buffer->enable_multibyte_characters); - QUIT; + setup_echo_area_for_printing (multibyte_p); + message_dolog (ptr, size_byte, 0, multibyte_p); -#ifdef MAX_PRINT_CHARS - if (max_print) - print_chars += size; -#endif /* MAX_PRINT_CHARS */ - - if (noninteractive) + if (size == size_byte) { - fwrite (ptr, 1, size_byte, stdout); - noninteractive_need_newline = 1; - return; + for (i = 0; i < size; ++i) + insert_char ((unsigned char )*ptr++); } - - if (echo_area_glyphs != FRAME_MESSAGE_BUF (mini_frame) - || !message_buf_print) + else { - message_log_maybe_newline (); - echo_area_glyphs = FRAME_MESSAGE_BUF (mini_frame); - echo_area_message = Qnil; - printbufidx = 0; - echo_area_glyphs_length = 0; - message_buf_print = 1; - - if (minibuffer_auto_raise) + int len; + for (i = 0; i < size_byte; i += len) { - Lisp_Object mini_window; - - /* Get the frame containing the minibuffer - that the selected frame is using. */ - mini_window = FRAME_MINIBUF_WINDOW (selected_frame); - - Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window))); + int ch = STRING_CHAR_AND_LENGTH (ptr + i, size_byte - i, len); + insert_char (ch); } } - message_dolog (ptr, size_byte, 0, multibyte); +#ifdef MAX_PRINT_CHARS + if (max_print) + print_chars += size; +#endif /* MAX_PRINT_CHARS */ + } + else + { + /* PRINTCHARFUN is a Lisp function. */ + int i = 0; - /* Convert message to multibyte if we are now adding multibyte text. */ - if (multibyte - && ! message_enable_multibyte - && printbufidx > 0) + if (size == size_byte) { - int size = count_size_as_multibyte (FRAME_MESSAGE_BUF (mini_frame), - printbufidx); - unsigned char *tembuf = (unsigned char *) alloca (size + 1); - copy_text (FRAME_MESSAGE_BUF (mini_frame), tembuf, printbufidx, - 0, 1); - printbufidx = size; - if (printbufidx > FRAME_MESSAGE_BUF_SIZE (mini_frame)) + while (i < size_byte) { - printbufidx = FRAME_MESSAGE_BUF_SIZE (mini_frame); - /* Rewind incomplete multi-byte form. */ - while (printbufidx > 0 && tembuf[printbufidx] >= 0xA0) - printbufidx--; + int ch = ptr[i++]; + PRINTCHAR (ch); } - - bcopy (tembuf, FRAME_MESSAGE_BUF (mini_frame), printbufidx); } - - if (multibyte) - message_enable_multibyte = 1; - - /* Compute how much of the new text will fit there. */ - if (size_byte > FRAME_MESSAGE_BUF_SIZE (mini_frame) - printbufidx - 1) + else { - size_byte = FRAME_MESSAGE_BUF_SIZE (mini_frame) - printbufidx - 1; - /* Rewind incomplete multi-byte form. */ - while (size_byte && (unsigned char) ptr[size_byte] >= 0xA0) - size_byte--; + while (i < size_byte) + { + /* Here, we must convert each multi-byte form to the + corresponding character code before handing it to + PRINTCHAR. */ + int len; + int ch = STRING_CHAR_AND_LENGTH (ptr + i, size_byte - i, len); + PRINTCHAR (ch); + i += len; + } } - - /* Put that part of the new text in. */ - bcopy (ptr, &FRAME_MESSAGE_BUF (mini_frame) [printbufidx], size_byte); - printbufidx += size_byte; - FRAME_MESSAGE_BUF (mini_frame) [printbufidx] = 0; - echo_area_glyphs_length = printbufidx; - - return; } - - i = 0; - if (size == size_byte) - while (i < size_byte) - { - int ch = ptr[i++]; - - PRINTCHAR (ch); - } - else - while (i < size_byte) - { - /* Here, we must convert each multi-byte form to the - corresponding character code before handing it to PRINTCHAR. */ - int len; - int ch = STRING_CHAR_AND_LENGTH (ptr + i, size_byte - i, len); - - PRINTCHAR (ch); - i += len; - } } /* Print the contents of a string STRING using PRINTCHARFUN. @@ -625,18 +473,33 @@ print_string (string, printcharfun) int chars; if (STRING_MULTIBYTE (string)) - chars = XSTRING (string)->size; + chars = SCHARS (string); else if (EQ (printcharfun, Qt) ? ! NILP (buffer_defaults.enable_multibyte_characters) : ! NILP (current_buffer->enable_multibyte_characters)) - chars = multibyte_chars_in_text (XSTRING (string)->data, - STRING_BYTES (XSTRING (string))); + { + /* If unibyte string STRING contains 8-bit codes, we must + convert STRING to a multibyte string containing the same + character codes. */ + Lisp_Object newstr; + int bytes; + + chars = SBYTES (string); + bytes = parse_str_to_multibyte (SDATA (string), chars); + if (chars < bytes) + { + newstr = make_uninit_multibyte_string (chars, bytes); + bcopy (SDATA (string), SDATA (newstr), chars); + str_to_multibyte (SDATA (newstr), bytes, chars); + string = newstr; + } + } else - chars = STRING_BYTES (XSTRING (string)); + chars = SBYTES (string); /* strout is safe for output to a frame (echo area) or to print_buffer. */ - strout (XSTRING (string)->data, - chars, STRING_BYTES (XSTRING (string)), + strout (SDATA (string), + chars, SBYTES (string), printcharfun, STRING_MULTIBYTE (string)); } else @@ -644,24 +507,24 @@ print_string (string, printcharfun) /* Otherwise, string may be relocated by printing one char. So re-fetch the string address for each character. */ int i; - int size = XSTRING (string)->size; - int size_byte = STRING_BYTES (XSTRING (string)); + int size = SCHARS (string); + int size_byte = SBYTES (string); struct gcpro gcpro1; GCPRO1 (string); if (size == size_byte) for (i = 0; i < size; i++) - PRINTCHAR (XSTRING (string)->data[i]); + PRINTCHAR (SREF (string, i)); else - for (i = 0; i < size_byte; i++) + for (i = 0; i < size_byte; ) { /* Here, we must convert each multi-byte form to the corresponding character code before handing it to PRINTCHAR. */ int len; - int ch = STRING_CHAR_AND_CHAR_LENGTH (XSTRING (string)->data + i, - size_byte - i, len); + int ch = STRING_CHAR_AND_LENGTH (SDATA (string) + i, + size_byte - i, len); if (!CHAR_VALID_P (ch, 0)) { - ch = XSTRING (string)->data[i]; + ch = SREF (string, i); len = 1; } PRINTCHAR (ch); @@ -672,16 +535,16 @@ print_string (string, printcharfun) } DEFUN ("write-char", Fwrite_char, Swrite_char, 1, 2, 0, - "Output character CHARACTER to stream PRINTCHARFUN.\n\ -PRINTCHARFUN defaults to the value of `standard-output' (which see).") - (character, printcharfun) + doc: /* Output character CHARACTER to stream PRINTCHARFUN. +PRINTCHARFUN defaults to the value of `standard-output' (which see). */) + (character, printcharfun) Lisp_Object character, printcharfun; { PRINTDECLARE; if (NILP (printcharfun)) printcharfun = Vstandard_output; - CHECK_NUMBER (character, 0); + CHECK_NUMBER (character); PRINTPREPARE; PRINTCHAR (XINT (character)); PRINTFINISH; @@ -725,13 +588,11 @@ write_string_1 (data, size, printcharfun) } -#ifndef standalone - void temp_output_buffer_setup (bufname) - char *bufname; + const char *bufname; { - int count = specpdl_ptr - specpdl; + int count = SPECPDL_INDEX (); register struct buffer *old = current_buffer; register Lisp_Object buf; @@ -739,18 +600,22 @@ temp_output_buffer_setup (bufname) Fset_buffer (Fget_buffer_create (build_string (bufname))); + Fkill_all_local_variables (); + delete_all_overlays (current_buffer); current_buffer->directory = old->directory; current_buffer->read_only = Qnil; current_buffer->filename = Qnil; current_buffer->undo_list = Qt; - current_buffer->overlays_before = Qnil; - current_buffer->overlays_after = Qnil; + eassert (current_buffer->overlays_before == NULL); + eassert (current_buffer->overlays_after == NULL); current_buffer->enable_multibyte_characters = buffer_defaults.enable_multibyte_characters; + specbind (Qinhibit_read_only, Qt); + specbind (Qinhibit_modification_hooks, Qt); Ferase_buffer (); XSETBUFFER (buf, current_buffer); - call1 (Vrun_hooks, Qtemp_buffer_setup_hook); + Frun_hooks (1, &Qtemp_buffer_setup_hook); unbind_to (count, Qnil); @@ -759,11 +624,11 @@ temp_output_buffer_setup (bufname) Lisp_Object internal_with_output_to_temp_buffer (bufname, function, args) - char *bufname; + const char *bufname; Lisp_Object (*function) P_ ((Lisp_Object)); Lisp_Object args; { - int count = specpdl_ptr - specpdl; + int count = SPECPDL_INDEX (); Lisp_Object buf, val; struct gcpro gcpro1; @@ -782,53 +647,60 @@ internal_with_output_to_temp_buffer (bufname, function, args) return unbind_to (count, val); } -DEFUN ("with-output-to-temp-buffer", Fwith_output_to_temp_buffer, Swith_output_to_temp_buffer, +DEFUN ("with-output-to-temp-buffer", + Fwith_output_to_temp_buffer, Swith_output_to_temp_buffer, 1, UNEVALLED, 0, - "Bind `standard-output' to buffer BUFNAME, eval BODY, then show that buffer.\n\ -The buffer is cleared out initially, and marked as unmodified when done.\n\ -All output done by BODY is inserted in that buffer by default.\n\ -The buffer is displayed in another window, but not selected.\n\ -The value of the last form in BODY is returned.\n\ -If BODY does not finish normally, the buffer BUFNAME is not displayed.\n\ -\n\ -The hook `temp-buffer-setup-hook' is run before BODY,\n\ -with the buffer BUFNAME temporarily current.\n\ -The hook `temp-buffer-show-hook' is run after the buffer is displayed,\n\ -with the buffer temporarily current, and the window that was used\n\ -to display it temporarily selected.\n\ -\n\ -If variable `temp-buffer-show-function' is non-nil, call it at the end\n\ -to get the buffer displayed instead of just displaying the non-selected\n\ -buffer and calling the hook. It gets one argument, the buffer to display.") - (args) + doc: /* Bind `standard-output' to buffer BUFNAME, eval BODY, then show that buffer. +The buffer is cleared out initially, and marked as unmodified when done. +All output done by BODY is inserted in that buffer by default. +The buffer is displayed in another window, but not selected. +The value of the last form in BODY is returned. +If BODY does not finish normally, the buffer BUFNAME is not displayed. + +The hook `temp-buffer-setup-hook' is run before BODY, +with the buffer BUFNAME temporarily current. +The hook `temp-buffer-show-hook' is run after the buffer is displayed, +with the buffer temporarily current, and the window that was used +to display it temporarily selected. + +If variable `temp-buffer-show-function' is non-nil, call it at the end +to get the buffer displayed instead of just displaying the non-selected +buffer and calling the hook. It gets one argument, the buffer to display. + +usage: (with-output-to-temp-buffer BUFNAME BODY ...) */) + (args) Lisp_Object args; { struct gcpro gcpro1; Lisp_Object name; - int count = specpdl_ptr - specpdl; + int count = SPECPDL_INDEX (); Lisp_Object buf, val; GCPRO1(args); name = Feval (Fcar (args)); - UNGCPRO; - - CHECK_STRING (name, 0); - temp_output_buffer_setup (XSTRING (name)->data); + CHECK_STRING (name); + temp_output_buffer_setup (SDATA (name)); buf = Vstandard_output; + UNGCPRO; - val = Fprogn (Fcdr (args)); + val = Fprogn (XCDR (args)); + GCPRO1 (val); temp_output_buffer_show (buf); + UNGCPRO; return unbind_to (count, val); } -#endif /* not standalone */ + static void print (); +static void print_preprocess (); +static void print_preprocess_string (); +static void print_object (); DEFUN ("terpri", Fterpri, Sterpri, 0, 1, 0, - "Output a newline to stream PRINTCHARFUN.\n\ -If PRINTCHARFUN is omitted or nil, the value of `standard-output' is used.") + doc: /* Output a newline to stream PRINTCHARFUN. +If PRINTCHARFUN is omitted or nil, the value of `standard-output' is used. */) (printcharfun) Lisp_Object printcharfun; { @@ -843,11 +715,29 @@ If PRINTCHARFUN is omitted or nil, the value of `standard-output' is used.") } DEFUN ("prin1", Fprin1, Sprin1, 1, 2, 0, - "Output the printed representation of OBJECT, any Lisp object.\n\ -Quoting characters are printed when needed to make output that `read'\n\ -can handle, whenever this is possible.\n\ -Output stream is PRINTCHARFUN, or value of `standard-output' (which see).") - (object, printcharfun) + doc: /* Output the printed representation of OBJECT, any Lisp object. +Quoting characters are printed when needed to make output that `read' +can handle, whenever this is possible. For complex objects, the behavior +is controlled by `print-level' and `print-length', which see. + +OBJECT is any of the Lisp data types: a number, a string, a symbol, +a list, a buffer, a window, a frame, etc. + +A printed representation of an object is text which describes that object. + +Optional argument PRINTCHARFUN is the output stream, which can be one +of these: + + - a buffer, in which case output is inserted into that buffer at point; + - a marker, in which case output is inserted at marker's position; + - a function, in which case that function is called once for each + character of OBJECT's printed representation; + - a symbol, in which case that symbol's function definition is called; or + - t, in which case the output is displayed in the echo area. + +If PRINTCHARFUN is omitted, the value of `standard-output' (which see) +is used instead. */) + (object, printcharfun) Lisp_Object object, printcharfun; { PRINTDECLARE; @@ -858,7 +748,6 @@ Output stream is PRINTCHARFUN, or value of `standard-output' (which see).") if (NILP (printcharfun)) printcharfun = Vstandard_output; PRINTPREPARE; - print_depth = 0; print (object, printcharfun, 1); PRINTFINISH; return object; @@ -868,48 +757,86 @@ Output stream is PRINTCHARFUN, or value of `standard-output' (which see).") Lisp_Object Vprin1_to_string_buffer; DEFUN ("prin1-to-string", Fprin1_to_string, Sprin1_to_string, 1, 2, 0, - "Return a string containing the printed representation of OBJECT,\n\ -any Lisp object. Quoting characters are used when needed to make output\n\ -that `read' can handle, whenever this is possible, unless the optional\n\ -second argument NOESCAPE is non-nil.") - (object, noescape) + doc: /* Return a string containing the printed representation of OBJECT. +OBJECT can be any Lisp object. This function outputs quoting characters +when necessary to make output that `read' can handle, whenever possible, +unless the optional second argument NOESCAPE is non-nil. For complex objects, +the behavior is controlled by `print-level' and `print-length', which see. + +OBJECT is any of the Lisp data types: a number, a string, a symbol, +a list, a buffer, a window, a frame, etc. + +A printed representation of an object is text which describes that object. */) + (object, noescape) Lisp_Object object, noescape; { - PRINTDECLARE; Lisp_Object printcharfun; - struct gcpro gcpro1, gcpro2; - Lisp_Object tem; + /* struct gcpro gcpro1, gcpro2; */ + Lisp_Object save_deactivate_mark; + int count = specpdl_ptr - specpdl; + struct buffer *previous; - /* Save and restore this--we are altering a buffer - but we don't want to deactivate the mark just for that. - No need for specbind, since errors deactivate the mark. */ - tem = Vdeactivate_mark; - GCPRO2 (object, tem); + specbind (Qinhibit_modification_hooks, Qt); - printcharfun = Vprin1_to_string_buffer; - PRINTPREPARE; - print_depth = 0; - print (object, printcharfun, NILP (noescape)); - /* Make Vprin1_to_string_buffer be the default buffer after PRINTFINSH */ - PRINTFINISH; + { + PRINTDECLARE; + + /* Save and restore this--we are altering a buffer + but we don't want to deactivate the mark just for that. + No need for specbind, since errors deactivate the mark. */ + save_deactivate_mark = Vdeactivate_mark; + /* GCPRO2 (object, save_deactivate_mark); */ + abort_on_gc++; + + printcharfun = Vprin1_to_string_buffer; + PRINTPREPARE; + print (object, printcharfun, NILP (noescape)); + /* Make Vprin1_to_string_buffer be the default buffer after PRINTFINSH */ + PRINTFINISH; + } + + previous = current_buffer; set_buffer_internal (XBUFFER (Vprin1_to_string_buffer)); object = Fbuffer_string (); + if (SBYTES (object) == SCHARS (object)) + STRING_SET_UNIBYTE (object); + /* Note that this won't make prepare_to_modify_buffer call + ask-user-about-supersession-threat because this buffer + does not visit a file. */ Ferase_buffer (); - set_buffer_internal (old); + set_buffer_internal (previous); - Vdeactivate_mark = tem; - UNGCPRO; + Vdeactivate_mark = save_deactivate_mark; + /* UNGCPRO; */ - return object; + abort_on_gc--; + return unbind_to (count, object); } DEFUN ("princ", Fprinc, Sprinc, 1, 2, 0, - "Output the printed representation of OBJECT, any Lisp object.\n\ -No quoting characters are used; no delimiters are printed around\n\ -the contents of strings.\n\ -Output stream is PRINTCHARFUN, or value of standard-output (which see).") - (object, printcharfun) + doc: /* Output the printed representation of OBJECT, any Lisp object. +No quoting characters are used; no delimiters are printed around +the contents of strings. + +OBJECT is any of the Lisp data types: a number, a string, a symbol, +a list, a buffer, a window, a frame, etc. + +A printed representation of an object is text which describes that object. + +Optional argument PRINTCHARFUN is the output stream, which can be one +of these: + + - a buffer, in which case output is inserted into that buffer at point; + - a marker, in which case output is inserted at marker's position; + - a function, in which case that function is called once for each + character of OBJECT's printed representation; + - a symbol, in which case that symbol's function definition is called; or + - t, in which case the output is displayed in the echo area. + +If PRINTCHARFUN is omitted, the value of `standard-output' (which see) +is used instead. */) + (object, printcharfun) Lisp_Object object, printcharfun; { PRINTDECLARE; @@ -917,18 +844,35 @@ Output stream is PRINTCHARFUN, or value of standard-output (which see).") if (NILP (printcharfun)) printcharfun = Vstandard_output; PRINTPREPARE; - print_depth = 0; print (object, printcharfun, 0); PRINTFINISH; return object; } DEFUN ("print", Fprint, Sprint, 1, 2, 0, - "Output the printed representation of OBJECT, with newlines around it.\n\ -Quoting characters are printed when needed to make output that `read'\n\ -can handle, whenever this is possible.\n\ -Output stream is PRINTCHARFUN, or value of `standard-output' (which see).") - (object, printcharfun) + doc: /* Output the printed representation of OBJECT, with newlines around it. +Quoting characters are printed when needed to make output that `read' +can handle, whenever this is possible. For complex objects, the behavior +is controlled by `print-level' and `print-length', which see. + +OBJECT is any of the Lisp data types: a number, a string, a symbol, +a list, a buffer, a window, a frame, etc. + +A printed representation of an object is text which describes that object. + +Optional argument PRINTCHARFUN is the output stream, which can be one +of these: + + - a buffer, in which case output is inserted into that buffer at point; + - a marker, in which case output is inserted at marker's position; + - a function, in which case that function is called once for each + character of OBJECT's printed representation; + - a symbol, in which case that symbol's function definition is called; or + - t, in which case the output is displayed in the echo area. + +If PRINTCHARFUN is omitted, the value of `standard-output' (which see) +is used instead. */) + (object, printcharfun) Lisp_Object object, printcharfun; { PRINTDECLARE; @@ -942,7 +886,6 @@ Output stream is PRINTCHARFUN, or value of `standard-output' (which see).") printcharfun = Vstandard_output; GCPRO1 (object); PRINTPREPARE; - print_depth = 0; PRINTCHAR ('\n'); print (object, printcharfun, 1); PRINTCHAR ('\n'); @@ -960,26 +903,70 @@ Output stream is PRINTCHARFUN, or value of `standard-output' (which see).") Lisp_Object Qexternal_debugging_output; DEFUN ("external-debugging-output", Fexternal_debugging_output, Sexternal_debugging_output, 1, 1, 0, - "Write CHARACTER to stderr.\n\ -You can call print while debugging emacs, and pass it this function\n\ -to make it write to the debugging output.\n") - (character) + doc: /* Write CHARACTER to stderr. +You can call print while debugging emacs, and pass it this function +to make it write to the debugging output. */) + (character) Lisp_Object character; { - CHECK_NUMBER (character, 0); + CHECK_NUMBER (character); putc (XINT (character), stderr); #ifdef WINDOWSNT /* Send the output to a debugger (nothing happens if there isn't one). */ - { - char buf[2] = {(char) XINT (character), '\0'}; - OutputDebugString (buf); - } + if (print_output_debug_flag) + { + char buf[2] = {(char) XINT (character), '\0'}; + OutputDebugString (buf); + } #endif return character; } + +#if defined(GNU_LINUX) + +/* This functionality is not vitally important in general, so we rely on + non-portable ability to use stderr as lvalue. */ + +#define WITH_REDIRECT_DEBUGGING_OUTPUT 1 + +FILE *initial_stderr_stream = NULL; + +DEFUN ("redirect-debugging-output", Fredirect_debugging_output, Sredirect_debugging_output, + 1, 2, + "FDebug output file: \nP", + doc: /* Redirect debugging output (stderr stream) to file FILE. +If FILE is nil, reset target to the initial stderr stream. +Optional arg APPEND non-nil (interactively, with prefix arg) means +append to existing target file. */) + (file, append) + Lisp_Object file, append; +{ + if (initial_stderr_stream != NULL) + fclose(stderr); + stderr = initial_stderr_stream; + initial_stderr_stream = NULL; + + if (STRINGP (file)) + { + file = Fexpand_file_name (file, Qnil); + initial_stderr_stream = stderr; + stderr = fopen(SDATA (file), NILP (append) ? "w" : "a"); + if (stderr == NULL) + { + stderr = initial_stderr_stream; + initial_stderr_stream = NULL; + report_file_error ("Cannot open debugging output stream", + Fcons (file, Qnil)); + } + } + return Qnil; +} +#endif /* GNU_LINUX */ + + /* This is the interface for debugging printing. */ void @@ -989,27 +976,49 @@ debug_print (arg) Fprin1 (arg, Qexternal_debugging_output); fprintf (stderr, "\r\n"); } + +void +safe_debug_print (arg) + Lisp_Object arg; +{ + int valid = valid_lisp_object_p (arg); + + if (valid > 0) + debug_print (arg); + else + fprintf (stderr, "#<%s_LISP_OBJECT 0x%08lx>\r\n", + !valid ? "INVALID" : "SOME", +#ifdef NO_UNION_TYPE + (unsigned long) arg +#else + (unsigned long) arg.i +#endif + ); +} + DEFUN ("error-message-string", Ferror_message_string, Serror_message_string, 1, 1, 0, - "Convert an error value (ERROR-SYMBOL . DATA) to an error message.") - (obj) + doc: /* Convert an error value (ERROR-SYMBOL . DATA) to an error message. +See Info anchor `(elisp)Definition of signal' for some details on how this +error message is constructed. */) + (obj) Lisp_Object obj; { struct buffer *old = current_buffer; - Lisp_Object original, printcharfun, value; + Lisp_Object value; struct gcpro gcpro1; /* If OBJ is (error STRING), just return STRING. That is not only faster, it also avoids the need to allocate space here when the error is due to memory full. */ - if (CONSP (obj) && EQ (XCONS (obj)->car, Qerror) - && CONSP (XCONS (obj)->cdr) - && STRINGP (XCONS (XCONS (obj)->cdr)->car) - && NILP (XCONS (XCONS (obj)->cdr)->cdr)) - return XCONS (XCONS (obj)->cdr)->car; + if (CONSP (obj) && EQ (XCAR (obj), Qerror) + && CONSP (XCDR (obj)) + && STRINGP (XCAR (XCDR (obj))) + && NILP (XCDR (XCDR (obj)))) + return XCAR (XCDR (obj)); - print_error_message (obj, Vprin1_to_string_buffer); + print_error_message (obj, Vprin1_to_string_buffer, 0, Qnil); set_buffer_internal (XBUFFER (Vprin1_to_string_buffer)); value = Fbuffer_string (); @@ -1022,31 +1031,49 @@ DEFUN ("error-message-string", Ferror_message_string, Serror_message_string, return value; } -/* Print an error message for the error DATA - onto Lisp output stream STREAM (suitable for the print functions). */ +/* Print an error message for the error DATA onto Lisp output stream + STREAM (suitable for the print functions). */ void -print_error_message (data, stream) +print_error_message (data, stream, context, caller) Lisp_Object data, stream; + char *context; + Lisp_Object caller; { Lisp_Object errname, errmsg, file_error, tail; struct gcpro gcpro1; int i; + if (context != 0) + write_string_1 (context, -1, stream); + + /* If we know from where the error was signaled, show it in + *Messages*. */ + if (!NILP (caller) && SYMBOLP (caller)) + { + Lisp_Object cname = SYMBOL_NAME (caller); + char *name = alloca (SBYTES (cname)); + bcopy (SDATA (cname), name, SBYTES (cname)); + message_dolog (name, SBYTES (cname), 0, 0); + message_dolog (": ", 2, 0, 0); + } + errname = Fcar (data); if (EQ (errname, Qerror)) { data = Fcdr (data); - if (!CONSP (data)) data = Qnil; + if (!CONSP (data)) + data = Qnil; errmsg = Fcar (data); file_error = Qnil; } else { + Lisp_Object error_conditions; errmsg = Fget (errname, Qerror_message); - file_error = Fmemq (Qfile_error, - Fget (errname, Qerror_conditions)); + error_conditions = Fget (errname, Qerror_conditions); + file_error = Fmemq (Qfile_error, error_conditions); } /* Print an error message including the data items. */ @@ -1057,34 +1084,38 @@ print_error_message (data, stream) /* For file-error, make error message by concatenating all the data items. They are all strings. */ if (!NILP (file_error) && CONSP (tail)) - errmsg = XCONS (tail)->car, tail = XCONS (tail)->cdr; + errmsg = XCAR (tail), tail = XCDR (tail); if (STRINGP (errmsg)) Fprinc (errmsg, stream); else write_string_1 ("peculiar error", -1, stream); - for (i = 0; CONSP (tail); tail = Fcdr (tail), i++) + for (i = 0; CONSP (tail); tail = XCDR (tail), i++) { + Lisp_Object obj; + write_string_1 (i ? ", " : ": ", 2, stream); - if (!NILP (file_error)) - Fprinc (Fcar (tail), stream); + obj = XCAR (tail); + if (!NILP (file_error) || EQ (errname, Qend_of_file)) + Fprinc (obj, stream); else - Fprin1 (Fcar (tail), stream); + Fprin1 (obj, stream); } + UNGCPRO; } - -#ifdef LISP_FLOAT_TYPE + + /* * The buffer should be at least as large as the max string size of the * largest float, printed in the biggest notation. This is undoubtedly * 20d float_output_format, with the negative of the C-constant "HUGE" * from . - * + * * On the vax the worst case is -1e38 in 20d format which takes 61 bytes. - * + * * I assume that IEEE-754 format numbers can take 329 bytes for the worst * case of -1e307 in 20d float_output_format. What is one to do (short of * re-writing _doprnt to be more sane)? @@ -1098,7 +1129,7 @@ float_to_string (buf, data) { unsigned char *cp; int width; - + /* Check for plus infinity in a way that won't lose if there is no plus infinity. */ if (data == data / 2 && data > 1.0) @@ -1115,6 +1146,19 @@ float_to_string (buf, data) /* Check for NaN in a way that won't fail if there are no NaNs. */ if (! (data * 0.0 >= 0.0)) { + /* Prepend "-" if the NaN's sign bit is negative. + The sign bit of a double is the bit that is 1 in -0.0. */ + int i; + union { double d; char c[sizeof (double)]; } u_data, u_minus_zero; + u_data.d = data; + u_minus_zero.d = - 0.0; + for (i = 0; i < sizeof (double); i++) + if (u_data.c[i] & u_minus_zero.c[i]) + { + *buf++ = '-'; + break; + } + strcpy (buf, "0.0e+NaN"); return; } @@ -1144,7 +1188,7 @@ float_to_string (buf, data) /* Check that the spec we have is fully valid. This means not only valid for printf, but meant for floats, and reasonable. */ - cp = XSTRING (Vfloat_output_format)->data; + cp = SDATA (Vfloat_output_format); if (cp[0] != '%') goto lose; @@ -1174,7 +1218,7 @@ float_to_string (buf, data) if (cp[1] != 0) goto lose; - sprintf (buf, XSTRING (Vfloat_output_format)->data, data); + sprintf (buf, SDATA (Vfloat_output_format), data); } /* Make sure there is a decimal point with digit after, or an @@ -1201,7 +1245,7 @@ float_to_string (buf, data) } } } -#endif /* LISP_FLOAT_TYPE */ + static void print (obj, printcharfun, escapeflag) @@ -1209,29 +1253,243 @@ print (obj, printcharfun, escapeflag) register Lisp_Object printcharfun; int escapeflag; { - char buf[30]; + old_backquote_output = 0; - QUIT; + /* Reset print_number_index and Vprint_number_table only when + the variable Vprint_continuous_numbering is nil. Otherwise, + the values of these variables will be kept between several + print functions. */ + if (NILP (Vprint_continuous_numbering)) + { + print_number_index = 0; + Vprint_number_table = Qnil; + } -#if 1 /* I'm not sure this is really worth doing. */ - /* Detect circularities and truncate them. - No need to offer any alternative--this is better than an error. */ - if (CONSP (obj) || VECTORP (obj) || COMPILEDP (obj)) + /* Construct Vprint_number_table for print-gensym and print-circle. */ + if (!NILP (Vprint_gensym) || !NILP (Vprint_circle)) { - int i; - for (i = 0; i < print_depth; i++) - if (EQ (obj, being_printed[i])) + int i, start, index; + start = index = print_number_index; + /* Construct Vprint_number_table. + This increments print_number_index for the objects added. */ + print_depth = 0; + print_preprocess (obj); + + /* Remove unnecessary objects, which appear only once in OBJ; + that is, whose status is Qnil. Compactify the necessary objects. */ + for (i = start; i < print_number_index; i++) + if (!NILP (PRINT_NUMBER_STATUS (Vprint_number_table, i))) { - sprintf (buf, "#%d", i); - strout (buf, -1, -1, printcharfun, 0); - return; + PRINT_NUMBER_OBJECT (Vprint_number_table, index) + = PRINT_NUMBER_OBJECT (Vprint_number_table, i); + index++; } + + /* Clear out objects outside the active part of the table. */ + for (i = index; i < print_number_index; i++) + PRINT_NUMBER_OBJECT (Vprint_number_table, i) = Qnil; + + /* Reset the status field for the next print step. Now this + field means whether the object has already been printed. */ + for (i = start; i < print_number_index; i++) + PRINT_NUMBER_STATUS (Vprint_number_table, i) = Qnil; + + print_number_index = index; + } + + print_depth = 0; + print_object (obj, printcharfun, escapeflag); +} + +/* Construct Vprint_number_table according to the structure of OBJ. + OBJ itself and all its elements will be added to Vprint_number_table + recursively if it is a list, vector, compiled function, char-table, + string (its text properties will be traced), or a symbol that has + no obarray (this is for the print-gensym feature). + The status fields of Vprint_number_table mean whether each object appears + more than once in OBJ: Qnil at the first time, and Qt after that . */ +static void +print_preprocess (obj) + Lisp_Object obj; +{ + int i; + EMACS_INT size; + int loop_count = 0; + Lisp_Object halftail; + + /* Give up if we go so deep that print_object will get an error. */ + /* See similar code in print_object. */ + if (print_depth >= PRINT_CIRCLE) + error ("Apparently circular structure being printed"); + + /* Avoid infinite recursion for circular nested structure + in the case where Vprint_circle is nil. */ + if (NILP (Vprint_circle)) + { + for (i = 0; i < print_depth; i++) + if (EQ (obj, being_printed[i])) + return; + being_printed[print_depth] = obj; + } + + print_depth++; + halftail = obj; + + loop: + if (STRINGP (obj) || CONSP (obj) || VECTORP (obj) + || COMPILEDP (obj) || CHAR_TABLE_P (obj) + || (! NILP (Vprint_gensym) + && SYMBOLP (obj) + && !SYMBOL_INTERNED_P (obj))) + { + /* In case print-circle is nil and print-gensym is t, + add OBJ to Vprint_number_table only when OBJ is a symbol. */ + if (! NILP (Vprint_circle) || SYMBOLP (obj)) + { + for (i = 0; i < print_number_index; i++) + if (EQ (PRINT_NUMBER_OBJECT (Vprint_number_table, i), obj)) + { + /* OBJ appears more than once. Let's remember that. */ + PRINT_NUMBER_STATUS (Vprint_number_table, i) = Qt; + print_depth--; + return; + } + + /* OBJ is not yet recorded. Let's add to the table. */ + if (print_number_index == 0) + { + /* Initialize the table. */ + Vprint_number_table = Fmake_vector (make_number (40), Qnil); + } + else if (XVECTOR (Vprint_number_table)->size == print_number_index * 2) + { + /* Reallocate the table. */ + int i = print_number_index * 4; + Lisp_Object old_table = Vprint_number_table; + Vprint_number_table = Fmake_vector (make_number (i), Qnil); + for (i = 0; i < print_number_index; i++) + { + PRINT_NUMBER_OBJECT (Vprint_number_table, i) + = PRINT_NUMBER_OBJECT (old_table, i); + PRINT_NUMBER_STATUS (Vprint_number_table, i) + = PRINT_NUMBER_STATUS (old_table, i); + } + } + PRINT_NUMBER_OBJECT (Vprint_number_table, print_number_index) = obj; + /* If Vprint_continuous_numbering is non-nil and OBJ is a gensym, + always print the gensym with a number. This is a special for + the lisp function byte-compile-output-docform. */ + if (!NILP (Vprint_continuous_numbering) + && SYMBOLP (obj) + && !SYMBOL_INTERNED_P (obj)) + PRINT_NUMBER_STATUS (Vprint_number_table, print_number_index) = Qt; + print_number_index++; + } + + switch (XGCTYPE (obj)) + { + case Lisp_String: + /* A string may have text properties, which can be circular. */ + traverse_intervals_noorder (STRING_INTERVALS (obj), + print_preprocess_string, Qnil); + break; + + case Lisp_Cons: + /* Use HALFTAIL and LOOP_COUNT to detect circular lists, + just as in print_object. */ + if (loop_count && EQ (obj, halftail)) + break; + print_preprocess (XCAR (obj)); + obj = XCDR (obj); + loop_count++; + if (!(loop_count & 1)) + halftail = XCDR (halftail); + goto loop; + + case Lisp_Vectorlike: + size = XVECTOR (obj)->size; + if (size & PSEUDOVECTOR_FLAG) + size &= PSEUDOVECTOR_SIZE_MASK; + for (i = 0; i < size; i++) + print_preprocess (XVECTOR (obj)->contents[i]); + break; + + default: + break; + } + } + print_depth--; +} + +static void +print_preprocess_string (interval, arg) + INTERVAL interval; + Lisp_Object arg; +{ + print_preprocess (interval->plist); +} + +static void +print_object (obj, printcharfun, escapeflag) + Lisp_Object obj; + register Lisp_Object printcharfun; + int escapeflag; +{ + char buf[40]; + + QUIT; + + /* Detect circularities and truncate them. */ + if (STRINGP (obj) || CONSP (obj) || VECTORP (obj) + || COMPILEDP (obj) || CHAR_TABLE_P (obj) + || (! NILP (Vprint_gensym) + && SYMBOLP (obj) + && !SYMBOL_INTERNED_P (obj))) + { + if (NILP (Vprint_circle) && NILP (Vprint_gensym)) + { + /* Simple but incomplete way. */ + int i; + for (i = 0; i < print_depth; i++) + if (EQ (obj, being_printed[i])) + { + sprintf (buf, "#%d", i); + strout (buf, -1, -1, printcharfun, 0); + return; + } + being_printed[print_depth] = obj; + } + else + { + /* With the print-circle feature. */ + int i; + for (i = 0; i < print_number_index; i++) + if (EQ (PRINT_NUMBER_OBJECT (Vprint_number_table, i), obj)) + { + if (NILP (PRINT_NUMBER_STATUS (Vprint_number_table, i))) + { + /* Add a prefix #n= if OBJ has not yet been printed; + that is, its status field is nil. */ + sprintf (buf, "#%d=", i + 1); + strout (buf, -1, -1, printcharfun, 0); + /* OBJ is going to be printed. Set the status to t. */ + PRINT_NUMBER_STATUS (Vprint_number_table, i) = Qt; + break; + } + else + { + /* Just print #n# if OBJ has already been printed. */ + sprintf (buf, "#%d#", i + 1); + strout (buf, -1, -1, printcharfun, 0); + return; + } + } + } } -#endif - being_printed[print_depth] = obj; print_depth++; + /* See similar code in print_preprocess. */ if (print_depth > PRINT_CIRCLE) error ("Apparently circular structure being printed"); #ifdef MAX_PRINT_CHARS @@ -1248,22 +1506,20 @@ print (obj, printcharfun, escapeflag) if (sizeof (int) == sizeof (EMACS_INT)) sprintf (buf, "%d", XINT (obj)); else if (sizeof (long) == sizeof (EMACS_INT)) - sprintf (buf, "%ld", XINT (obj)); + sprintf (buf, "%ld", (long) XINT (obj)); else abort (); strout (buf, -1, -1, printcharfun, 0); break; -#ifdef LISP_FLOAT_TYPE case Lisp_Float: { char pigbuf[350]; /* see comments in float_to_string */ - float_to_string (pigbuf, XFLOAT(obj)->data); + float_to_string (pigbuf, XFLOAT_DATA (obj)); strout (pigbuf, -1, -1, printcharfun, 0); } break; -#endif case Lisp_String: if (!escapeflag) @@ -1271,27 +1527,25 @@ print (obj, printcharfun, escapeflag) else { register int i, i_byte; - register unsigned char c; struct gcpro gcpro1; unsigned char *str; int size_byte; /* 1 means we must ensure that the next character we output cannot be taken as part of a hex character escape. */ int need_nonhex = 0; + int multibyte = STRING_MULTIBYTE (obj); GCPRO1 (obj); -#ifdef USE_TEXT_PROPERTIES - if (!NULL_INTERVAL_P (XSTRING (obj)->intervals)) + if (!NULL_INTERVAL_P (STRING_INTERVALS (obj))) { PRINTCHAR ('#'); PRINTCHAR ('('); } -#endif PRINTCHAR ('\"'); - str = XSTRING (obj)->data; - size_byte = STRING_BYTES (XSTRING (obj)); + str = SDATA (obj); + size_byte = SBYTES (obj); for (i = 0, i_byte = 0; i_byte < size_byte;) { @@ -1300,10 +1554,10 @@ print (obj, printcharfun, escapeflag) int len; int c; - if (STRING_MULTIBYTE (obj)) + if (multibyte) { - c = STRING_CHAR_AND_CHAR_LENGTH (str + i_byte, - size_byte - i_byte, len); + c = STRING_CHAR_AND_LENGTH (str + i_byte, + size_byte - i_byte, len); if (CHAR_VALID_P (c, 0)) i_byte += len; else @@ -1324,16 +1578,22 @@ print (obj, printcharfun, escapeflag) PRINTCHAR ('\\'); PRINTCHAR ('f'); } - else if (! SINGLE_BYTE_CHAR_P (c) && print_escape_multibyte) + else if (multibyte + && ! ASCII_BYTE_P (c) + && (SINGLE_BYTE_CHAR_P (c) || print_escape_multibyte)) { /* When multibyte is disabled, - print multibyte string chars using hex escapes. */ + print multibyte string chars using hex escapes. + For a char code that could be in a unibyte string, + when found in a multibyte string, always use a hex escape + so it reads back as multibyte. */ unsigned char outbuf[50]; sprintf (outbuf, "\\x%x", c); strout (outbuf, -1, -1, printcharfun, 0); need_nonhex = 1; } - else if (SINGLE_BYTE_CHAR_P (c) && ! ASCII_BYTE_P (c) + else if (! multibyte + && SINGLE_BYTE_CHAR_P (c) && ! ASCII_BYTE_P (c) && print_escape_nonascii) { /* When printing in a multibyte buffer @@ -1365,14 +1625,12 @@ print (obj, printcharfun, escapeflag) } PRINTCHAR ('\"'); -#ifdef USE_TEXT_PROPERTIES - if (!NULL_INTERVAL_P (XSTRING (obj)->intervals)) + if (!NULL_INTERVAL_P (STRING_INTERVALS (obj))) { - traverse_intervals (XSTRING (obj)->intervals, - 0, 0, print_interval, printcharfun); + traverse_intervals (STRING_INTERVALS (obj), + 0, print_interval, printcharfun); PRINTCHAR (')'); } -#endif UNGCPRO; } @@ -1381,13 +1639,13 @@ print (obj, printcharfun, escapeflag) case Lisp_Symbol: { register int confusing; - register unsigned char *p = XSYMBOL (obj)->name->data; - register unsigned char *end = p + STRING_BYTES (XSYMBOL (obj)->name); + register unsigned char *p = SDATA (SYMBOL_NAME (obj)); + register unsigned char *end = p + SBYTES (SYMBOL_NAME (obj)); register int c; int i, i_byte, size_byte; Lisp_Object name; - XSETSTRING (name, XSYMBOL (obj)->name); + name = SYMBOL_NAME (obj); if (p != end && (*p == '-' || *p == '+')) p++; if (p == end) @@ -1411,51 +1669,19 @@ print (obj, printcharfun, escapeflag) else confusing = 0; - /* If we print an uninterned symbol as part of a complex object and - the flag print-gensym is non-nil, prefix it with #n= to read the - object back with the #n# reader syntax later if needed. */ - if (! NILP (Vprint_gensym) && NILP (XSYMBOL (obj)->obarray)) + if (! NILP (Vprint_gensym) && !SYMBOL_INTERNED_P (obj)) { - if (print_depth > 1) - { - Lisp_Object tem; - tem = Fassq (obj, Vprint_gensym_alist); - if (CONSP (tem)) - { - PRINTCHAR ('#'); - print (XCDR (tem), printcharfun, escapeflag); - PRINTCHAR ('#'); - break; - } - else - { - if (CONSP (Vprint_gensym_alist)) - XSETFASTINT (tem, XFASTINT (XCDR (XCAR (Vprint_gensym_alist))) + 1); - else - XSETFASTINT (tem, 1); - Vprint_gensym_alist = Fcons (Fcons (obj, tem), Vprint_gensym_alist); - - PRINTCHAR ('#'); - print (tem, printcharfun, escapeflag); - PRINTCHAR ('='); - } - } PRINTCHAR ('#'); PRINTCHAR (':'); } - size_byte = STRING_BYTES (XSTRING (name)); + size_byte = SBYTES (name); for (i = 0, i_byte = 0; i_byte < size_byte;) { /* Here, we must convert each multi-byte form to the corresponding character code before handing it to PRINTCHAR. */ - - if (STRING_MULTIBYTE (name)) - FETCH_STRING_CHAR_ADVANCE (c, name, i, i_byte); - else - c = XSTRING (name)->data[i_byte++]; - + FETCH_STRING_CHAR_ADVANCE (c, name, i, i_byte); QUIT; if (escapeflag) @@ -1481,62 +1707,126 @@ print (obj, printcharfun, escapeflag) && (EQ (XCAR (obj), Qquote))) { PRINTCHAR ('\''); - print (XCAR (XCDR (obj)), printcharfun, escapeflag); + print_object (XCAR (XCDR (obj)), printcharfun, escapeflag); } else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj))) && (EQ (XCAR (obj), Qfunction))) { PRINTCHAR ('#'); PRINTCHAR ('\''); - print (XCAR (XCDR (obj)), printcharfun, escapeflag); + print_object (XCAR (XCDR (obj)), printcharfun, escapeflag); } else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj))) + && ! old_backquote_output && ((EQ (XCAR (obj), Qbackquote) || EQ (XCAR (obj), Qcomma) || EQ (XCAR (obj), Qcomma_at) || EQ (XCAR (obj), Qcomma_dot)))) { - print (XCAR (obj), printcharfun, 0); - print (XCAR (XCDR (obj)), printcharfun, escapeflag); + print_object (XCAR (obj), printcharfun, 0); + print_object (XCAR (XCDR (obj)), printcharfun, escapeflag); } else { PRINTCHAR ('('); + + /* If the first element is a backquote form, + print it old-style so it won't be misunderstood. */ + if (print_quoted && CONSP (XCAR (obj)) + && CONSP (XCDR (XCAR (obj))) + && NILP (XCDR (XCDR (XCAR (obj)))) + && EQ (XCAR (XCAR (obj)), Qbackquote)) + { + Lisp_Object tem; + tem = XCAR (obj); + PRINTCHAR ('('); + + print_object (Qbackquote, printcharfun, 0); + PRINTCHAR (' '); + + ++old_backquote_output; + print_object (XCAR (XCDR (tem)), printcharfun, 0); + --old_backquote_output; + PRINTCHAR (')'); + + obj = XCDR (obj); + } + { - register int i = 0; - register int print_length = 0; + int print_length, i; Lisp_Object halftail = obj; - if (INTEGERP (Vprint_length)) - print_length = XINT (Vprint_length); + /* Negative values of print-length are invalid in CL. + Treat them like nil, as CMUCL does. */ + if (NATNUMP (Vprint_length)) + print_length = XFASTINT (Vprint_length); + else + print_length = 0; + + i = 0; while (CONSP (obj)) { /* Detect circular list. */ - if (i != 0 && EQ (obj, halftail)) + if (NILP (Vprint_circle)) { - sprintf (buf, " . #%d", i / 2); - strout (buf, -1, -1, printcharfun, 0); - obj = Qnil; - break; + /* Simple but imcomplete way. */ + if (i != 0 && EQ (obj, halftail)) + { + sprintf (buf, " . #%d", i / 2); + strout (buf, -1, -1, printcharfun, 0); + goto end_of_list; + } + } + else + { + /* With the print-circle feature. */ + if (i != 0) + { + int i; + for (i = 0; i < print_number_index; i++) + if (EQ (PRINT_NUMBER_OBJECT (Vprint_number_table, i), + obj)) + { + if (NILP (PRINT_NUMBER_STATUS (Vprint_number_table, i))) + { + strout (" . ", 3, 3, printcharfun, 0); + print_object (obj, printcharfun, escapeflag); + } + else + { + sprintf (buf, " . #%d#", i + 1); + strout (buf, -1, -1, printcharfun, 0); + } + goto end_of_list; + } + } } + if (i++) PRINTCHAR (' '); + if (print_length && i > print_length) { strout ("...", 3, 3, printcharfun, 0); - break; + goto end_of_list; } - print (XCAR (obj), printcharfun, escapeflag); + + print_object (XCAR (obj), printcharfun, escapeflag); + obj = XCDR (obj); if (!(i & 1)) halftail = XCDR (halftail); } } + + /* OBJ non-nil here means it's the end of a dotted list. */ if (!NILP (obj)) { strout (" . ", 3, 3, printcharfun, 0); - print (obj, printcharfun, escapeflag); + print_object (obj, printcharfun, escapeflag); } + + end_of_list: PRINTCHAR (')'); } break; @@ -1559,20 +1849,23 @@ print (obj, printcharfun, escapeflag) register unsigned char c; struct gcpro gcpro1; int size_in_chars - = (XBOOL_VECTOR (obj)->size + BITS_PER_CHAR - 1) / BITS_PER_CHAR; + = ((XBOOL_VECTOR (obj)->size + BOOL_VECTOR_BITS_PER_CHAR - 1) + / BOOL_VECTOR_BITS_PER_CHAR); GCPRO1 (obj); PRINTCHAR ('#'); PRINTCHAR ('&'); - sprintf (buf, "%d", XBOOL_VECTOR (obj)->size); + sprintf (buf, "%ld", (long) XBOOL_VECTOR (obj)->size); strout (buf, -1, -1, printcharfun, 0); PRINTCHAR ('\"'); - /* Don't print more characters than the specified maximum. */ - if (INTEGERP (Vprint_length) - && XINT (Vprint_length) < size_in_chars) - size_in_chars = XINT (Vprint_length); + /* Don't print more characters than the specified maximum. + Negative values of print-length are invalid. Treat them + like a print-length of nil. */ + if (NATNUMP (Vprint_length) + && XFASTINT (Vprint_length) < size_in_chars) + size_in_chars = XFASTINT (Vprint_length); for (i = 0; i < size_in_chars; i++) { @@ -1588,6 +1881,14 @@ print (obj, printcharfun, escapeflag) PRINTCHAR ('\\'); PRINTCHAR ('f'); } + else if (c > '\177') + { + /* Use octal escapes to avoid encoding issues. */ + PRINTCHAR ('\\'); + PRINTCHAR ('0' + ((c >> 6) & 3)); + PRINTCHAR ('0' + ((c >> 3) & 7)); + PRINTCHAR ('0' + (c & 7)); + } else { if (c == '\"' || c == '\\') @@ -1605,11 +1906,10 @@ print (obj, printcharfun, escapeflag) strout (XSUBR (obj)->symbol_name, -1, -1, printcharfun, 0); PRINTCHAR ('>'); } -#ifndef standalone else if (WINDOWP (obj)) { strout ("#sequence_number)); + sprintf (buf, "%ld", (long) XFASTINT (XWINDOW (obj)->sequence_number)); strout (buf, -1, -1, printcharfun, 0); if (!NILP (XWINDOW (obj)->buffer)) { @@ -1626,12 +1926,12 @@ print (obj, printcharfun, escapeflag) { PRINTCHAR (' '); PRINTCHAR ('\''); - strout (XSYMBOL (h->test)->name->data, -1, -1, printcharfun, 0); + strout (SDATA (SYMBOL_NAME (h->test)), -1, -1, printcharfun, 0); PRINTCHAR (' '); - strout (XSYMBOL (h->weak)->name->data, -1, -1, printcharfun, 0); + strout (SDATA (SYMBOL_NAME (h->weak)), -1, -1, printcharfun, 0); PRINTCHAR (' '); - sprintf (buf, "%d/%d", XFASTINT (h->count), - XVECTOR (h->next)->size); + sprintf (buf, "%ld/%ld", (long) XFASTINT (h->count), + (long) XVECTOR (h->next)->size); strout (buf, -1, -1, printcharfun, 0); } sprintf (buf, " 0x%lx", (unsigned long) h); @@ -1661,14 +1961,13 @@ print (obj, printcharfun, escapeflag) ? "#name, printcharfun); - sprintf (buf, " 0x%lx\\ ", (unsigned long) (XFRAME (obj))); + sprintf (buf, " 0x%lx", (unsigned long) (XFRAME (obj))); strout (buf, -1, -1, printcharfun, 0); PRINTCHAR ('>'); } -#endif /* not standalone */ else { - int size = XVECTOR (obj)->size; + EMACS_INT size = XVECTOR (obj)->size; if (COMPILEDP (obj)) { PRINTCHAR ('#'); @@ -1692,24 +1991,26 @@ print (obj, printcharfun, escapeflag) { register int i; register Lisp_Object tem; + int real_size = size; /* Don't print more elements than the specified maximum. */ - if (INTEGERP (Vprint_length) - && XINT (Vprint_length) < size) - size = XINT (Vprint_length); + if (NATNUMP (Vprint_length) + && XFASTINT (Vprint_length) < size) + size = XFASTINT (Vprint_length); for (i = 0; i < size; i++) { if (i) PRINTCHAR (' '); tem = XVECTOR (obj)->contents[i]; - print (tem, printcharfun, escapeflag); + print_object (tem, printcharfun, escapeflag); } + if (size < real_size) + strout (" ...", 4, 4, printcharfun, 0); } PRINTCHAR (']'); } break; -#ifndef standalone case Lisp_Misc: switch (XMISCTYPE (obj)) { @@ -1717,7 +2018,7 @@ print (obj, printcharfun, escapeflag) strout ("#insertion_type != 0) - strout ("(before-insertion) ", -1, -1, printcharfun, 0); + strout ("(moves after insertion) ", -1, -1, printcharfun, 0); if (!(XMARKER (obj)->buffer)) strout ("in no buffer", -1, -1, printcharfun, 0); else @@ -1753,7 +2054,7 @@ print (obj, printcharfun, escapeflag) break; case Lisp_Misc_Intfwd: - sprintf (buf, "#", *XINTFWD (obj)->intvar); + sprintf (buf, "#", (long) *XINTFWD (obj)->intvar); strout (buf, -1, -1, printcharfun, 0); break; @@ -1765,23 +2066,23 @@ print (obj, printcharfun, escapeflag) case Lisp_Misc_Objfwd: strout ("#objvar, printcharfun, escapeflag); + print_object (*XOBJFWD (obj)->objvar, printcharfun, escapeflag); PRINTCHAR ('>'); break; case Lisp_Misc_Buffer_Objfwd: strout ("#offset), - printcharfun, escapeflag); + print_object (PER_BUFFER_VALUE (current_buffer, + XBUFFER_OBJFWD (obj)->offset), + printcharfun, escapeflag); PRINTCHAR ('>'); break; case Lisp_Misc_Kboard_Objfwd: strout ("#offset), - printcharfun, escapeflag); + print_object (*(Lisp_Object *)((char *) current_kboard + + XKBOARD_OBJFWD (obj)->offset), + printcharfun, escapeflag); PRINTCHAR ('>'); break; @@ -1792,28 +2093,38 @@ print (obj, printcharfun, escapeflag) strout ("#realvalue, printcharfun, escapeflag); + print_object (XBUFFER_LOCAL_VALUE (obj)->realvalue, + printcharfun, escapeflag); if (XBUFFER_LOCAL_VALUE (obj)->found_for_buffer) strout ("[local in buffer] ", -1, -1, printcharfun, 0); else strout ("[buffer] ", -1, -1, printcharfun, 0); - print (XBUFFER_LOCAL_VALUE (obj)->buffer, - printcharfun, escapeflag); + print_object (XBUFFER_LOCAL_VALUE (obj)->buffer, + printcharfun, escapeflag); if (XBUFFER_LOCAL_VALUE (obj)->check_frame) { if (XBUFFER_LOCAL_VALUE (obj)->found_for_frame) strout ("[local in frame] ", -1, -1, printcharfun, 0); else strout ("[frame] ", -1, -1, printcharfun, 0); - print (XBUFFER_LOCAL_VALUE (obj)->frame, - printcharfun, escapeflag); + print_object (XBUFFER_LOCAL_VALUE (obj)->frame, + printcharfun, escapeflag); } strout ("[alist-elt] ", -1, -1, printcharfun, 0); - print (XCONS (XBUFFER_LOCAL_VALUE (obj)->cdr)->car, - printcharfun, escapeflag); + print_object (XCAR (XBUFFER_LOCAL_VALUE (obj)->cdr), + printcharfun, escapeflag); strout ("[default-value] ", -1, -1, printcharfun, 0); - print (XCONS (XBUFFER_LOCAL_VALUE (obj)->cdr)->cdr, - printcharfun, escapeflag); + print_object (XCDR (XBUFFER_LOCAL_VALUE (obj)->cdr), + printcharfun, escapeflag); + PRINTCHAR ('>'); + break; + + case Lisp_Misc_Save_Value: + strout ("#pointer, + XSAVE_VALUE (obj)->integer); + strout (buf, -1, -1, printcharfun, 0); PRINTCHAR ('>'); break; @@ -1821,7 +2132,6 @@ print (obj, printcharfun, escapeflag) goto badtype; } break; -#endif /* standalone */ default: badtype: @@ -1844,7 +2154,6 @@ print (obj, printcharfun, escapeflag) print_depth--; } -#ifdef USE_TEXT_PROPERTIES /* Print a description of INTERVAL using PRINTCHARFUN. This is part of printing a string that has text properties. */ @@ -1855,15 +2164,14 @@ print_interval (interval, printcharfun) Lisp_Object printcharfun; { PRINTCHAR (' '); - print (make_number (interval->position), printcharfun, 1); + print_object (make_number (interval->position), printcharfun, 1); PRINTCHAR (' '); - print (make_number (interval->position + LENGTH (interval)), + print_object (make_number (interval->position + LENGTH (interval)), printcharfun, 1); PRINTCHAR (' '); - print (interval->plist, printcharfun, 1); + print_object (interval->plist, printcharfun, 1); } -#endif /* USE_TEXT_PROPERTIES */ void syms_of_print () @@ -1872,88 +2180,110 @@ syms_of_print () staticpro (&Qtemp_buffer_setup_hook); DEFVAR_LISP ("standard-output", &Vstandard_output, - "Output stream `print' uses by default for outputting a character.\n\ -This may be any function of one argument.\n\ -It may also be a buffer (output is inserted before point)\n\ -or a marker (output is inserted and the marker is advanced)\n\ -or the symbol t (output appears in the echo area)."); + doc: /* Output stream `print' uses by default for outputting a character. +This may be any function of one argument. +It may also be a buffer (output is inserted before point) +or a marker (output is inserted and the marker is advanced) +or the symbol t (output appears in the echo area). */); Vstandard_output = Qt; Qstandard_output = intern ("standard-output"); staticpro (&Qstandard_output); -#ifdef LISP_FLOAT_TYPE DEFVAR_LISP ("float-output-format", &Vfloat_output_format, - "The format descriptor string used to print floats.\n\ -This is a %-spec like those accepted by `printf' in C,\n\ -but with some restrictions. It must start with the two characters `%.'.\n\ -After that comes an integer precision specification,\n\ -and then a letter which controls the format.\n\ -The letters allowed are `e', `f' and `g'.\n\ -Use `e' for exponential notation \"DIG.DIGITSeEXPT\"\n\ -Use `f' for decimal point notation \"DIGITS.DIGITS\".\n\ -Use `g' to choose the shorter of those two formats for the number at hand.\n\ -The precision in any of these cases is the number of digits following\n\ -the decimal point. With `f', a precision of 0 means to omit the\n\ -decimal point. 0 is not allowed with `e' or `g'.\n\n\ -A value of nil means to use the shortest notation\n\ -that represents the number without losing information."); + doc: /* The format descriptor string used to print floats. +This is a %-spec like those accepted by `printf' in C, +but with some restrictions. It must start with the two characters `%.'. +After that comes an integer precision specification, +and then a letter which controls the format. +The letters allowed are `e', `f' and `g'. +Use `e' for exponential notation \"DIG.DIGITSeEXPT\" +Use `f' for decimal point notation \"DIGITS.DIGITS\". +Use `g' to choose the shorter of those two formats for the number at hand. +The precision in any of these cases is the number of digits following +the decimal point. With `f', a precision of 0 means to omit the +decimal point. 0 is not allowed with `e' or `g'. + +A value of nil means to use the shortest notation +that represents the number without losing information. */); Vfloat_output_format = Qnil; Qfloat_output_format = intern ("float-output-format"); staticpro (&Qfloat_output_format); -#endif /* LISP_FLOAT_TYPE */ DEFVAR_LISP ("print-length", &Vprint_length, - "Maximum length of list to print before abbreviating.\n\ -A value of nil means no limit."); + doc: /* Maximum length of list to print before abbreviating. +A value of nil means no limit. See also `eval-expression-print-length'. */); Vprint_length = Qnil; DEFVAR_LISP ("print-level", &Vprint_level, - "Maximum depth of list nesting to print before abbreviating.\n\ -A value of nil means no limit."); + doc: /* Maximum depth of list nesting to print before abbreviating. +A value of nil means no limit. See also `eval-expression-print-level'. */); Vprint_level = Qnil; DEFVAR_BOOL ("print-escape-newlines", &print_escape_newlines, - "Non-nil means print newlines in strings as backslash-n.\n\ -Also print formfeeds as backslash-f."); + doc: /* Non-nil means print newlines in strings as `\\n'. +Also print formfeeds as `\\f'. */); print_escape_newlines = 0; DEFVAR_BOOL ("print-escape-nonascii", &print_escape_nonascii, - "Non-nil means print unibyte non-ASCII chars in strings as \\OOO.\n\ -\(OOO is the octal representation of the character code.)\n\ -Only single-byte characters are affected, and only in `prin1'."); + doc: /* Non-nil means print unibyte non-ASCII chars in strings as \\OOO. +\(OOO is the octal representation of the character code.) +Only single-byte characters are affected, and only in `prin1'. +When the output goes in a multibyte buffer, this feature is +enabled regardless of the value of the variable. */); print_escape_nonascii = 0; DEFVAR_BOOL ("print-escape-multibyte", &print_escape_multibyte, - "Non-nil means print multibyte characters in strings as \\xXXXX.\n\ -\(XXX is the hex representation of the character code.)\n\ -This affects only `prin1'."); + doc: /* Non-nil means print multibyte characters in strings as \\xXXXX. +\(XXXX is the hex representation of the character code.) +This affects only `prin1'. */); print_escape_multibyte = 0; DEFVAR_BOOL ("print-quoted", &print_quoted, - "Non-nil means print quoted forms with reader syntax.\n\ -I.e., (quote foo) prints as 'foo, (function foo) as #'foo, and, backquoted\n\ -forms print in the new syntax."); + doc: /* Non-nil means print quoted forms with reader syntax. +I.e., (quote foo) prints as 'foo, (function foo) as #'foo, and backquoted +forms print as in the new syntax. */); print_quoted = 0; DEFVAR_LISP ("print-gensym", &Vprint_gensym, - "Non-nil means print uninterned symbols so they will read as uninterned.\n\ -I.e., the value of (make-symbol \"foobar\") prints as #:foobar.\n\ -When the uninterned symbol appears within a larger data structure,\n\ -in addition use the #...# and #...= constructs as needed,\n\ -so that multiple references to the same symbol are shared once again\n\ -when the text is read back.\n\ -\n\ -If the value of `print-gensym' is a cons cell, then in addition refrain from\n\ -clearing `print-gensym-alist' on entry to and exit from printing functions,\n\ -so that the use of #...# and #...= can carry over for several separately\n\ -printed objects."); + doc: /* Non-nil means print uninterned symbols so they will read as uninterned. +I.e., the value of (make-symbol \"foobar\") prints as #:foobar. +When the uninterned symbol appears within a recursive data structure, +and the symbol appears more than once, in addition use the #N# and #N= +constructs as needed, so that multiple references to the same symbol are +shared once again when the text is read back. */); Vprint_gensym = Qnil; - DEFVAR_LISP ("print-gensym-alist", &Vprint_gensym_alist, - "Association list of elements (GENSYM . N) to guide use of #N# and #N=.\n\ -In each element, GENSYM is an uninterned symbol that has been associated\n\ -with #N= for the specified value of N."); - Vprint_gensym_alist = Qnil; + DEFVAR_LISP ("print-circle", &Vprint_circle, + doc: /* *Non-nil means print recursive structures using #N= and #N# syntax. +If nil, printing proceeds recursively and may lead to +`max-lisp-eval-depth' being exceeded or an error may occur: +\"Apparently circular structure being printed.\" Also see +`print-length' and `print-level'. +If non-nil, shared substructures anywhere in the structure are printed +with `#N=' before the first occurrence (in the order of the print +representation) and `#N#' in place of each subsequent occurrence, +where N is a positive decimal integer. */); + Vprint_circle = Qnil; + + DEFVAR_LISP ("print-continuous-numbering", &Vprint_continuous_numbering, + doc: /* *Non-nil means number continuously across print calls. +This affects the numbers printed for #N= labels and #M# references. +See also `print-circle', `print-gensym', and `print-number-table'. +This variable should not be set with `setq'; bind it with a `let' instead. */); + Vprint_continuous_numbering = Qnil; + + DEFVAR_LISP ("print-number-table", &Vprint_number_table, + doc: /* A vector used internally to produce `#N=' labels and `#N#' references. +The Lisp printer uses this vector to detect Lisp objects referenced more +than once. + +When you bind `print-continuous-numbering' to t, you should probably +also bind `print-number-table' to nil. This ensures that the value of +`print-number-table' can be garbage-collected once the printing is +done. If all elements of `print-number-table' are nil, it means that +the printing done so far has not found any shared structure or objects +that need to be recorded in the table. */); + Vprint_number_table = Qnil; /* prin1_to_string_buffer initialized in init_buffer_once in buffer.c */ staticpro (&Vprin1_to_string_buffer); @@ -1966,6 +2296,9 @@ with #N= for the specified value of N."); defsubr (&Sterpri); defsubr (&Swrite_char); defsubr (&Sexternal_debugging_output); +#ifdef WITH_REDIRECT_DEBUGGING_OUTPUT + defsubr (&Sredirect_debugging_output); +#endif Qexternal_debugging_output = intern ("external-debugging-output"); staticpro (&Qexternal_debugging_output); @@ -1979,7 +2312,8 @@ with #N= for the specified value of N."); Qprint_escape_nonascii = intern ("print-escape-nonascii"); staticpro (&Qprint_escape_nonascii); -#ifndef standalone defsubr (&Swith_output_to_temp_buffer); -#endif /* not standalone */ } + +/* arch-tag: bc797170-94ae-41de-86e3-75e20f8f7a39 + (do not change this comment) */