Mercurial > hg > xemacs-beta

diff src/mule-charset.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 1c3b60121364
children e9162e1ea200
line wrap: on
line diff
--- a/src/mule-charset.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/mule-charset.c	Thu May 24 07:51:33 2001 +0000
@@ -404,9 +404,10 @@
   char buf[200];
 
   if (print_readably)
-    error ("printing unreadable object #<charset %s 0x%x>",
-           string_data (XSYMBOL (CHARSET_NAME (cs))->name),
-	   cs->header.uid);
+    printing_unreadable_object ("#<charset %s 0x%x>",
+				string_data (XSYMBOL (CHARSET_NAME (cs))->
+					     name),
+				cs->header.uid);
 
   write_c_string ("#<charset ", printcharfun);
   print_internal (CHARSET_NAME (cs), printcharfun, 0);
@@ -522,7 +523,7 @@
     }
 
   if (!lb)
-    signal_simple_error
+    invalid_operation
       ("No more character sets free for this dimension",
        make_int (dimension));
 
@@ -567,7 +568,7 @@
   Lisp_Object charset = Ffind_charset (name);
 
   if (NILP (charset))
-    signal_simple_error ("No such charset", name);
+    invalid_argument ("No such charset", name);
   return charset;
 }
 
@@ -682,7 +683,7 @@
 
   charset = Ffind_charset (name);
   if (!NILP (charset))
-    signal_simple_error ("Cannot redefine existing charset", name);
+    invalid_operation ("Cannot redefine existing charset", name);
 
   {
     EXTERNAL_PROPERTY_LIST_LOOP_3 (keyword, value, props)
@@ -704,7 +705,7 @@
 	    CHECK_INT (value);
 	    dimension = XINT (value);
 	    if (dimension < 1 || dimension > 2)
-	      signal_simple_error ("Invalid value for 'dimension", value);
+	      invalid_constant ("Invalid value for 'dimension", value);
 	  }
 
 	else if (EQ (keyword, Qchars))
@@ -712,7 +713,7 @@
 	    CHECK_INT (value);
 	    chars = XINT (value);
 	    if (chars != 94 && chars != 96)
-	      signal_simple_error ("Invalid value for 'chars", value);
+	      invalid_constant ("Invalid value for 'chars", value);
 	  }
 
 	else if (EQ (keyword, Qcolumns))
@@ -720,7 +721,7 @@
 	    CHECK_INT (value);
 	    columns = XINT (value);
 	    if (columns != 1 && columns != 2)
-	      signal_simple_error ("Invalid value for 'columns", value);
+	      invalid_constant ("Invalid value for 'columns", value);
 	  }
 
 	else if (EQ (keyword, Qgraphic))
@@ -728,7 +729,7 @@
 	    CHECK_INT (value);
 	    graphic = XINT (value);
 	    if (graphic < 0 || graphic > 1)
-	      signal_simple_error ("Invalid value for 'graphic", value);
+	      invalid_constant ("Invalid value for 'graphic", value);
 	  }
 
 	else if (EQ (keyword, Qregistry))
@@ -744,7 +745,7 @@
 	    else if (EQ (value, Qr2l))
 	      direction = CHARSET_RIGHT_TO_LEFT;
 	    else
-	      signal_simple_error ("Invalid value for 'direction", value);
+	      invalid_constant ("Invalid value for 'direction", value);
 	  }
 
 	else if (EQ (keyword, Qfinal))
@@ -752,7 +753,7 @@
 	    CHECK_CHAR_COERCE_INT (value);
 	    final = XCHAR (value);
 	    if (final < '0' || final > '~')
-	      signal_simple_error ("Invalid value for 'final", value);
+	      invalid_constant ("Invalid value for 'final", value);
 	  }
 
 	else if (EQ (keyword, Qccl_program))
@@ -760,19 +761,19 @@
 	    struct ccl_program test_ccl;
 
 	    if (setup_ccl_program (&test_ccl, value) < 0)
-	      signal_simple_error ("Invalid value for 'ccl-program", value);
+	      invalid_argument ("Invalid value for 'ccl-program", value);
 	    ccl_program = value;
 	  }
 
 	else
-	  signal_simple_error ("Unrecognized property", keyword);
+	  invalid_constant ("Unrecognized property", keyword);
       }
   }
 
   if (!final)
-    error ("'final must be specified");
+    invalid_argument ("'final must be specified", Qunbound);
   if (dimension == 2 && final > 0x5F)
-    signal_simple_error
+    invalid_constant
       ("Final must be in the range 0x30 - 0x5F for dimension == 2",
        make_char (final));
 
@@ -824,12 +825,12 @@
 
   charset = Fget_charset (charset);
   if (!NILP (XCHARSET_REVERSE_DIRECTION_CHARSET (charset)))
-    signal_simple_error ("Charset already has reverse-direction charset",
+    invalid_operation ("Charset already has reverse-direction charset",
 			 charset);
 
   CHECK_SYMBOL (new_name);
   if (!NILP (Ffind_charset (new_name)))
-    signal_simple_error ("Cannot redefine existing charset", new_name);
+    invalid_operation ("Cannot redefine existing charset", new_name);
 
   cs = XCHARSET (charset);
 
@@ -888,27 +889,27 @@
   CHECK_INT (dimension);
   dm = XINT (dimension);
   if (dm < 1 || dm > 2)
-    signal_simple_error ("Invalid value for DIMENSION", dimension);
+    invalid_constant ("Invalid value for DIMENSION", dimension);
 
   CHECK_INT (chars);
   ch = XINT (chars);
   if (ch != 94 && ch != 96)
-    signal_simple_error ("Invalid value for CHARS", chars);
+    invalid_constant ("Invalid value for CHARS", chars);
 
   CHECK_CHAR_COERCE_INT (final);
   fi = XCHAR (final);
   if (fi < '0' || fi > '~')
-    signal_simple_error ("Invalid value for FINAL", final);
+    invalid_constant ("Invalid value for FINAL", final);
 
   if (EQ (direction, Ql2r))
     di = CHARSET_LEFT_TO_RIGHT;
   else if (EQ (direction, Qr2l))
     di = CHARSET_RIGHT_TO_LEFT;
   else if (!NILP (direction))
-    signal_simple_error ("Invalid value for DIRECTION", direction);
+    invalid_constant ("Invalid value for DIRECTION", direction);
 
   if (dm == 2 && fi > 0x5F)
-    signal_simple_error
+    invalid_constant
       ("Final must be in the range 0x30 - 0x5F for dimension == 2", final);
 
   if (dm == 1)
@@ -994,7 +995,7 @@
       /* #### Is this translation OK?  If so, error checking sufficient? */
       return CHARSETP (obj) ? XCHARSET_NAME (obj) : obj;
     }
-  signal_simple_error ("Unrecognized charset property name", prop);
+  invalid_constant ("Unrecognized charset property name", prop);
   return Qnil; /* not reached */
 }
 
@@ -1018,7 +1019,7 @@
 
   charset = Fget_charset (charset);
   if (setup_ccl_program (&test_ccl, ccl_program) < 0)
-    signal_simple_error ("Invalid ccl-program", ccl_program);
+    invalid_argument ("Invalid ccl-program", ccl_program);
   XCHARSET_CCL_PROGRAM (charset) = ccl_program;
   face_property_was_changed (Vdefault_face, Qfont, Qglobal);
   return Qnil;
@@ -1089,7 +1090,7 @@
   if (CHARSET_DIMENSION (cs) == 1)
     {
       if (!NILP (arg2))
-        signal_simple_error
+        invalid_argument
           ("Charset is of dimension one; second octet must be nil", arg2);
       return make_char (MAKE_CHAR (charset, a1, 0));
     }
@@ -1131,7 +1132,7 @@
   else if (EQ (n, make_int (1)))
     return make_int (octet1);
   else
-    signal_simple_error ("Octet number must be 0 or 1", n);
+    invalid_constant ("Octet number must be 0 or 1", n);
 }
 
 DEFUN ("split-char", Fsplit_char, 1, 1, 0, /*
@@ -1181,7 +1182,7 @@
   if (UNBOUNDP (ch))
     {
       if (composite_char_row_next >= 128)
-	signal_simple_error ("No more composite chars available", lispstr);
+	invalid_operation ("No more composite chars available", lispstr);
       emch = MAKE_CHAR (Vcharset_composite, composite_char_row_next,
 			composite_char_col_next);
       Fputhash (make_char (emch), lispstr,
@@ -1232,7 +1233,7 @@
   CHECK_CHAR (ch);
   emch = XCHAR (ch);
   if (CHAR_LEADING_BYTE (emch) != LEADING_BYTE_COMPOSITE)
-    signal_simple_error ("Must be composite char", ch);
+    invalid_argument ("Must be composite char", ch);
   return composite_char_string (emch);
 }
 #endif /* ENABLE_COMPOSITE_CHARS */
@@ -1275,45 +1276,45 @@
   DEFSUBR (Fcomposite_char_string);
 #endif
 
-  defsymbol (&Qcharsetp, "charsetp");
-  defsymbol (&Qregistry, "registry");
-  defsymbol (&Qfinal, "final");
-  defsymbol (&Qgraphic, "graphic");
-  defsymbol (&Qdirection, "direction");
-  defsymbol (&Qreverse_direction_charset, "reverse-direction-charset");
-  defsymbol (&Qshort_name, "short-name");
-  defsymbol (&Qlong_name, "long-name");
+  DEFSYMBOL (Qcharsetp);
+  DEFSYMBOL (Qregistry);
+  DEFSYMBOL (Qfinal);
+  DEFSYMBOL (Qgraphic);
+  DEFSYMBOL (Qdirection);
+  DEFSYMBOL (Qreverse_direction_charset);
+  DEFSYMBOL (Qshort_name);
+  DEFSYMBOL (Qlong_name);
 
-  defsymbol (&Ql2r, "l2r");
-  defsymbol (&Qr2l, "r2l");
+  DEFSYMBOL (Ql2r);
+  DEFSYMBOL (Qr2l);
 
   /* Charsets, compatible with FSF 20.3
      Naming convention is Script-Charset[-Edition] */
-  defsymbol (&Qascii,			"ascii");
-  defsymbol (&Qcontrol_1,		"control-1");
-  defsymbol (&Qlatin_iso8859_1,		"latin-iso8859-1");
-  defsymbol (&Qlatin_iso8859_2,		"latin-iso8859-2");
-  defsymbol (&Qlatin_iso8859_3,		"latin-iso8859-3");
-  defsymbol (&Qlatin_iso8859_4,		"latin-iso8859-4");
-  defsymbol (&Qthai_tis620,		"thai-tis620");
-  defsymbol (&Qgreek_iso8859_7,		"greek-iso8859-7");
-  defsymbol (&Qarabic_iso8859_6,	"arabic-iso8859-6");
-  defsymbol (&Qhebrew_iso8859_8,	"hebrew-iso8859-8");
-  defsymbol (&Qkatakana_jisx0201,	"katakana-jisx0201");
-  defsymbol (&Qlatin_jisx0201,		"latin-jisx0201");
-  defsymbol (&Qcyrillic_iso8859_5, 	"cyrillic-iso8859-5");
-  defsymbol (&Qlatin_iso8859_9,		"latin-iso8859-9");
-  defsymbol (&Qjapanese_jisx0208_1978,	"japanese-jisx0208-1978");
-  defsymbol (&Qchinese_gb2312,		"chinese-gb2312");
-  defsymbol (&Qjapanese_jisx0208, 	"japanese-jisx0208");
-  defsymbol (&Qkorean_ksc5601,		"korean-ksc5601");
-  defsymbol (&Qjapanese_jisx0212,	"japanese-jisx0212");
-  defsymbol (&Qchinese_cns11643_1,	"chinese-cns11643-1");
-  defsymbol (&Qchinese_cns11643_2,	"chinese-cns11643-2");
-  defsymbol (&Qchinese_big5_1,		"chinese-big5-1");
-  defsymbol (&Qchinese_big5_2,		"chinese-big5-2");
+  DEFSYMBOL (Qascii);
+  DEFSYMBOL (Qcontrol_1);
+  DEFSYMBOL (Qlatin_iso8859_1);
+  DEFSYMBOL (Qlatin_iso8859_2);
+  DEFSYMBOL (Qlatin_iso8859_3);
+  DEFSYMBOL (Qlatin_iso8859_4);
+  DEFSYMBOL (Qthai_tis620);
+  DEFSYMBOL (Qgreek_iso8859_7);
+  DEFSYMBOL (Qarabic_iso8859_6);
+  DEFSYMBOL (Qhebrew_iso8859_8);
+  DEFSYMBOL (Qkatakana_jisx0201);
+  DEFSYMBOL (Qlatin_jisx0201);
+  DEFSYMBOL (Qcyrillic_iso8859_5);
+  DEFSYMBOL (Qlatin_iso8859_9);
+  DEFSYMBOL (Qjapanese_jisx0208_1978);
+  DEFSYMBOL (Qchinese_gb2312);
+  DEFSYMBOL (Qjapanese_jisx0208);
+  DEFSYMBOL (Qkorean_ksc5601);
+  DEFSYMBOL (Qjapanese_jisx0212);
+  DEFSYMBOL (Qchinese_cns11643_1);
+  DEFSYMBOL (Qchinese_cns11643_2);
+  DEFSYMBOL (Qchinese_big5_1);
+  DEFSYMBOL (Qchinese_big5_2);
 
-  defsymbol (&Qcomposite,		"composite");
+  DEFSYMBOL (Qcomposite);
 }
 
 void