diff src/elhash.c @ 800:a5954632b187

[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 2b676dc88c66
line wrap: on
line diff
--- a/src/elhash.c	Sat Mar 30 04:46:48 2002 +0000
+++ b/src/elhash.c	Sun Mar 31 08:30:17 2002 +0000
@@ -1,6 +1,6 @@
 /* Implementation of the hash table lisp object type.
    Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
-   Copyright (C) 1995, 1996 Ben Wing.
+   Copyright (C) 1995, 1996, 2002 Ben Wing.
    Copyright (C) 1997 Free Software Foundation, Inc.
 
 This file is part of XEmacs.
@@ -120,15 +120,7 @@
 	  (probe = entries, !HENTRY_CLEAR_P (probe)) : 0);	\
        probe++)
 
-#ifndef ERROR_CHECK_HASH_TABLE
-# ifdef ERROR_CHECK_TYPECHECK
-#  define ERROR_CHECK_HASH_TABLE 1
-# else
-#  define ERROR_CHECK_HASH_TABLE 0
-# endif
-#endif
-
-#if ERROR_CHECK_HASH_TABLE
+#ifdef ERROR_CHECK_STRUCTURES
 static void
 check_hash_table_invariants (Lisp_Hash_Table *ht)
 {
@@ -335,8 +327,7 @@
 	    break;
 	  }
 	print_internal (e->key, printcharfun, 1);
-	write_c_string (" ", printcharfun);
-	print_internal (e->value, printcharfun, 1);
+	write_fmt_string_lisp (printcharfun, " %S", 1, e->value);
 	count++;
       }
 
@@ -347,7 +338,6 @@
 print_hash_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 {
   Lisp_Hash_Table *ht = XHASH_TABLE (obj);
-  char buf[128];
 
   write_c_string (print_readably ? "#s(hash-table" : "#<hash-table",
 		  printcharfun);
@@ -367,21 +357,21 @@
   if (ht->count || !print_readably)
     {
       if (print_readably)
-	sprintf (buf, " size %ld", (long) ht->count);
+	write_fmt_string (printcharfun, " size %ld", (long) ht->count);
       else
-	sprintf (buf, " size %ld/%ld", (long) ht->count, (long) ht->size);
-      write_c_string (buf, printcharfun);
+	write_fmt_string (printcharfun, " size %ld/%ld", (long) ht->count,
+			  (long) ht->size);
     }
 
   if (ht->weakness != HASH_TABLE_NON_WEAK)
     {
-      sprintf (buf, " weakness %s",
-	       (ht->weakness == HASH_TABLE_WEAK		  ? "key-and-value" :
-		ht->weakness == HASH_TABLE_KEY_WEAK	  ? "key" :
-		ht->weakness == HASH_TABLE_VALUE_WEAK	  ? "value" :
-		ht->weakness == HASH_TABLE_KEY_VALUE_WEAK ? "key-or-value" :
-		"you-d-better-not-see-this"));
-      write_c_string (buf, printcharfun);
+      write_fmt_string
+	(printcharfun, " weakness %s",
+	 (ht->weakness == HASH_TABLE_WEAK	    ? "key-and-value" :
+	  ht->weakness == HASH_TABLE_KEY_WEAK	    ? "key" :
+	  ht->weakness == HASH_TABLE_VALUE_WEAK	    ? "value" :
+	  ht->weakness == HASH_TABLE_KEY_VALUE_WEAK ? "key-or-value" :
+	  "you-d-better-not-see-this"));
     }
 
   if (ht->count)
@@ -391,15 +381,14 @@
     write_c_string (")", printcharfun);
   else
     {
-      sprintf (buf, " 0x%x>", ht->header.uid);
-      write_c_string (buf, printcharfun);
+      write_fmt_string (printcharfun, " 0x%x>", ht->header.uid);
     }
 }
 
 static void
 free_hentries (hentry *hentries, size_t size)
 {
-#if ERROR_CHECK_HASH_TABLE
+#ifdef ERROR_CHECK_STRUCTURES
   /* Ensure a crash if other code uses the discarded entries afterwards. */
   hentry *e, *sentinel;