/* Lisp object printing and output streams.
- Copyright (C) 1985, 86, 88, 93, 94, 95, 97, 98, 1999, 2000, 01, 2002
+ Copyright (C) 1985, 86, 88, 93, 94, 95, 97, 98, 1999, 2000, 01, 2003
Free Software Foundation, Inc.
This file is part of GNU Emacs.
/* 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];
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; \
int old_point = -1, start_point = -1; \
int old_point_byte = -1, start_point_byte = -1; \
- int specpdl_count = specpdl_ptr - specpdl; \
+ int specpdl_count = SPECPDL_INDEX (); \
int free_print_buffer = 0; \
int multibyte = !NILP (current_buffer->enable_multibyte_characters); \
Lisp_Object original
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;
}
int len = CHAR_STRING (ch, str);
QUIT;
-
+
if (NILP (fun))
{
if (print_buffer_pos_byte + len >= print_buffer_size)
{
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);
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 (ch);
}
}
-
+
#ifdef MAX_PRINT_CHARS
if (max_print)
print_chars += size;
string = string_escape_byte8 (string);
if (STRING_MULTIBYTE (string))
- chars = XSTRING (string)->size;
+ chars = SCHARS (string);
else if (! print_escape_nonascii
&& (EQ (printcharfun, Qt)
? ! NILP (buffer_defaults.enable_multibyte_characters)
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);
/* 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
/* 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++)
{
/* 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);
PRINTCHAR (ch);
i += len;
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;
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;
Ferase_buffer ();
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;
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 ...) */)
(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));
CHECK_STRING (name);
- temp_output_buffer_setup (XSTRING (name)->data);
+ temp_output_buffer_setup (SDATA (name));
buf = Vstandard_output;
UNGCPRO;
{
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;
+
+ specbind (Qinhibit_modification_hooks, Qt);
/* 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);
+ save_deactivate_mark = Vdeactivate_mark;
+ /* GCPRO2 (object, save_deactivate_mark); */
+ abort_on_gc++;
printcharfun = Vprin1_to_string_buffer;
PRINTPREPARE;
PRINTFINISH;
set_buffer_internal (XBUFFER (Vprin1_to_string_buffer));
object = Fbuffer_string ();
+ if (SBYTES (object) == SCHARS (object))
+ STRING_SET_UNIBYTE (object);
Ferase_buffer ();
set_buffer_internal (old);
- 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,
&& 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 ();
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))
+ {
+ const char *name = SDATA (SYMBOL_NAME (caller));
+ message_dolog (name, strlen (name), 0, 0);
+ message_dolog (": ", 2, 0, 0);
+ }
+
errname = Fcar (data);
if (EQ (errname, Qerror))
tail = Fcdr_safe (data);
GCPRO1 (tail);
- /* If we know from where the error was signaled, show it in
- *Messages*. */
- if (!NILP (Vsignaling_function) && SYMBOLP (Vsignaling_function))
- {
- char *name = XSYMBOL (Vsignaling_function)->name->data;
- message_dolog (name, strlen (name), 0, 0);
- message_dolog (": ", 2, 0, 0);
- Vsignaling_function = Qnil;
- }
-
/* For file-error, make error message by concatenating
all the data items. They are all strings. */
if (!NILP (file_error) && CONSP (tail))
else
Fprin1 (obj, stream);
}
-
+
UNGCPRO;
}
* largest float, printed in the biggest notation. This is undoubtedly
* 20d float_output_format, with the negative of the C-constant "HUGE"
* from <math.h>.
- *
+ *
* 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)?
{
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)
*buf++ = '-';
break;
}
-
+
strcpy (buf, "0.0e+NaN");
return;
}
/* 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;
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
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,
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_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;
}
{
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;
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;)
{
PRINTCHAR ('\\');
PRINTCHAR ('f');
}
- else if (multibyte && ! ASCII_BYTE_P (c)
- && (print_escape_multibyte || CHAR_BYTE8_P (c)))
+ else if (multibyte
+ && (CHAR_BYTE8_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];
if (CHAR_BYTE8_P (c))
sprintf (outbuf, "\\%03o", CHAR_TO_BYTE8 (c));
else
- sprintf (outbuf, "\\x%04x", c);
+ {
+ sprintf (outbuf, "\\x%04x", c);
+ need_nonhex = 1;
+ }
strout (outbuf, -1, -1, printcharfun, 0);
- need_nonhex = 1;
}
else if (! multibyte
&& SINGLE_BYTE_CHAR_P (c) && ! ASCII_BYTE_P (c)
}
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 (')');
}
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)
PRINTCHAR (':');
}
- size_byte = STRING_BYTES (XSTRING (name));
+ size_byte = SBYTES (name);
for (i = 0, i_byte = 0; i_byte < size_byte;)
{
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)
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;
}
}
}
-
+
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);
strout (" . ", 3, 3, printcharfun, 0);
print_object (obj, printcharfun, escapeflag);
}
-
+
end_of_list:
PRINTCHAR (')');
}
{
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);
? "#<frame " : "#<dead frame "),
-1, -1, printcharfun, 0);
print_string (XFRAME (obj)->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 ('>');
}
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,
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 */