Mercurial > hg > xemacs-beta

diff src/chartab.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 c33ae14dd6d0
children 190b164ddcac
line wrap: on
line diff
--- a/src/chartab.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/chartab.c	Thu May 24 07:51:33 2001 +0000
@@ -211,7 +211,7 @@
   if (EQ (symbol, Qcategory)) return CHAR_TABLE_TYPE_CATEGORY;
 #endif
 
-  signal_simple_error ("Unrecognized char table type", symbol);
+  invalid_constant ("Unrecognized char table type", symbol);
   return CHAR_TABLE_TYPE_GENERIC; /* not reached */
 }
 
@@ -729,14 +729,14 @@
     }
 #ifndef MULE
   else
-    signal_simple_error ("Range must be t or a character", range);
+    sferror ("Range must be t or a character", range);
 #else /* MULE */
   else if (VECTORP (range))
     {
       Lisp_Vector *vec = XVECTOR (range);
       Lisp_Object *elts = vector_data (vec);
       if (vector_length (vec) != 2)
-	signal_simple_error ("Length of charset row vector must be 2",
+	sferror ("Length of charset row vector must be 2",
 			     range);
       outrange->type = CHARTAB_RANGE_ROW;
       outrange->charset = Fget_charset (elts[0]);
@@ -746,7 +746,7 @@
 	{
 	case CHARSET_TYPE_94:
 	case CHARSET_TYPE_96:
-	  signal_simple_error ("Charset in row vector must be multi-byte",
+	  sferror ("Charset in row vector must be multi-byte",
 			       outrange->charset);
 	case CHARSET_TYPE_94X94:
 	  check_int_range (outrange->row, 33, 126);
@@ -761,7 +761,7 @@
   else
     {
       if (!CHARSETP (range) && !SYMBOLP (range))
-	signal_simple_error
+	sferror
 	  ("Char table range must be t, charset, char, or vector", range);
       outrange->type = CHARTAB_RANGE_CHARSET;
       outrange->charset = Fget_charset (range);
@@ -979,8 +979,9 @@
 
     case CHAR_TABLE_TYPE_DISPLAY:
       /* #### fix this */
-      maybe_signal_simple_error ("Display char tables not yet implemented",
-				 value, Qchar_table, errb);
+      maybe_signal_error (Qunimplemented,
+			       "Display char tables not yet implemented",
+			       value, Qchar_table, errb);
       return 0;
 
     case CHAR_TABLE_TYPE_CHAR:
@@ -1494,12 +1495,12 @@
 
       rest = XCDR (rest);
       if (!CONSP (rest))
-	signal_simple_error ("Invalid list format", value);
+	signal_error (Qlist_formation_error, "Invalid list format", value);
       if (CONSP (range))
 	{
 	  if (!CONSP (XCDR (range))
 	      || !NILP (XCDR (XCDR (range))))
-	    signal_simple_error ("Invalid range format", range);
+	    sferror ("Invalid range format", range);
 	  decode_char_table_range (XCAR (range), &dummy);
 	  decode_char_table_range (XCAR (XCDR (range)), &dummy);
 	}
@@ -1617,7 +1618,7 @@
   Lisp_Char_Table *ctbl;
 #ifdef ERROR_CHECK_TYPECHECK
   if (NILP (Fcategory_table_p (table)))
-    signal_simple_error ("Expected category table", table);
+    wtaerror ("Expected category table", table);
 #endif
   ctbl = XCHAR_TABLE (table);
   temp = get_char_table (ch, ctbl);
@@ -1806,13 +1807,13 @@
 #ifdef MULE
   INIT_LRECORD_IMPLEMENTATION (char_table_entry);
 
-  defsymbol (&Qcategory_table_p, "category-table-p");
-  defsymbol (&Qcategory_designator_p, "category-designator-p");
-  defsymbol (&Qcategory_table_value_p, "category-table-value-p");
+  DEFSYMBOL (Qcategory_table_p);
+  DEFSYMBOL (Qcategory_designator_p);
+  DEFSYMBOL (Qcategory_table_value_p);
 #endif /* MULE */
 
-  defsymbol (&Qchar_table, "char-table");
-  defsymbol (&Qchar_tablep, "char-table-p");
+  DEFSYMBOL (Qchar_table);
+  DEFSYMBOL_MULTIWORD_PREDICATE (Qchar_tablep);
 
   DEFSUBR (Fchar_table_p);
   DEFSUBR (Fchar_table_type_list);