Mercurial > hg > xemacs-beta

diff src/print.c @ 800:a5954632b187

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-31 08:27:14 by ben] more fixes, first crack at finishing behavior implementation TODO.ben-mule-21-5: Update. configure.in: Fix for new error-checking types. make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code to force errors when nonintercepted Windows calls issued. behavior.el, dumped-lisp.el, menubar-items.el: Add support for saving using custom. Load into a dumped XEmacs. Correct :title to :short-doc in accordance with behavior-defs.el. Add a submenu under Options for turning on/off behaviors. cl-macs.el: Properly document `loop'. Fix a minor bug in keymap iteration and add support for bit-vector iteration. lisp-mode.el: Rearrange and add items for macro expanding. menubar-items.el: Document connection between these two functions. window.el: Port stuff from GNU 21.1. config.inc.samp, xemacs.mak: Separate out and add new variable for controlling error-checking. s/windowsnt.h: Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS. alloc.c, backtrace.h, buffer.c, buffer.h, bytecode.c, callproc.c, casetab.c, charset.h, chartab.c, cmdloop.c, config.h.in, console-msw.c, console-stream.c, console-tty.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dired-msw.c, dired.c, dumper.c, editfns.c, eldap.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, file-coding.h, fileio.c, frame-msw.c, frame.c, frame.h, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, insdel.c, intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, intl-win32.c, keymap.c, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-x.c, menubar.c, mule-coding.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, opaque.c, print.c, process-nt.c, process-unix.c, process.c, rangetab.c, redisplay-msw.c, redisplay-output.c, redisplay.c, regex.c, scrollbar-msw.c, select-msw.c, signal.c, specifier.c, specifier.h, symbols.c, sysdep.c, syswindows.h, text.c, text.h, toolbar-msw.c, tooltalk.c, ui-gtk.c, unicode.c, window.c: Redo error-checking macros: ERROR_CHECK_TYPECHECK -> ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in config.h.in. Fix code to follow docs. Fix *_checking_assert() in accordance with new names. Attempt to fix periodic redisplay crash freeing display line structures. Add first implementation of sledgehammer redisplay check. Redo print_*() to use write_fmt_string(), write_fmt_string_lisp(). Fix bug in md5 handling. Rename character-to-unicode to char-to-unicode; same for unicode-to-char{acter}. Move chartab documentation to `make-char-table'. Some header cleanup. Clean up remaining places where nonintercepted Windows calls are being used. automated/mule-tests.el: Fix for new Unicode support.
author ben
date Sun, 31 Mar 2002 08:30:17 +0000
parents e38acbeb1cae
children 19dfb459d51a
line wrap: on
line diff
--- a/src/print.c	Sat Mar 30 04:46:48 2002 +0000
+++ b/src/print.c	Sun Mar 31 08:30:17 2002 +0000
@@ -38,18 +38,21 @@
 #include "backtrace.h"
 #include "buffer.h"
 #include "bytecode.h"
-#include "console-tty.h"
-#include "console-stream.h"
+#include "device.h"
 #include "extents.h"
 #include "frame.h"
 #include "insdel.h"
 #include "lstream.h"
 #include "opaque.h"
-#include "sysfile.h"
+
+#include "console-tty.h"
+#include "console-stream.h"
 #ifdef WIN32_NATIVE
 #include "console-msw.h"
 #endif
 
+#include "sysfile.h"
+
 #include <float.h>
 /* Define if not in float.h */
 #ifndef DBL_DIG
@@ -544,7 +547,7 @@
 write_string_1 (const Intbyte *str, Bytecount size, Lisp_Object stream)
 {
   /* This function can GC */
-#ifdef ERROR_CHECK_CHARBPOS
+#ifdef ERROR_CHECK_TEXT
   assert (size >= 0);
 #endif
   output_string (stream, str, Qnil, 0, size);
@@ -1359,7 +1362,6 @@
 {
   struct lcrecord_header *header =
     (struct lcrecord_header *) XPNTR (obj);
-  char buf[200];
 
   if (print_readably)
     printing_unreadable_object
@@ -1367,21 +1369,19 @@
        LHEADER_IMPLEMENTATION (&header->lheader)->name,
        header->uid);
 
-  sprintf (buf, "#<%s 0x%x>",
-	   LHEADER_IMPLEMENTATION (&header->lheader)->name,
-	   header->uid);
-  write_c_string (buf, printcharfun);
+  write_fmt_string (printcharfun, "#<%s 0x%x>",
+		    LHEADER_IMPLEMENTATION (&header->lheader)->name,
+		    header->uid);
 }
 
 void
 internal_object_printer (Lisp_Object obj, Lisp_Object printcharfun,
 			 int escapeflag)
 {
-  char buf[200];
-  sprintf (buf, "#<INTERNAL OBJECT (XEmacs bug?) (%s) 0x%lx>",
-	   XRECORD_LHEADER_IMPLEMENTATION (obj)->name,
-	   (unsigned long) XPNTR (obj));
-  write_c_string (buf, printcharfun);
+  write_fmt_string (printcharfun,
+		    "#<INTERNAL OBJECT (XEmacs bug?) (%s) 0x%lx>",
+		    XRECORD_LHEADER_IMPLEMENTATION (obj)->name,
+		    (unsigned long) XPNTR (obj));
 }
 
 void
@@ -1406,10 +1406,8 @@
       
 	  if (!debug_can_access_memory (lheader, sizeof (*lheader)))
 	    {
-	      char buf[128];
-
-	      sprintf (buf, "#<EMACS BUG: BAD MEMORY %p>", lheader);
-	      write_c_string (buf, printcharfun);
+	      write_fmt_string (printcharfun, "#<EMACS BUG: BAD MEMORY %p>",
+				lheader);
 	      return;
 	    }
 	  else
@@ -1418,11 +1416,9 @@
 
 	      if ((int) lheader->type >= lrecord_type_count)
 		{
-		  char buf[128];
-		  
-		  sprintf (buf, "#<EMACS BUG: bad type %d BAD MEMORY %p>",
-			   lheader->type, lheader);
-		  write_c_string (buf, printcharfun);
+		  write_fmt_string (printcharfun,
+				    "#<EMACS BUG: bad type %d BAD MEMORY %p>",
+				    lheader->type, lheader);
 		  return;
 		}
 
@@ -1433,11 +1429,9 @@
 		    impl->size_in_bytes_method (lheader) :
 		    impl->static_size)))
 		{
-		  char buf[128];
-		  
-		  sprintf (buf, "#<EMACS BUG: type %s BAD MEMORY %p>",
-			   impl->name, lheader);
-		  write_c_string (buf, printcharfun);
+		  write_fmt_string (printcharfun,
+				    "#<EMACS BUG: type %s BAD MEMORY %p>",
+				    impl->name, lheader);
 		  return;
 		}
 
@@ -1447,11 +1441,10 @@
 		  if (!debug_can_access_memory
 		      (l->data_, l->size_))
 		    {
-		      char buf[128];
-		  
-		      sprintf (buf, "#<EMACS BUG: %p (BAD STRING DATA %p)>",
-			       lheader, l->data_);
-		      write_c_string (buf, printcharfun);
+		      write_fmt_string
+			(printcharfun,
+			 "#<EMACS BUG: %p (BAD STRING DATA %p)>",
+			 lheader, l->data_);
 		      return;
 		    }
 		}
@@ -1599,22 +1592,20 @@
 
     default:
       {
-#ifdef ERROR_CHECK_TYPECHECK
+#ifdef ERROR_CHECK_TYPES
 	abort ();
-#else  /* not ERROR_CHECK_TYPECHECK */
-	char buf[128];
+#else  /* not ERROR_CHECK_TYPES */
 	/* We're in trouble if this happens! */
 	if (print_readably)
 	  signal_error (Qinternal_error, "printing illegal data type #o%03o",
 			make_int (XTYPE (obj)));
 	write_c_string ("#<EMACS BUG: ILLEGAL DATATYPE ",
 			printcharfun);
-	sprintf (buf, "(#o%3o)", (int) XTYPE (obj));
-	write_c_string (buf, printcharfun);
+	write_fmt_string (printcharfun, "(#o%3o)", (int) XTYPE (obj));
 	write_c_string
 	  (" Save your buffers immediately and please report this bug>",
 	   printcharfun);
-#endif /* not ERROR_CHECK_TYPECHECK */
+#endif /* not ERROR_CHECK_TYPES */
 	break;
       }
     }