Mercurial > hg > xemacs-beta

diff src/lisp.h @ 578:190b164ddcac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 910449c92002
children 5fd7ba8b56e7
line wrap: on
line diff
--- a/src/lisp.h	Fri May 25 10:04:29 2001 +0000
+++ b/src/lisp.h	Fri May 25 11:27:01 2001 +0000
@@ -520,7 +520,7 @@
   ERROR_ME,
   ERROR_ME_NOT,
   ERROR_ME_WARN
-} Error_behavior;
+} Error_Behavior;
 
 #define ERRB_EQ(a, b) ((a) == (b))
 
@@ -532,11 +532,11 @@
 typedef struct _error_behavior_struct_
 {
   int really_unlikely_name_to_have_accidentally_in_a_non_errb_structure;
-} Error_behavior;
-
-extern Error_behavior ERROR_ME;
-extern Error_behavior ERROR_ME_NOT;
-extern Error_behavior ERROR_ME_WARN;
+} Error_Behavior;
+
+extern Error_Behavior ERROR_ME;
+extern Error_Behavior ERROR_ME_NOT;
+extern Error_Behavior ERROR_ME_WARN;
 
 #define ERRB_EQ(a, b)							   \
  ((a).really_unlikely_name_to_have_accidentally_in_a_non_errb_structure == \
@@ -1590,7 +1590,7 @@
 {
   Lisp_Object keyword;
   int (*validate) (Lisp_Object keyword, Lisp_Object value,
-		   Error_behavior errb);
+		   Error_Behavior errb);
 };
 
 typedef struct
@@ -1603,7 +1603,7 @@
 {
   Lisp_Object type;
   structure_keyword_entry_dynarr *keywords;
-  int (*validate) (Lisp_Object data, Error_behavior errb);
+  int (*validate) (Lisp_Object data, Error_Behavior errb);
   Lisp_Object (*instantiate) (Lisp_Object data);
 };
 
@@ -1615,14 +1615,14 @@
 struct structure_type *define_structure_type (Lisp_Object type,
 					      int (*validate)
 					      (Lisp_Object data,
-					       Error_behavior errb),
+					       Error_Behavior errb),
 					      Lisp_Object (*instantiate)
 					      (Lisp_Object data));
 void define_structure_type_keyword (struct structure_type *st,
 				    Lisp_Object keyword,
 				    int (*validate) (Lisp_Object keyword,
 						     Lisp_Object value,
-						     Error_behavior errb));
+						     Error_Behavior errb));
 
 /*---------------------------- weak lists ------------------------------*/
 
@@ -2460,18 +2460,18 @@
 /* Defined in eval.c */
 DECLARE_DOESNT_RETURN (signal_error_1 (Lisp_Object, Lisp_Object));
 void maybe_signal_error_1 (Lisp_Object, Lisp_Object, Lisp_Object,
-			   Error_behavior);
+			   Error_Behavior);
 Lisp_Object maybe_signal_continuable_error_1 (Lisp_Object, Lisp_Object,
-					      Lisp_Object, Error_behavior);
+					      Lisp_Object, Error_Behavior);
 DECLARE_DOESNT_RETURN_GCC_ATTRIBUTE_SYNTAX_SUCKS (signal_ferror (Lisp_Object,
 								 const char *,
 								 ...), 2, 3);
-void maybe_signal_ferror (Lisp_Object, Lisp_Object, Error_behavior,
+void maybe_signal_ferror (Lisp_Object, Lisp_Object, Error_Behavior,
 			  const char *, ...) PRINTF_ARGS (4, 5);
 Lisp_Object signal_continuable_ferror (Lisp_Object, const char *, ...)
      PRINTF_ARGS (2, 3);
 Lisp_Object maybe_signal_continuable_ferror (Lisp_Object, Lisp_Object,
-					     Error_behavior,
+					     Error_Behavior,
 					     const char *, ...)
      PRINTF_ARGS (4, 5);
 
@@ -2479,18 +2479,18 @@
 DECLARE_DOESNT_RETURN (signal_error (Lisp_Object, const char *,
 				     Lisp_Object));
 void maybe_signal_error (Lisp_Object, const char *, Lisp_Object,
-			 Lisp_Object, Error_behavior);
+			 Lisp_Object, Error_Behavior);
 Lisp_Object signal_continuable_error (Lisp_Object, const char *,
 				      Lisp_Object);
 Lisp_Object maybe_signal_continuable_error (Lisp_Object, const char *,
 					    Lisp_Object,
-					    Lisp_Object, Error_behavior);
+					    Lisp_Object, Error_Behavior);
 DECLARE_DOESNT_RETURN_GCC_ATTRIBUTE_SYNTAX_SUCKS (signal_ferror_with_frob
 						  (Lisp_Object, Lisp_Object,
 						   const char *,
 						   ...), 3, 4);
 void maybe_signal_ferror_with_frob (Lisp_Object, Lisp_Object, Lisp_Object,
-				    Error_behavior,
+				    Error_Behavior,
 				    const char *, ...) PRINTF_ARGS (5, 6);
 Lisp_Object signal_continuable_ferror_with_frob (Lisp_Object, Lisp_Object,
 						 const char *,
@@ -2498,19 +2498,19 @@
 Lisp_Object maybe_signal_continuable_ferror_with_frob (Lisp_Object,
 						       Lisp_Object,
 						       Lisp_Object,
-						       Error_behavior,
+						       Error_Behavior,
 						       const char *, ...)
      PRINTF_ARGS (5, 6);
 DECLARE_DOESNT_RETURN (signal_error_2 (Lisp_Object, const char *,
 				       Lisp_Object, Lisp_Object));
 void maybe_signal_error_2 (Lisp_Object, const char *, Lisp_Object,
-			   Lisp_Object, Lisp_Object, Error_behavior);
+			   Lisp_Object, Lisp_Object, Error_Behavior);
 Lisp_Object signal_continuable_error_2 (Lisp_Object, const char *,
 					Lisp_Object, Lisp_Object);
 Lisp_Object maybe_signal_continuable_error_2 (Lisp_Object, const char *,
 					      Lisp_Object, Lisp_Object,
 					      Lisp_Object,
-					      Error_behavior);
+					      Error_Behavior);
 
 
 DECLARE_DOESNT_RETURN (signal_malformed_list_error (Lisp_Object));
@@ -2522,47 +2522,47 @@
 DECLARE_DOESNT_RETURN (syntax_error_2 (const char *reason, Lisp_Object frob1,
 				       Lisp_Object frob2));
 void maybe_syntax_error (const char *, Lisp_Object, Lisp_Object,
-			 Error_behavior);
+			 Error_Behavior);
 DECLARE_DOESNT_RETURN (sferror (const char *reason, Lisp_Object frob));
 DECLARE_DOESNT_RETURN (sferror_2 (const char *reason, Lisp_Object frob1,
 				  Lisp_Object frob2));
 void maybe_sferror (const char *, Lisp_Object, Lisp_Object,
-		    Error_behavior);
+		    Error_Behavior);
 DECLARE_DOESNT_RETURN (invalid_argument (const char *reason,
 					 Lisp_Object frob));
 DECLARE_DOESNT_RETURN (invalid_argument_2 (const char *reason,
 					   Lisp_Object frob1,
 					   Lisp_Object frob2));
 void maybe_invalid_argument (const char *, Lisp_Object, Lisp_Object,
-			     Error_behavior);
+			     Error_Behavior);
 DECLARE_DOESNT_RETURN (invalid_operation (const char *reason,
 					 Lisp_Object frob));
 DECLARE_DOESNT_RETURN (invalid_operation_2 (const char *reason,
 					   Lisp_Object frob1,
 					   Lisp_Object frob2));
 void maybe_invalid_operation (const char *, Lisp_Object, Lisp_Object,
-			     Error_behavior);
+			     Error_Behavior);
 DECLARE_DOESNT_RETURN (invalid_state (const char *reason,
 					 Lisp_Object frob));
 DECLARE_DOESNT_RETURN (invalid_state_2 (const char *reason,
 					   Lisp_Object frob1,
 					   Lisp_Object frob2));
 void maybe_invalid_state (const char *, Lisp_Object, Lisp_Object,
-			     Error_behavior);
+			     Error_Behavior);
 DECLARE_DOESNT_RETURN (invalid_change (const char *reason,
 					 Lisp_Object frob));
 DECLARE_DOESNT_RETURN (invalid_change_2 (const char *reason,
 					   Lisp_Object frob1,
 					   Lisp_Object frob2));
 void maybe_invalid_change (const char *, Lisp_Object, Lisp_Object,
-			     Error_behavior);
+			     Error_Behavior);
 DECLARE_DOESNT_RETURN (invalid_constant (const char *reason,
 					 Lisp_Object frob));
 DECLARE_DOESNT_RETURN (invalid_constant_2 (const char *reason,
 					   Lisp_Object frob1,
 					   Lisp_Object frob2));
 void maybe_invalid_constant (const char *, Lisp_Object, Lisp_Object,
-			     Error_behavior);
+			     Error_Behavior);
 DECLARE_DOESNT_RETURN (wtaerror (const char *reason, Lisp_Object frob));
 DECLARE_DOESNT_RETURN (out_of_memory (const char *reason,
 				      Lisp_Object frob));
@@ -2624,7 +2624,7 @@
 Lisp_Object call2_trapping_errors (const char *,
 				   Lisp_Object, Lisp_Object, Lisp_Object);
 Lisp_Object call_with_suspended_errors (lisp_fn_t, volatile Lisp_Object, Lisp_Object,
-					Error_behavior, int, ...);
+					Error_Behavior, int, ...);
 /* C Code should be using internal_catch, record_unwind_p, condition_case_1 */
 Lisp_Object internal_catch (Lisp_Object, Lisp_Object (*) (Lisp_Object),
 			    Lisp_Object, int * volatile);
@@ -2712,10 +2712,10 @@
 void internal_plist_put (Lisp_Object *, Lisp_Object, Lisp_Object);
 int internal_remprop (Lisp_Object *, Lisp_Object);
 Lisp_Object external_plist_get (Lisp_Object *, Lisp_Object,
-				int, Error_behavior);
+				int, Error_Behavior);
 void external_plist_put (Lisp_Object *, Lisp_Object,
-			 Lisp_Object, int, Error_behavior);
-int external_remprop (Lisp_Object *, Lisp_Object, int, Error_behavior);
+			 Lisp_Object, int, Error_Behavior);
+int external_remprop (Lisp_Object *, Lisp_Object, int, Error_Behavior);
 int internal_equal (Lisp_Object, Lisp_Object, int);
 Lisp_Object concat2 (Lisp_Object, Lisp_Object);
 Lisp_Object concat3 (Lisp_Object, Lisp_Object, Lisp_Object);
@@ -2726,8 +2726,8 @@
 void check_losing_bytecode (const char *, Lisp_Object);
 
 /* Defined in glyphs.c */
-Error_behavior decode_error_behavior_flag (Lisp_Object);
-Lisp_Object encode_error_behavior_flag (Error_behavior);
+Error_Behavior decode_error_behavior_flag (Lisp_Object);
+Lisp_Object encode_error_behavior_flag (Error_Behavior);
 
 /* Defined in glyphs-shared.c */
 void shared_resource_validate (Lisp_Object instantiator);
@@ -2877,10 +2877,10 @@
 Bytind bi_find_next_emchar_in_string (Lisp_String*, Emchar, Bytind, EMACS_INT);
 Bufpos find_before_next_newline (struct buffer *, Bufpos, Bufpos, int);
 struct re_pattern_buffer *compile_pattern (Lisp_Object, struct re_registers *,
-					   Lisp_Object, int, Error_behavior);
+					   Lisp_Object, int, Error_Behavior);
 Bytecount fast_string_match (Lisp_Object,  const Bufbyte *,
 			     Lisp_Object, Bytecount,
-			     Bytecount, int, Error_behavior, int);
+			     Bytecount, int, Error_Behavior, int);
 Bytecount fast_lisp_string_match (Lisp_Object, Lisp_Object);
 void restore_match_data (void);
 extern Fixnum warn_about_possibly_incompatible_back_references;
@@ -2898,9 +2898,9 @@
 
 /* Defined in specifier.c */
 Lisp_Object specifier_instance (Lisp_Object, Lisp_Object, Lisp_Object,
-				Error_behavior, int, int, Lisp_Object);
+				Error_Behavior, int, int, Lisp_Object);
 Lisp_Object specifier_instance_no_quit (Lisp_Object, Lisp_Object, Lisp_Object,
-					Error_behavior, int, Lisp_Object);
+					Error_Behavior, int, Lisp_Object);
 
 /* Defined in symbols.c */
 unsigned int hash_string (const Bufbyte *, Bytecount);