comparison src/character.h @ 108881:5582106cddf0

Remove obsolete pre-unicode2 macros. * character.h (MULTIBYTE_FORM_LENGTH, PARSE_MULTIBYTE_SEQ): Remove. * composite.c (composition_reseat_it): * data.c (Faset): * fns.c (Ffillarray): * regex.c (re_search_2): Use BYTES_BY_CHAR_HEAD. [!emacs] (BYTES_BY_CHAR_HEAD): Define instead of MULTIBYTE_FORM_LENGTH.
author Juanma Barranquero <lekktu@gmail.com>
date Thu, 03 Jun 2010 21:02:32 +0200
parents bef5d1738c0b
children d9257436d2b1
comparison
equal deleted inserted replaced
108880:f4a583b69ffa 108881:5582106cddf0
232 : !((byte) & 0x20) ? 2 \ 232 : !((byte) & 0x20) ? 2 \
233 : !((byte) & 0x10) ? 3 \ 233 : !((byte) & 0x10) ? 3 \
234 : !((byte) & 0x08) ? 4 \ 234 : !((byte) & 0x08) ? 4 \
235 : 5) 235 : 5)
236 236
237
238 /* Return the length of the multi-byte form at string STR of length
239 LEN while assuming that STR points a valid multi-byte form. As
240 this macro isn't necessary anymore, all callers will be changed to
241 use BYTES_BY_CHAR_HEAD directly in the future. */
242
243 #define MULTIBYTE_FORM_LENGTH(str, len) \
244 BYTES_BY_CHAR_HEAD (*(str))
245
246 /* Parse multibyte string STR of length LENGTH and set BYTES to the
247 byte length of a character at STR while assuming that STR points a
248 valid multibyte form. As this macro isn't necessary anymore, all
249 callers will be changed to use BYTES_BY_CHAR_HEAD directly in the
250 future. */
251
252 #define PARSE_MULTIBYTE_SEQ(str, length, bytes) \
253 (bytes) = BYTES_BY_CHAR_HEAD (*(str))
254 237
255 /* The byte length of multibyte form at unibyte string P ending at 238 /* The byte length of multibyte form at unibyte string P ending at
256 PEND. If STR doesn't point to a valid multibyte form, return 0. */ 239 PEND. If STR doesn't point to a valid multibyte form, return 0. */
257 240
258 #define MULTIBYTE_LENGTH(p, pend) \ 241 #define MULTIBYTE_LENGTH(p, pend) \