X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/a8fda945006c87d82f6a1acdaf259eb43f7f375f..ac14fd4de828924609e85c2cf8ee49a74d43a096:/src/print.c diff --git a/src/print.c b/src/print.c index 1a68eaa994..c81f99f643 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, 98, 1999, 2000, 2001 - 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,8 +17,8 @@ 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 @@ -91,6 +92,9 @@ Lisp_Object Vfloat_output_format, Qfloat_output_format; /* 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]; @@ -178,6 +182,9 @@ static int max_print; void print_interval (); +/* GDB resets this to zero on W32 to disable OutputDebugString calls. */ +int print_output_debug_flag = 1; + /* Low level output routines for characters and strings */ @@ -186,7 +193,7 @@ void print_interval (); 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. */ + or call strout to output a block of characters. */ #define PRINTDECLARE \ struct buffer *old = current_buffer; \ @@ -208,13 +215,17 @@ void print_interval (); } \ if (MARKERP (printcharfun)) \ { \ - if (!(XMARKER (original)->buffer)) \ + EMACS_INT marker_pos; \ + if (! XMARKER (printcharfun)->buffer) \ error ("Marker does not point anywhere"); \ - if (XMARKER (original)->buffer != current_buffer) \ - set_buffer_internal (XMARKER (original)->buffer); \ + 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_position (printcharfun), \ + SET_PT_BOTH (marker_pos, \ marker_byte_position (printcharfun)); \ start_point = PT; \ start_point_byte = PT_BYTE; \ @@ -264,6 +275,7 @@ void print_interval (); 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) \ { \ @@ -277,7 +289,7 @@ void print_interval (); SET_PT_BOTH (old_point + (old_point >= start_point \ ? PT - start_point : 0), \ old_point_byte + (old_point_byte >= start_point_byte \ - ? PT_BYTE - start_point_byte : 0)); \ + ? PT_BYTE - start_point_byte : 0)); \ if (old != current_buffer) \ set_buffer_internal (old); @@ -290,7 +302,7 @@ 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; } @@ -318,7 +330,7 @@ printchar (ch, fun) int len = CHAR_STRING (ch, str); QUIT; - + if (NILP (fun)) { if (print_buffer_pos_byte + len >= print_buffer_size) @@ -337,7 +349,7 @@ printchar (ch, fun) { int multibyte_p = !NILP (current_buffer->enable_multibyte_characters); - + setup_echo_area_for_printing (multibyte_p); insert_char (ch); message_dolog (str, len, 0, multibyte_p); @@ -352,7 +364,10 @@ printchar (ch, fun) 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. */ + non-zero means PTR contains multibyte characters. + + In the case where PRINTCHARFUN is nil, it is safe for PTR to point + to data in a Lisp string. Otherwise that is not safe. */ static void strout (ptr, size, size_byte, printcharfun, multibyte) @@ -394,14 +409,14 @@ strout (ptr, size, size_byte, printcharfun, multibyte) int i; int multibyte_p = !NILP (current_buffer->enable_multibyte_characters); - + setup_echo_area_for_printing (multibyte_p); message_dolog (ptr, size_byte, 0, multibyte_p); - + if (size == size_byte) { for (i = 0; i < size; ++i) - insert_char ((unsigned char )*ptr++); + insert_char ((unsigned char) *ptr++); } else { @@ -412,7 +427,7 @@ strout (ptr, size, size_byte, printcharfun, multibyte) insert_char (ch); } } - + #ifdef MAX_PRINT_CHARS if (max_print) print_chars += size; @@ -461,7 +476,7 @@ 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)) @@ -472,47 +487,66 @@ print_string (string, printcharfun) Lisp_Object newstr; int bytes; - chars = STRING_BYTES (XSTRING (string)); - bytes = parse_str_to_multibyte (XSTRING (string)->data, chars); + chars = SBYTES (string); + bytes = parse_str_to_multibyte (SDATA (string), chars); if (chars < bytes) { newstr = make_uninit_multibyte_string (chars, bytes); - bcopy (XSTRING (string)->data, XSTRING (newstr)->data, chars); - str_to_multibyte (XSTRING (newstr)->data, bytes, chars); + bcopy (SDATA (string), SDATA (newstr), chars); + str_to_multibyte (SDATA (newstr), bytes, chars); string = newstr; } } else - chars = STRING_BYTES (XSTRING (string)); + chars = SBYTES (string); + + if (EQ (printcharfun, Qt)) + { + /* Output to echo area. */ + int nbytes = SBYTES (string); + char *buffer; + + /* Copy the string contents so that relocation of STRING by + GC does not cause trouble. */ + USE_SAFE_ALLOCA; - /* strout is safe for output to a frame (echo area) or to print_buffer. */ - strout (XSTRING (string)->data, - chars, STRING_BYTES (XSTRING (string)), - printcharfun, STRING_MULTIBYTE (string)); + SAFE_ALLOCA (buffer, char *, nbytes); + bcopy (SDATA (string), buffer, nbytes); + + strout (buffer, chars, SBYTES (string), + printcharfun, STRING_MULTIBYTE (string)); + + SAFE_FREE (); + } + else + /* No need to copy, since output to print_buffer can't GC. */ + strout (SDATA (string), + chars, SBYTES (string), + printcharfun, STRING_MULTIBYTE (string)); } else { /* 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_LENGTH (XSTRING (string)->data + i, + 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); @@ -578,7 +612,7 @@ write_string_1 (data, size, printcharfun) void temp_output_buffer_setup (bufname) - char *bufname; + const char *bufname; { int count = SPECPDL_INDEX (); register struct buffer *old = current_buffer; @@ -589,14 +623,17 @@ 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); @@ -609,7 +646,7 @@ 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; { @@ -650,9 +687,9 @@ 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. +buffer and calling the hook. It gets one argument, the buffer to display. -usage: (with-output-to-temp-buffer BUFFNAME BODY ...) */) +usage: (with-output-to-temp-buffer BUFNAME BODY ...) */) (args) Lisp_Object args; { @@ -664,7 +701,7 @@ usage: (with-output-to-temp-buffer BUFFNAME BODY ...) */) GCPRO1(args); name = Feval (Fcar (args)); CHECK_STRING (name); - temp_output_buffer_setup (XSTRING (name)->data); + temp_output_buffer_setup (SDATA (name)); buf = Vstandard_output; UNGCPRO; @@ -745,7 +782,8 @@ DEFUN ("prin1-to-string", Fprin1_to_string, Sprin1_to_string, 1, 2, 0, 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. +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. @@ -754,32 +792,48 @@ 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 (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, @@ -882,15 +936,68 @@ to make it write to the debugging output. */) #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; } +/* This function is never called. Its purpose is to prevent + print_output_debug_flag from being optimized away. */ + +void +debug_output_compilation_hack (x) + int x; +{ + print_output_debug_flag = x; +} + +#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 @@ -900,10 +1007,32 @@ 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, - doc: /* Convert an error value (ERROR-SYMBOL . DATA) to an error message. */) + 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; { @@ -920,7 +1049,7 @@ DEFUN ("error-message-string", Ferror_message_string, Serror_message_string, && 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 (); @@ -934,16 +1063,34 @@ DEFUN ("error-message-string", Ferror_message_string, Serror_message_string, } /* Print an error message for the error DATA onto Lisp output stream - STREAM (suitable for the print functions). */ + STREAM (suitable for the print functions). + CONTEXT is a C string describing the context of the error. + CALLER is the Lisp function inside which the error was signaled. */ 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)) @@ -988,7 +1135,7 @@ print_error_message (data, stream) else Fprin1 (obj, stream); } - + UNGCPRO; } @@ -999,9 +1146,9 @@ print_error_message (data, stream) * 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)? @@ -1015,7 +1162,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) @@ -1044,7 +1191,7 @@ float_to_string (buf, data) *buf++ = '-'; break; } - + strcpy (buf, "0.0e+NaN"); return; } @@ -1074,7 +1221,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; @@ -1104,7 +1251,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 @@ -1139,7 +1286,7 @@ print (obj, printcharfun, escapeflag) register Lisp_Object printcharfun; int escapeflag; { - print_depth = 0; + old_backquote_output = 0; /* Reset print_number_index and Vprint_number_table only when the variable Vprint_continuous_numbering is nil. Otherwise, @@ -1155,24 +1302,35 @@ print (obj, printcharfun, escapeflag) if (!NILP (Vprint_gensym) || !NILP (Vprint_circle)) { int i, start, index; - /* Construct Vprint_number_table. */ 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. */ + 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))) { PRINT_NUMBER_OBJECT (Vprint_number_table, index) = PRINT_NUMBER_OBJECT (Vprint_number_table, i); - /* Reset the status field for the next print step. Now this - field means whether the object has already been printed. */ - PRINT_NUMBER_STATUS (Vprint_number_table, index) = Qnil; 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); } @@ -1187,7 +1345,28 @@ static void print_preprocess (obj) Lisp_Object obj; { - int i, size; + 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) @@ -1205,7 +1384,8 @@ print_preprocess (obj) { /* OBJ appears more than once. Let's remember that. */ PRINT_NUMBER_STATUS (Vprint_number_table, i) = Qt; - return; + print_depth--; + return; } /* OBJ is not yet recorded. Let's add to the table. */ @@ -1243,17 +1423,26 @@ print_preprocess (obj) { case Lisp_String: /* A string may have text properties, which can be circular. */ - traverse_intervals_noorder (XSTRING (obj)->intervals, + 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 & PSEUDOVECTOR_SIZE_MASK; + 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; @@ -1262,6 +1451,7 @@ print_preprocess (obj) break; } } + print_depth--; } static void @@ -1278,7 +1468,7 @@ print_object (obj, printcharfun, escapeflag) register Lisp_Object printcharfun; int escapeflag; { - char buf[30]; + char buf[40]; QUIT; @@ -1332,6 +1522,7 @@ print_object (obj, printcharfun, escapeflag) print_depth++; + /* See similar code in print_preprocess. */ if (print_depth > PRINT_CIRCLE) error ("Apparently circular structure being printed"); #ifdef MAX_PRINT_CHARS @@ -1379,15 +1570,15 @@ print_object (obj, printcharfun, escapeflag) GCPRO1 (obj); - if (!NULL_INTERVAL_P (XSTRING (obj)->intervals)) + if (!NULL_INTERVAL_P (STRING_INTERVALS (obj))) { PRINTCHAR ('#'); PRINTCHAR ('('); } 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;) { @@ -1467,9 +1658,9 @@ print_object (obj, printcharfun, escapeflag) } PRINTCHAR ('\"'); - if (!NULL_INTERVAL_P (XSTRING (obj)->intervals)) + if (!NULL_INTERVAL_P (STRING_INTERVALS (obj))) { - traverse_intervals (XSTRING (obj)->intervals, + traverse_intervals (STRING_INTERVALS (obj), 0, print_interval, printcharfun); PRINTCHAR (')'); } @@ -1481,8 +1672,8 @@ print_object (obj, printcharfun, escapeflag) case Lisp_Symbol: { register int confusing; - register unsigned char *p = XSTRING (SYMBOL_NAME (obj))->data; - register unsigned char *end = p + STRING_BYTES (XSTRING (SYMBOL_NAME (obj))); + 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; @@ -1517,7 +1708,7 @@ print_object (obj, printcharfun, escapeflag) PRINTCHAR (':'); } - size_byte = STRING_BYTES (XSTRING (name)); + size_byte = SBYTES (name); for (i = 0, i_byte = 0; i_byte < size_byte;) { @@ -1559,6 +1750,7 @@ print_object (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) @@ -1570,6 +1762,29 @@ print_object (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); + } + { int print_length, i; Lisp_Object halftail = obj; @@ -1619,18 +1834,18 @@ print_object (obj, printcharfun, escapeflag) } } } - + if (i++) PRINTCHAR (' '); - + if (print_length && i > print_length) { strout ("...", 3, 3, printcharfun, 0); goto end_of_list; } - + print_object (XCAR (obj), printcharfun, escapeflag); - + obj = XCDR (obj); if (!(i & 1)) halftail = XCDR (halftail); @@ -1643,7 +1858,7 @@ print_object (obj, printcharfun, escapeflag) strout (" . ", 3, 3, printcharfun, 0); print_object (obj, printcharfun, escapeflag); } - + end_of_list: PRINTCHAR (')'); } @@ -1667,13 +1882,14 @@ print_object (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 ('\"'); @@ -1698,6 +1914,14 @@ print_object (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 == '\\') @@ -1718,7 +1942,7 @@ print_object (obj, printcharfun, escapeflag) 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)) { @@ -1735,12 +1959,12 @@ print_object (obj, printcharfun, escapeflag) { PRINTCHAR (' '); PRINTCHAR ('\''); - strout (XSTRING (SYMBOL_NAME (h->test))->data, -1, -1, printcharfun, 0); + strout (SDATA (SYMBOL_NAME (h->test)), -1, -1, printcharfun, 0); PRINTCHAR (' '); - strout (XSTRING (SYMBOL_NAME (h->weak))->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); @@ -1776,7 +2000,7 @@ print_object (obj, printcharfun, escapeflag) } else { - int size = XVECTOR (obj)->size; + EMACS_INT size = XVECTOR (obj)->size; if (COMPILEDP (obj)) { PRINTCHAR ('#'); @@ -1828,7 +2052,7 @@ print_object (obj, printcharfun, escapeflag) /* Do you think this is necessary? */ if (XMARKER (obj)->insertion_type != 0) strout ("(moves after insertion) ", -1, -1, printcharfun, 0); - if (!(XMARKER (obj)->buffer)) + if (! XMARKER (obj)->buffer) strout ("in no buffer", -1, -1, printcharfun, 0); else { @@ -1842,7 +2066,7 @@ print_object (obj, printcharfun, escapeflag) case Lisp_Misc_Overlay: strout ("#buffer)) + if (! XMARKER (OVERLAY_START (obj))->buffer) strout ("in no buffer", -1, -1, printcharfun, 0); else { @@ -1863,7 +2087,7 @@ print_object (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; @@ -1889,8 +2113,8 @@ print_object (obj, printcharfun, escapeflag) case Lisp_Misc_Kboard_Objfwd: strout ("#offset), + print_object (*(Lisp_Object *) ((char *) current_kboard + + XKBOARD_OBJFWD (obj)->offset), printcharfun, escapeflag); PRINTCHAR ('>'); break; @@ -1928,6 +2152,15 @@ print_object (obj, printcharfun, escapeflag) PRINTCHAR ('>'); break; + case Lisp_Misc_Save_Value: + strout ("#pointer, + XSAVE_VALUE (obj)->integer); + strout (buf, -1, -1, printcharfun, 0); + PRINTCHAR ('>'); + break; + default: goto badtype; } @@ -1967,7 +2200,7 @@ print_interval (interval, printcharfun) print_object (make_number (interval->position), printcharfun, 1); PRINTCHAR (' '); print_object (make_number (interval->position + LENGTH (interval)), - printcharfun, 1); + printcharfun, 1); PRINTCHAR (' '); print_object (interval->plist, printcharfun, 1); } @@ -2027,7 +2260,9 @@ Also print formfeeds as `\\f'. */); DEFVAR_BOOL ("print-escape-nonascii", &print_escape_nonascii, 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'. */); +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, @@ -2073,10 +2308,14 @@ This variable should not be set with `setq'; bind it with a `let' instead. */); 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 `print-continuous-numbering' is bound 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. */); +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 */ @@ -2090,6 +2329,9 @@ is done. */); 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); @@ -2105,3 +2347,6 @@ is done. */); defsubr (&Swith_output_to_temp_buffer); } + +/* arch-tag: bc797170-94ae-41de-86e3-75e20f8f7a39 + (do not change this comment) */