Skip to content

Commit 3536926

Browse files
committed
Convert _utf8_safe_assert to legal name
1 parent f48864d commit 3536926

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

handy.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2247,13 +2247,13 @@ END_EXTERN_C
22472247
* bunch of code in toke.c assumes that this is true, so the assertion allows
22482248
* for that */
22492249
#ifdef PERL_IN_TOKE_C
2250-
# define _utf8_safe_assert(p,e) ((e) > (p) || ((e) == (p) && *(p) == '\0'))
2250+
# define utf8_safe_assert_(p,e) ((e) > (p) || ((e) == (p) && *(p) == '\0'))
22512251
#else
2252-
# define _utf8_safe_assert(p,e) ((e) > (p))
2252+
# define utf8_safe_assert_(p,e) ((e) > (p))
22532253
#endif
22542254

22552255
#define generic_utf8_safe_(classnum, p, e, above_latin1) \
2256-
((! _utf8_safe_assert(p, e)) \
2256+
((! utf8_safe_assert_(p, e)) \
22572257
? (force_out_malformed_utf8_message_((U8 *) (p), (U8 *) (e), 0, MALFORMED_UTF8_DIE), 0)\
22582258
: (UTF8_IS_INVARIANT(*(p))) \
22592259
? generic_isCC_(*(p), classnum) \
@@ -2284,7 +2284,7 @@ END_EXTERN_C
22842284
* class is TRUE for. Hence it can skip the tests for this range.
22852285
* 'above_latin1' should include its arguments */
22862286
#define generic_utf8_safe_no_upper_latin1_(classnum, p, e, above_latin1) \
2287-
(__ASSERT_(_utf8_safe_assert(p, e)) \
2287+
(__ASSERT_(utf8_safe_assert_(p, e)) \
22882288
(isASCII(*(p))) \
22892289
? generic_isCC_(*(p), classnum) \
22902290
: (UTF8_IS_DOWNGRADEABLE_START(*(p))) \
@@ -2317,15 +2317,15 @@ END_EXTERN_C
23172317
#define isASCII_utf8_safe(p, e) \
23182318
/* Because ASCII is invariant under utf8, the non-utf8 macro \
23192319
* works */ \
2320-
(__ASSERT_(_utf8_safe_assert(p, e)) isASCII(*(p)))
2320+
(assert_(utf8_safe_assert_(p, e)) isASCII(*(p)))
23212321
#define isBLANK_utf8_safe(p, e) \
23222322
generic_non_invlist_utf8_safe_(CC_BLANK_, is_HORIZWS_high, p, e)
23232323

23242324
#ifdef EBCDIC
23252325
/* Because all controls are UTF-8 invariants in EBCDIC, we can use this
23262326
* more efficient macro instead of the more general one */
23272327
# define isCNTRL_utf8_safe(p, e) \
2328-
(__ASSERT_(_utf8_safe_assert(p, e)) isCNTRL_L1(*(p)))
2328+
(assert_(utf8_safe_assert_(p, e)) isCNTRL_L1(*(p)))
23292329
#else
23302330
# define isCNTRL_utf8_safe(p, e) generic_utf8_safe_(CC_CNTRL_, p, e, 0)
23312331
#endif
@@ -2404,7 +2404,7 @@ END_EXTERN_C
24042404
* point in 'p' is within the 0-255 range, it uses locale rules from the
24052405
* passed-in 'macro' parameter */
24062406
#define generic_LC_utf8_safe_(macro, p, e, above_latin1) \
2407-
(__ASSERT_(_utf8_safe_assert(p, e)) \
2407+
(assert_(utf8_safe_assert_(p, e)) \
24082408
(UTF8_IS_INVARIANT(*(p))) \
24092409
? macro(*(p)) \
24102410
: (UTF8_IS_DOWNGRADEABLE_START(*(p)) \
@@ -2434,7 +2434,7 @@ END_EXTERN_C
24342434
#define isALPHA_LC_utf8_safe(p, e) \
24352435
generic_LC_invlist_utf8_safe_(isALPHA_LC, CC_ALPHA_, p, e)
24362436
#define isASCII_LC_utf8_safe(p, e) \
2437-
(__ASSERT_(_utf8_safe_assert(p, e)) isASCII_LC(*(p)))
2437+
(assert_(utf8_safe_assert_(p, e)) isASCII_LC(*(p)))
24382438
#define isBLANK_LC_utf8_safe(p, e) \
24392439
generic_LC_non_invlist_utf8_safe_(isBLANK_LC, is_HORIZWS_high, p, e)
24402440
#define isCNTRL_LC_utf8_safe(p, e) \

0 commit comments

Comments
 (0)