diff src/symbols.c @ 563:183866b06e0b

[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 38fb9ae12edd
children b39c14581166
line wrap: on
line diff
--- a/src/symbols.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/symbols.c	Thu May 24 07:51:33 2001 +0000
@@ -357,7 +357,7 @@
   if (ZEROP (bucket))
     ;
   else if (!SYMBOLP (bucket))
-    error ("Bad data in guts of obarray"); /* Like CADR error message */
+    signal_error (Qinvalid_state, "Bad data in guts of obarray", Qunbound); /* Like CADR error message */
   else
     for (tail = XSYMBOL (bucket); ;)
       {
@@ -575,13 +575,13 @@
 
   if (SYMBOL_VALUE_MAGIC_P (val) &&
       XSYMBOL_VALUE_MAGIC_TYPE (val) == SYMVAL_CONST_SPECIFIER_FORWARD)
-    signal_simple_error ("Use `set-specifier' to change a specifier's value",
-			 sym);
+    invalid_change ("Use `set-specifier' to change a specifier's value",
+		    sym);
 
   if (symbol_is_constant (sym, val)
       || (SYMBOL_IS_KEYWORD (sym) && !EQ (newval, sym)))
-    signal_error (Qsetting_constant,
-		  UNBOUNDP (newval) ? list1 (sym) : list2 (sym, newval));
+    signal_error_1 (Qsetting_constant,
+		    UNBOUNDP (newval) ? list1 (sym) : list2 (sym, newval));
 }
 
 /* Verify that it's ok to make SYM buffer-local.  This rejects
@@ -614,8 +614,7 @@
   return;
 
   not_ok:
-  signal_error (Qerror,
-		list2 (build_string ("Symbol may not be buffer-local"), sym));
+  invalid_change ("Symbol may not be buffer-local", sym);
 }
 
 DEFUN ("makunbound", Fmakunbound, 1, 1, 0, /*
@@ -1757,8 +1756,7 @@
     case SYMVAL_DEFAULT_BUFFER_FORWARD:
     case SYMVAL_DEFAULT_CONSOLE_FORWARD:
       if (UNBOUNDP (newval))
-	signal_error (Qerror,
-		      list2 (build_string ("Cannot makunbound"), symbol));
+	invalid_change ("Cannot makunbound", symbol);
       break;
 
       /* case SYMVAL_UNBOUND_MARKER: break; */
@@ -2839,7 +2837,7 @@
   if (EQ (symbol, Qlocal_predicate)) return MAGIC_HANDLER_LOCAL_PREDICATE;
   if (EQ (symbol, Qmake_local))      return MAGIC_HANDLER_MAKE_LOCAL;
 
-  signal_simple_error ("Unrecognized symbol value handler type", symbol);
+  invalid_constant ("Unrecognized symbol value handler type", symbol);
   abort ();
   return MAGIC_HANDLER_MAX;
 }
@@ -2874,7 +2872,7 @@
 
   if (abort_if_not_found)
     abort ();
-  signal_simple_error ("Unrecognized symbol-value function", funsym);
+  invalid_argument ("Unrecognized symbol-value function", funsym);
   return MAGIC_HANDLER_MAX;
 }
 
@@ -3109,7 +3107,7 @@
 
   if (SYMBOL_VALUE_MAGIC_P (valcontents)
       && !UNBOUNDP (valcontents))
-    signal_simple_error ("Variable is magic and cannot be aliased", variable);
+    invalid_change ("Variable is magic and cannot be aliased", variable);
   reject_constant_symbols (variable, Qunbound, 0, Qt);
 
   bfwd = alloc_lcrecord_type (struct symbol_value_varalias,
@@ -3244,7 +3242,7 @@
 
   XSYMBOL (Qnil)->function = Qunbound;
 
-  defsymbol (&Qt, "t");
+  DEFSYMBOL (Qt);
   XSYMBOL (Qt)->value = Qt;	/* Veritas aeterna */
   Vquit_flag = Qnil;