diff src/eval.c @ 578:190b164ddcac

[xemacs-hg @ 2001-05-25 11:26:50 by ben] device-msw.c, eldap.c, emodules.c, hpplay.c, process-unix.c, sound.h, tooltalk.c, win32.c: Revert Martin's attempted compile-warnings fix. It does fix the warnings, but not the right way. We are trying to eliminate the raw use of `char' and `unsigned char' absolutely everywhere. There is never an occasion to reintroduce these. buffer.h: Instead, we fix these macros so they don't care about the type of their lvalues. We already do this for the non-C-string equivalents of these, and it's correct because it should be OK to pass in an SBufbyte *, for example. In any case, we do not need any type-correctness checking here -- errors will be caught for sure as soon as we remove the -Wno-sign-compare switch. mule-charset.c: Use invalid_argument, not generic signal_error (Qerror, ). alloc.c, chartab.c, console-gtk.c, console-msw.c, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console.c, console.h, device-x.c, device.c, elhash.c, eval.c, faces.c, faces.h, fns.c, glyphs.c, glyphs.h, gui.c, gui.h, lisp.h, lread.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, process-unix.c, rangetab.c, search.c, specifier.c, toolbar.c, window.c, window.h: Rename Error_behavior to Error_Behavior, to be consistent with general naming practices (Lisp_Object, Char_Binary, etc.).
author ben
date Fri, 25 May 2001 11:27:01 +0000
parents 183866b06e0b
children 13e3d7ae7155
line wrap: on
line diff
--- a/src/eval.c	Fri May 25 10:04:29 2001 +0000
+++ b/src/eval.c	Fri May 25 11:27:01 2001 +0000
@@ -2122,7 +2122,7 @@
    (2) silently fail and return some error value.
    (3) do as (2) but issue a warning in the process.
 
-   Currently there's lots of stuff that passes an Error_behavior
+   Currently there's lots of stuff that passes an Error_Behavior
    value and calls maybe_signal_error() and other such functions.
    This approach is inherently error-prone and broken.  A much
    more robust and easier approach is to use call_with_suspended_errors().
@@ -2132,7 +2132,7 @@
 
 Lisp_Object
 call_with_suspended_errors (lisp_fn_t fun, volatile Lisp_Object retval,
-			    Lisp_Object class, Error_behavior errb,
+			    Lisp_Object class, Error_Behavior errb,
 			    int nargs, ...)
 {
   va_list vargs;
@@ -2224,7 +2224,7 @@
 
 void
 maybe_signal_error_1 (Lisp_Object sig, Lisp_Object data, Lisp_Object class,
-		      Error_behavior errb)
+		      Error_Behavior errb)
 {
   if (ERRB_EQ (errb, ERROR_ME_NOT))
     return;
@@ -2240,7 +2240,7 @@
 
 Lisp_Object
 maybe_signal_continuable_error_1 (Lisp_Object sig, Lisp_Object data,
-				  Lisp_Object class, Error_behavior errb)
+				  Lisp_Object class, Error_Behavior errb)
 {
   if (ERRB_EQ (errb, ERROR_ME_NOT))
     return Qnil;
@@ -2293,7 +2293,7 @@
 void
 maybe_signal_error (Lisp_Object type, const char *reason,
 		    Lisp_Object frob, Lisp_Object class,
-		    Error_behavior errb)
+		    Error_Behavior errb)
 {
   /* Optimization: */
   if (ERRB_EQ (errb, ERROR_ME_NOT))
@@ -2311,7 +2311,7 @@
 Lisp_Object
 maybe_signal_continuable_error (Lisp_Object type, const char *reason,
 				Lisp_Object frob, Lisp_Object class,
-				Error_behavior errb)
+				Error_Behavior errb)
 {
   /* Optimization: */
   if (ERRB_EQ (errb, ERROR_ME_NOT))
@@ -2341,7 +2341,7 @@
 void
 maybe_signal_error_2 (Lisp_Object type, const char *reason,
 		      Lisp_Object frob0, Lisp_Object frob1,
-		      Lisp_Object class, Error_behavior errb)
+		      Lisp_Object class, Error_Behavior errb)
 {
   /* Optimization: */
   if (ERRB_EQ (errb, ERROR_ME_NOT))
@@ -2361,7 +2361,7 @@
 Lisp_Object
 maybe_signal_continuable_error_2 (Lisp_Object type, const char *reason,
 				  Lisp_Object frob0, Lisp_Object frob1,
-				  Lisp_Object class, Error_behavior errb)
+				  Lisp_Object class, Error_Behavior errb)
 {
   /* Optimization: */
   if (ERRB_EQ (errb, ERROR_ME_NOT))
@@ -2394,7 +2394,7 @@
 }
 
 void
-maybe_signal_ferror (Lisp_Object type, Lisp_Object class, Error_behavior errb,
+maybe_signal_ferror (Lisp_Object type, Lisp_Object class, Error_Behavior errb,
 		     const char *fmt, ...)
 {
   Lisp_Object obj;
@@ -2430,7 +2430,7 @@
 
 Lisp_Object
 maybe_signal_continuable_ferror (Lisp_Object type, Lisp_Object class,
-				 Error_behavior errb, const char *fmt, ...)
+				 Error_Behavior errb, const char *fmt, ...)
 {
   Lisp_Object obj;
   va_list args;
@@ -2481,7 +2481,7 @@
 
 void
 maybe_signal_ferror_with_frob (Lisp_Object type, Lisp_Object frob,
-			       Lisp_Object class, Error_behavior errb,
+			       Lisp_Object class, Error_Behavior errb,
 			       const char *fmt, ...)
 {
   Lisp_Object obj;
@@ -2520,7 +2520,7 @@
 Lisp_Object
 maybe_signal_continuable_ferror_with_frob (Lisp_Object type, Lisp_Object frob,
 					   Lisp_Object class,
-					   Error_behavior errb,
+					   Error_Behavior errb,
 					   const char *fmt, ...)
 {
   Lisp_Object obj;
@@ -2616,7 +2616,7 @@
 
 void
 maybe_syntax_error (const char *reason, Lisp_Object frob,
-		    Lisp_Object class, Error_behavior errb)
+		    Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qsyntax_error, reason, frob, class, errb);
 }
@@ -2635,7 +2635,7 @@
 
 void
 maybe_sferror (const char *reason, Lisp_Object frob,
-	       Lisp_Object class, Error_behavior errb)
+	       Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qstructure_formation_error, reason, frob, class, errb);
 }
@@ -2654,7 +2654,7 @@
 
 void
 maybe_invalid_argument (const char *reason, Lisp_Object frob,
-			Lisp_Object class, Error_behavior errb)
+			Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qinvalid_argument, reason, frob, class, errb);
 }
@@ -2673,7 +2673,7 @@
 
 void
 maybe_invalid_constant (const char *reason, Lisp_Object frob,
-			Lisp_Object class, Error_behavior errb)
+			Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qinvalid_constant, reason, frob, class, errb);
 }
@@ -2692,7 +2692,7 @@
 
 void
 maybe_invalid_operation (const char *reason, Lisp_Object frob,
-			 Lisp_Object class, Error_behavior errb)
+			 Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qinvalid_operation, reason, frob, class, errb);
 }
@@ -2711,7 +2711,7 @@
 
 void
 maybe_invalid_change (const char *reason, Lisp_Object frob,
-		      Lisp_Object class, Error_behavior errb)
+		      Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qinvalid_change, reason, frob, class, errb);
 }
@@ -2730,7 +2730,7 @@
 
 void
 maybe_invalid_state (const char *reason, Lisp_Object frob,
-		     Lisp_Object class, Error_behavior errb)
+		     Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qinvalid_state, reason, frob, class, errb);
 }