diff src/doprnt.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 3078fd1074e8
children 430f8ca10ca6
line wrap: on
line diff
--- a/src/doprnt.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/doprnt.c	Thu May 24 07:51:33 2001 +0000
@@ -130,7 +130,7 @@
   while (start != end && isdigit (*start))
     {
       if ((size_t) (arg_ptr - arg_convert) >= sizeof (arg_convert) - 1)
-	error ("Format converter number too large");
+ syntax_error ("Format converter number too large", Qunbound);
       *arg_ptr++ = *start++;
     }
   *arg_ptr = '\0';
@@ -142,10 +142,10 @@
 #define NEXT_ASCII_BYTE(ch)					\
   do {								\
     if (fmt == fmt_end)						\
-      error ("Premature end of format string");			\
+      syntax_error ("Premature end of format string", Qunbound);			\
     ch = *fmt;							\
     if (ch >= 0200)						\
-      error ("Non-ASCII character in format converter spec");	\
+      syntax_error ("Non-ASCII character in format converter spec", Qunbound);	\
     fmt++;							\
   } while (0)
 
@@ -296,7 +296,7 @@
 	    }
 
 	  if (!strchr (valid_converters, ch))
-	    error ("Invalid converter character %c", ch);
+	    syntax_error ("Invalid converter character", make_char (ch));
 	  spec.converter = ch;
 	}
 
@@ -356,7 +356,7 @@
 	}
 
       if (j == Dynarr_length (specs))
-	error ("No conversion spec for argument %d", i);
+ syntax_error ("No conversion spec for argument", make_int (i));
 
       ch = spec->converter;
 
@@ -425,7 +425,7 @@
     {
       /* allow too many args for string, but not too few */
       if (nargs < get_args_needed (specs))
-	signal_error (Qwrong_number_of_arguments,
+	signal_error_1 (Qwrong_number_of_arguments,
 		      list3 (Qformat,
 			     make_int (nargs),
 			     !NILP (format_reloc) ? format_reloc :
@@ -493,7 +493,7 @@
 	}
 
       if (largs && (spec->argnum < 1 || spec->argnum > nargs))
-	error ("Invalid repositioning argument %d", spec->argnum);
+ syntax_error ("Invalid repositioning argument", make_int (spec->argnum));
 
       else if (ch == 'S' || ch == 's')
 	{
@@ -558,7 +558,7 @@
 		obj = make_int (XCHAR (obj));
 	      if (!INT_OR_FLOATP (obj))
 		{
-		  error ("format specifier %%%c doesn't match argument type",
+		  syntax_error ("format specifier %%%c doesn't match argument type",
 			 ch);
 		}
 	      else if (strchr (double_converters, ch))
@@ -585,7 +585,7 @@
 	      a = (Emchar) arg.l;
 
 	      if (!valid_char_p (a))
-		error ("invalid character value %d to %%c spec", a);
+	 syntax_error ("invalid character value %d to %%c spec", a);
 
 	      charlen = set_charptr_emchar (charbuf, a);
 	      doprnt_1 (stream, charbuf, charlen, spec->minwidth,