Commit a2a01861 authored by Paul Eggert's avatar Paul Eggert
Browse files

* character.h, charset.h: Use verify_expr, not verify_true.

parent dfc92624
...@@ -175,7 +175,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -175,7 +175,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
(p)[1] = (0x80 | (((c) >> 6) & 0x3F)), \ (p)[1] = (0x80 | (((c) >> 6) & 0x3F)), \
(p)[2] = (0x80 | ((c) & 0x3F)), \ (p)[2] = (0x80 | ((c) & 0x3F)), \
3) \ 3) \
: (char_string (c, p) + !verify_true (sizeof (c) <= sizeof (unsigned)))) : verify_expr (sizeof (c) <= sizeof (unsigned), char_string (c, p)))
/* Store multibyte form of byte B in P. The caller should allocate at /* Store multibyte form of byte B in P. The caller should allocate at
least MAX_MULTIBYTE_LENGTH bytes area at P in advance. Returns the least MAX_MULTIBYTE_LENGTH bytes area at P in advance. Returns the
......
...@@ -426,29 +426,30 @@ extern Lisp_Object charset_work; ...@@ -426,29 +426,30 @@ extern Lisp_Object charset_work;
/* Return a code point of CHAR in CHARSET. /* Return a code point of CHAR in CHARSET.
Try some optimization before calling encode_char. */ Try some optimization before calling encode_char. */
#define ENCODE_CHAR(charset, c) \ #define ENCODE_CHAR(charset, c) \
((ASCII_CHAR_P (c) && (charset)->ascii_compatible_p) \ (verify_expr \
? (c) \ (sizeof (c) <= sizeof (int), \
: (!verify_true (sizeof (c) <= sizeof (int)) \ (ASCII_CHAR_P (c) && (charset)->ascii_compatible_p \
|| (charset)->unified_p \ ? (c) \
|| (charset)->method == CHARSET_METHOD_SUBSET \ : ((charset)->unified_p \
|| (charset)->method == CHARSET_METHOD_SUPERSET) \ || (charset)->method == CHARSET_METHOD_SUBSET \
? encode_char ((charset), (c)) \ || (charset)->method == CHARSET_METHOD_SUPERSET) \
: ((c) < (charset)->min_char || (c) > (charset)->max_char) \ ? encode_char (charset, c) \
? (charset)->invalid_code \ : (c) < (charset)->min_char || (c) > (charset)->max_char \
: (charset)->method == CHARSET_METHOD_OFFSET \ ? (charset)->invalid_code \
? ((charset)->code_linear_p \ : (charset)->method == CHARSET_METHOD_OFFSET \
? (c) - (charset)->code_offset + (charset)->min_code \ ? ((charset)->code_linear_p \
: encode_char ((charset), (c))) \ ? (c) - (charset)->code_offset + (charset)->min_code \
: (charset)->method == CHARSET_METHOD_MAP \ : encode_char (charset, c)) \
? (((charset)->compact_codes_p \ : (charset)->method == CHARSET_METHOD_MAP \
&& CHAR_TABLE_P (CHARSET_ENCODER (charset))) \ ? (((charset)->compact_codes_p \
? (charset_work = CHAR_TABLE_REF (CHARSET_ENCODER (charset), (c)), \ && CHAR_TABLE_P (CHARSET_ENCODER (charset))) \
(NILP (charset_work) \ ? (charset_work = CHAR_TABLE_REF (CHARSET_ENCODER (charset), c), \
? (charset)->invalid_code \ (NILP (charset_work) \
: XFASTINT (charset_work))) \ ? (charset)->invalid_code \
: encode_char ((charset), (c))) \ : XFASTINT (charset_work))) \
: encode_char ((charset), (c))) : encode_char (charset, c)) \
: encode_char (charset, c))))
/* Set to 1 when a charset map is loaded to warn that a buffer text /* Set to 1 when a charset map is loaded to warn that a buffer text
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment