Mercurial > hg > xemacs-beta

diff src/search.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 167135c7a7ae
children 190b164ddcac
line wrap: on
line diff
--- a/src/search.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/search.c	Thu May 24 07:51:33 2001 +0000
@@ -126,7 +126,7 @@
 static void
 matcher_overflow (void)
 {
-  error ("Stack overflow in regexp matcher");
+  stack_overflow ("Stack overflow in regexp matcher", Qunbound);
 }
 
 /* Compile a regexp and signal a Lisp error if anything goes wrong.
@@ -159,7 +159,7 @@
   re_set_syntax (old);
   if (val)
     {
-      maybe_signal_error (Qinvalid_regexp, list1 (build_string (val)),
+      maybe_signal_error (Qinvalid_regexp, 0, build_string (val),
 			  Qsearch, errb);
       return 0;
     }
@@ -829,7 +829,7 @@
 	  if (c < 0400 && syntax_spec_code[c] < (unsigned char) Smax)
 	    fastmap[c] = 1;
 	  else
-	    signal_simple_error ("Invalid syntax designator",
+	    invalid_argument ("Invalid syntax designator",
 				 make_char (c));
 	}
       else
@@ -1037,7 +1037,8 @@
       CHECK_INT_COERCE_MARKER (limit);
       lim = XINT (limit);
       if (n > 0 ? lim < BUF_PT (buf) : lim > BUF_PT (buf))
-	error ("Invalid search limit (wrong side of point)");
+	invalid_argument ("Invalid search limit (wrong side of point)",
+			  Qunbound);
       if (lim > BUF_ZV (buf))
 	lim = BUF_ZV (buf);
       if (lim < BUF_BEGV (buf))
@@ -2280,7 +2281,7 @@
     {
       CHECK_STRING (string);
       if (!EQ (last_thing_searched, Qt))
-	error ("last thing matched was not a string");
+ invalid_argument ("last thing matched was not a string", Qunbound);
       /* If the match data
 	 were abstracted into a special "match data" type instead
 	 of the typical half-assed "let the implementation be
@@ -2302,7 +2303,7 @@
 	    args_out_of_range (strbuffer, make_int (search_regs.num_regs));
 	}
       if (!BUFFERP (last_thing_searched))
-	error ("last thing matched was not a buffer");
+ invalid_argument ("last thing matched was not a buffer", Qunbound);
       buffer = last_thing_searched;
       buf = XBUFFER (buffer);
     }
@@ -2313,7 +2314,7 @@
 				/* but some C compilers blew it */
 
   if (search_regs.num_regs == 0)
-    error ("replace-match called before any match found");
+    signal_error (Qinvalid_operation, "replace-match called before any match found", Qunbound);
 
   if (NILP (string))
     {
@@ -2747,7 +2748,7 @@
   Charcount len;
 
   if (NILP (last_thing_searched))
-    /*error ("match-data called before any match found");*/
+    /*error ("match-data called before any match found", Qunbound);*/
     return Qnil;
 
   data = alloca_array (Lisp_Object, 2 * search_regs.num_regs);
@@ -2982,6 +2983,7 @@
 
   DEFERROR_STANDARD (Qsearch_failed, Qinvalid_operation);
   DEFERROR_STANDARD (Qinvalid_regexp, Qsyntax_error);
+  Fput (Qinvalid_regexp, Qerror_lacks_explanatory_string, Qt);
 
   DEFSUBR (Flooking_at);
   DEFSUBR (Fposix_looking_at);