xemacs-beta: src/lisp.h comparison

comparison src/lisp.h @ 3063:d30cd499e445

[xemacs-hg @ 2005-11-13 10:48:01 by ben] further error-checking, etc. alloc.c, lrecord.h: Move around the handling of setting of lheader->uid so it's in set_lheader_implementation() -- that way, even non-MC-ALLOC builds get useful uid's in their bare lrecords. Redo related code for strings so the non-ascii count that is stored in the uid isn't hosed. events.c: Save and restore the uid around event zeroing/deadbeefing. lisp.h: Set the correct value of MAX_STRING_ASCII_BEGIN under MC_ALLOC. lisp.h: rearrange the basic code handling ints and chars. basic int stuff goes first, followed by basic char stuff, followed in turn by stuff that mixes ints and chars. this is required since some basic defn's have become inline functions. XCHAR and CHARP have additional error-checking in that they check to make sure that the value in question is not just a character but a valid character (i.e. its numeric value is valid). print.c: debug_p4 now has a useful UID in all cases and uses it; but it also prints the raw header address (previously, you just got one of them). text.h: some basic char defn's that belonged in lisp.h have been moved there. valid_ichar_p() is moved too since the inline functions need it.

author	ben
date	Sun, 13 Nov 2005 10:48:04 +0000
parents	1e7cc382eb16
children	d9ca850d40de 3742ea8250b5

comparison

equal deleted inserted replaced

-:21d92abaac3a
+:d30cd499e445
 Ibyte *data_;
 Lisp_Object plist;
 };
 typedef struct Lisp_String Lisp_String;
+#ifdef MC_ALLOC
+#define MAX_STRING_ASCII_BEGIN ((1 << 22) - 1)
+#else
 #define MAX_STRING_ASCII_BEGIN ((1 << 21) - 1)
+#endif
 DECLARE_MODULE_API_LRECORD (string, Lisp_String);
 #define XSTRING(x) XRECORD (x, string, Lisp_String)
 #define wrap_string(p) wrap_record (p, string)
 #define STRINGP(x) RECORDP (x, string)
 /* if (INTP (XMARKER (x)->lheader.next.v)) ABORT (); */
 #define marker_next(m) ((m)->next)
 #define marker_prev(m) ((m)->prev)
+/*-------------------basic int (no connection to char)------------------*/
+#define ZEROP(x) EQ (x, Qzero)
+#ifdef ERROR_CHECK_TYPES
+#define XINT(x) XINT_1 (x, __FILE__, __LINE__)
+DECLARE_INLINE_HEADER (
+EMACS_INT
+XINT_1 (Lisp_Object obj, const Ascbyte *file, int line)
+)
+{
+assert_at_line (INTP (obj), file, line);
+return XREALINT (obj);
+}
+#else /* no error checking */
+#define XINT(obj) XREALINT (obj)
+#endif /* no error checking */
+#define CHECK_INT(x) do {			\
+if (!INTP (x))				\
+dead_wrong_type_argument (Qintegerp, x);	\
+} while (0)
+#define CONCHECK_INT(x) do {			\
+if (!INTP (x))				\
+x = wrong_type_argument (Qintegerp, x);	\
+} while (0)
+#define NATNUMP(x) (INTP (x) && XINT (x) >= 0)
+#define CHECK_NATNUM(x) do {			\
+if (!NATNUMP (x))				\
+dead_wrong_type_argument (Qnatnump, x);	\
+} while (0)
+#define CONCHECK_NATNUM(x) do {			\
+if (!NATNUMP (x))				\
+x = wrong_type_argument (Qnatnump, x);	\
+} while (0)
 /*------------------------------- char ---------------------------------*/
-#define CHARP(x) (XTYPE (x) == Lisp_Type_Char)
+/* NOTE: There are basic functions for converting between a character and
+the string representation of a character in text.h, as well as lots of
+other character-related stuff.  There are other functions/macros for
+working with Ichars in charset.h, for retrieving the charset of an
+Ichar, the length of an Ichar when converted to text, etc.
+*/
+#ifdef MULE
+MODULE_API int non_ascii_valid_ichar_p (Ichar ch);
+/* Return whether the given Ichar is valid.
+*/
+DECLARE_INLINE_HEADER (
+int
+valid_ichar_p (Ichar ch)
+)
+{
+return (! (ch & ~0xFF)) || non_ascii_valid_ichar_p (ch);
+}
+#else /* not MULE */
+/* This works when CH is negative, and correctly returns non-zero only when CH
+is in the range [0, 255], inclusive. */
+#define valid_ichar_p(ch) (! (ch & ~0xFF))
+#endif /* not MULE */
 #ifdef ERROR_CHECK_TYPES
+DECLARE_INLINE_HEADER (
+int
+CHARP_1 (Lisp_Object obj, const Ascbyte *file, int line)
+)
+{
+if (XTYPE (obj) != Lisp_Type_Char)
+return 0;
+assert_at_line (valid_ichar_p (XCHARVAL (obj)), file, line);
+return 1;
+}
+#define CHARP(x) CHARP_1 (x, __FILE__, __LINE__)
 DECLARE_INLINE_HEADER (
 Ichar
 XCHAR_1 (Lisp_Object obj, const Ascbyte *file, int line)
 )
 {
+Ichar ch;
 assert_at_line (CHARP (obj), file, line);
-return XCHARVAL (obj);
+ch = XCHARVAL (obj);
+assert_at_line (valid_ichar_p (ch), file, line);
+return ch;
 }
 #define XCHAR(x) XCHAR_1 (x, __FILE__, __LINE__)
-#else /* no error checking */
+#else /* not ERROR_CHECK_TYPES */
+#define CHARP(x) (XTYPE (x) == Lisp_Type_Char)
 #define XCHAR(x) ((Ichar) XCHARVAL (x))
-#endif /* no error checking */
+#endif /* (else) not ERROR_CHECK_TYPES */
-#define CHECK_CHAR(x) CHECK_NONRECORD (x, Lisp_Type_Char, Qcharacterp)
+#define CONCHECK_CHAR(x) do {			\
-#define CONCHECK_CHAR(x) CONCHECK_NONRECORD (x, Lisp_Type_Char, Qcharacterp)
+if (!CHARP (x))				\
+x = wrong_type_argument (Qcharacterp, x);	\
+} while (0)
-/*------------------------------ float ---------------------------------*/
+#define CHECK_CHAR(x) do {			\
-/* Note: the 'unused_next_' field exists only to ensure that the
+if (!CHARP (x))				\
-`next' pointer fits within the structure, for the purposes of the
+dead_wrong_type_argument (Qcharacterp, x);	\
-free list.  This makes a difference in the unlikely case of
+} while (0)
-sizeof(double) being smaller than sizeof(void *). */
-struct Lisp_Float
+DECLARE_INLINE_HEADER (
-{
+Lisp_Object
-struct lrecord_header lheader;
+make_char (Ichar val)
-union { double d; struct Lisp_Float *unused_next_; } data;
+)
-};
+{
-typedef struct Lisp_Float Lisp_Float;
+type_checking_assert (valid_ichar_p (val));
+/* This is defined in lisp-union.h or lisp-disunion.h */
-DECLARE_LRECORD (float, Lisp_Float);
+return make_char_1 (val);
-#define XFLOAT(x) XRECORD (x, float, Lisp_Float)
+}
-#define wrap_float(p) wrap_record (p, float)
-#define FLOATP(x) RECORDP (x, float)
+/*------------------------- int-char connection ------------------------*/
-#define CHECK_FLOAT(x) CHECK_RECORD (x, float)
-#define CONCHECK_FLOAT(x) CONCHECK_RECORD (x, float)
-#define float_data(f) ((f)->data.d)
-#define XFLOAT_DATA(x) float_data (XFLOAT (x))
-#define XFLOATINT(n) extract_float (n)
-#define CHECK_INT_OR_FLOAT(x) do {		\
-if (!INT_OR_FLOATP (x))			\
-dead_wrong_type_argument (Qnumberp, x);	\
-} while (0)
-#define CONCHECK_INT_OR_FLOAT(x) do {		\
-if (!INT_OR_FLOATP (x))			\
-x = wrong_type_argument (Qnumberp, x);	\
-} while (0)
-# define INT_OR_FLOATP(x) (INTP (x) || FLOATP (x))
-/*-------------------------------- int ---------------------------------*/
-#define ZEROP(x) EQ (x, Qzero)
 #ifdef ERROR_CHECK_TYPES
 #define XCHAR_OR_INT(x) XCHAR_OR_INT_1 (x, __FILE__, __LINE__)
-#define XINT(x) XINT_1 (x, __FILE__, __LINE__)
-DECLARE_INLINE_HEADER (
-EMACS_INT
-XINT_1 (Lisp_Object obj, const Ascbyte *file, int line)
-)
-{
-assert_at_line (INTP (obj), file, line);
-return XREALINT (obj);
-}
 DECLARE_INLINE_HEADER (
 EMACS_INT
 XCHAR_OR_INT_1 (Lisp_Object obj, const Ascbyte *file, int line)
 )
 return CHARP (obj) ? XCHAR (obj) : XINT (obj);
 }
 #else /* no error checking */
-#define XINT(obj) XREALINT (obj)
 #define XCHAR_OR_INT(obj) (CHARP (obj) ? XCHAR (obj) : XINT (obj))
 #endif /* no error checking */
-#define CHECK_INT(x) do {			\
+/* True of X is an integer whose value is the valid integral equivalent of a
-if (!INTP (x))				\
+character. */
-dead_wrong_type_argument (Qintegerp, x);	\
-} while (0)
+#define CHAR_INTP(x) (INTP (x) && valid_ichar_p (XINT (x)))
-#define CONCHECK_INT(x) do {			\
+/* True of X is a character or an integral value that can be converted into a
-if (!INTP (x))				\
+character. */
-x = wrong_type_argument (Qintegerp, x);	\
+#define CHAR_OR_CHAR_INTP(x) (CHARP (x) || CHAR_INTP (x))
-} while (0)
+DECLARE_INLINE_HEADER (
-#define NATNUMP(x) (INTP (x) && XINT (x) >= 0)
+Ichar
+XCHAR_OR_CHAR_INT (Lisp_Object obj)
-#define CHECK_NATNUM(x) do {			\
+)
-if (!NATNUMP (x))				\
+{
-dead_wrong_type_argument (Qnatnump, x);	\
+return CHARP (obj) ? XCHAR (obj) : XINT (obj);
-} while (0)
+}
-#define CONCHECK_NATNUM(x) do {			\
+/* Signal an error if CH is not a valid character or integer Lisp_Object.
-if (!NATNUMP (x))				\
+If CH is an integer Lisp_Object, convert it to a character Lisp_Object,
-x = wrong_type_argument (Qnatnump, x);	\
+but merely by repackaging, without performing tests for char validity.
+*/
+#define CHECK_CHAR_COERCE_INT(x) do {		\
+if (CHARP (x))				\
+;						\
+else if (CHAR_INTP (x))			\
+x = make_char (XINT (x));			\
+else						\
+x = wrong_type_argument (Qcharacterp, x);	\
 } while (0)
 /* next three always continuable because they coerce their arguments. */
 #define CHECK_INT_COERCE_CHAR(x) do {			\
 if (INTP (x))						\
 x = make_int (marker_position (x));				\
 else								\
 x = wrong_type_argument (Qinteger_char_or_marker_p, x);	\
 } while (0)
+/*------------------------------ float ---------------------------------*/
+/* Note: the 'unused_next_' field exists only to ensure that the
+`next' pointer fits within the structure, for the purposes of the
+free list.  This makes a difference in the unlikely case of
+sizeof(double) being smaller than sizeof(void *). */
+struct Lisp_Float
+{
+struct lrecord_header lheader;
+union { double d; struct Lisp_Float *unused_next_; } data;
+};
+typedef struct Lisp_Float Lisp_Float;
+DECLARE_LRECORD (float, Lisp_Float);
+#define XFLOAT(x) XRECORD (x, float, Lisp_Float)
+#define wrap_float(p) wrap_record (p, float)
+#define FLOATP(x) RECORDP (x, float)
+#define CHECK_FLOAT(x) CHECK_RECORD (x, float)
+#define CONCHECK_FLOAT(x) CONCHECK_RECORD (x, float)
+#define float_data(f) ((f)->data.d)
+#define XFLOAT_DATA(x) float_data (XFLOAT (x))
+#define XFLOATINT(n) extract_float (n)
+#define CHECK_INT_OR_FLOAT(x) do {		\
+if (!INT_OR_FLOATP (x))			\
+dead_wrong_type_argument (Qnumberp, x);	\
+} while (0)
+#define CONCHECK_INT_OR_FLOAT(x) do {		\
+if (!INT_OR_FLOATP (x))			\
+x = wrong_type_argument (Qnumberp, x);	\
+} while (0)
+# define INT_OR_FLOATP(x) (INTP (x) || FLOATP (x))
 /*--------------------------- readonly objects -------------------------*/
 #ifndef MC_ALLOC
 #define CHECK_C_WRITEABLE(obj)					\

Mercurial > hg > xemacs-beta

comparison src/lisp.h @ 3063:d30cd499e445