Mercurial > hg > xemacs-beta

diff src/elhash.c @ 563:183866b06e0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents bcda0b3445a6
children 190b164ddcac
line wrap: on
line diff
--- a/src/elhash.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/elhash.c	Thu May 24 07:51:33 2001 +0000
@@ -578,7 +578,7 @@
   if (NATNUMP (value))
     return 1;
 
-  maybe_signal_error (Qwrong_type_argument, list2 (Qnatnump, value),
+  maybe_signal_error_1 (Qwrong_type_argument, list2 (Qnatnump, value),
 		      Qhash_table, errb);
   return 0;
 }
@@ -607,7 +607,7 @@
   if (EQ (value, Qkey_or_value_weak))	return 1;
   if (EQ (value, Qvalue_weak))		return 1;
 
-  maybe_signal_simple_error ("Invalid hash table weakness",
+  maybe_invalid_constant ("Invalid hash table weakness",
 			     value, Qhash_table, errb);
   return 0;
 }
@@ -629,7 +629,7 @@
   if (EQ (obj, Qkey_or_value_weak))	return HASH_TABLE_KEY_VALUE_WEAK;
   if (EQ (obj, Qvalue_weak))		return HASH_TABLE_VALUE_WEAK;
 
-  signal_simple_error ("Invalid hash table weakness", obj);
+  invalid_constant ("Invalid hash table weakness", obj);
   return HASH_TABLE_NON_WEAK; /* not reached */
 }
 
@@ -642,7 +642,7 @@
   if (EQ (value, Qequal)) return 1;
   if (EQ (value, Qeql))	  return 1;
 
-  maybe_signal_simple_error ("Invalid hash table test",
+  maybe_invalid_constant ("Invalid hash table test",
 			     value, Qhash_table, errb);
   return 0;
 }
@@ -655,7 +655,7 @@
   if (EQ (obj, Qequal)) return HASH_TABLE_EQUAL;
   if (EQ (obj, Qeql))	return HASH_TABLE_EQL;
 
-  signal_simple_error ("Invalid hash table test", obj);
+  invalid_constant ("Invalid hash table test", obj);
   return HASH_TABLE_EQ; /* not reached */
 }
 
@@ -665,7 +665,7 @@
 {
   if (!FLOATP (value))
     {
-      maybe_signal_error (Qwrong_type_argument, list2 (Qfloatp, value),
+      maybe_signal_error_1 (Qwrong_type_argument, list2 (Qfloatp, value),
 			  Qhash_table, errb);
       return 0;
     }
@@ -674,7 +674,7 @@
     double rehash_size = XFLOAT_DATA (value);
     if (rehash_size <= 1.0)
       {
-	maybe_signal_simple_error
+	maybe_invalid_argument
 	  ("Hash table rehash size must be greater than 1.0",
 	   value, Qhash_table, errb);
 	return 0;
@@ -696,7 +696,7 @@
 {
   if (!FLOATP (value))
     {
-      maybe_signal_error (Qwrong_type_argument, list2 (Qfloatp, value),
+      maybe_signal_error_1 (Qwrong_type_argument, list2 (Qfloatp, value),
 			  Qhash_table, errb);
       return 0;
     }
@@ -705,7 +705,7 @@
     double rehash_threshold = XFLOAT_DATA (value);
     if (rehash_threshold <= 0.0 || rehash_threshold >= 1.0)
       {
-	maybe_signal_simple_error
+	maybe_invalid_argument
 	  ("Hash table rehash threshold must be between 0.0 and 1.0",
 	   value, Qhash_table, errb);
 	return 0;
@@ -731,7 +731,7 @@
 
   if (len & 1)
     {
-      maybe_signal_simple_error
+      maybe_sferror
 	("Hash table data must have alternating key/value pairs",
 	 value, Qhash_table, errb);
       return 0;
@@ -909,11 +909,11 @@
       else if (EQ (keyword, Q_rehash_threshold)) rehash_threshold = value;
       else if (EQ (keyword, Q_weakness))	 weakness	  = value;
       else if (EQ (keyword, Q_type))/*obsolete*/ weakness	  = value;
-      else signal_simple_error ("Invalid hash table property keyword", keyword);
+      else invalid_constant ("Invalid hash table property keyword", keyword);
     }
 
   if (i < nargs)
-    signal_simple_error ("Hash table property requires a value", args[i]);
+    sferror ("Hash table property requires a value", args[i]);
 
 #define VALIDATE_VAR(var) \
 if (!NILP (var)) hash_table_##var##_validate (Q##var, var, ERROR_ME);
@@ -1665,28 +1665,28 @@
   DEFSUBR (Finternal_hash_value);
 #endif
 
-  defsymbol (&Qhash_tablep, "hash-table-p");
-  defsymbol (&Qhash_table, "hash-table");
-  defsymbol (&Qhashtable, "hashtable");
-  defsymbol (&Qweakness, "weakness");
-  defsymbol (&Qvalue, "value");
-  defsymbol (&Qkey_or_value, "key-or-value");
-  defsymbol (&Qkey_and_value, "key-and-value");
-  defsymbol (&Qrehash_size, "rehash-size");
-  defsymbol (&Qrehash_threshold, "rehash-threshold");
+  DEFSYMBOL_MULTIWORD_PREDICATE (Qhash_tablep);
+  DEFSYMBOL (Qhash_table);
+  DEFSYMBOL (Qhashtable);
+  DEFSYMBOL (Qweakness);
+  DEFSYMBOL (Qvalue);
+  DEFSYMBOL (Qkey_or_value);
+  DEFSYMBOL (Qkey_and_value);
+  DEFSYMBOL (Qrehash_size);
+  DEFSYMBOL (Qrehash_threshold);
 
-  defsymbol (&Qweak, "weak");             /* obsolete */
-  defsymbol (&Qkey_weak, "key-weak");     /* obsolete */
-  defsymbol (&Qkey_or_value_weak, "key-or-value-weak");    /* obsolete */
-  defsymbol (&Qvalue_weak, "value-weak"); /* obsolete */
-  defsymbol (&Qnon_weak, "non-weak");     /* obsolete */
+  DEFSYMBOL (Qweak);             /* obsolete */
+  DEFSYMBOL (Qkey_weak);     /* obsolete */
+  DEFSYMBOL (Qkey_or_value_weak);    /* obsolete */
+  DEFSYMBOL (Qvalue_weak); /* obsolete */
+  DEFSYMBOL (Qnon_weak);     /* obsolete */
 
-  defkeyword (&Q_test, ":test");
-  defkeyword (&Q_size, ":size");
-  defkeyword (&Q_rehash_size, ":rehash-size");
-  defkeyword (&Q_rehash_threshold, ":rehash-threshold");
-  defkeyword (&Q_weakness, ":weakness");
-  defkeyword (&Q_type, ":type"); /* obsolete */
+  DEFKEYWORD (Q_test);
+  DEFKEYWORD (Q_size);
+  DEFKEYWORD (Q_rehash_size);
+  DEFKEYWORD (Q_rehash_threshold);
+  DEFKEYWORD (Q_weakness);
+  DEFKEYWORD (Q_type); /* obsolete */
 }
 
 void