diff options
author | Karl Williamson <khw@cpan.org> | 2019-09-10 10:59:04 -0600 |
---|---|---|
committer | Karl Williamson <khw@cpan.org> | 2019-09-15 10:39:56 -0600 |
commit | 1376b35c0aca7ec6b61283ddea3aa1c58bcb88de (patch) | |
tree | de98573569fff0a6aac64df6ae61c9c917137437 | |
parent | c9182d9cfe39bfb5131aaf232745d5856cbf79eb (diff) | |
download | perl-1376b35c0aca7ec6b61283ddea3aa1c58bcb88de.tar.gz |
Strip leading underscore from is_utf8_char_helper()
Leading underscored name are reserved for the C implementers
-rw-r--r-- | embed.fnc | 2 | ||||
-rw-r--r-- | embed.h | 2 | ||||
-rw-r--r-- | inline.h | 4 | ||||
-rw-r--r-- | proto.h | 12 | ||||
-rw-r--r-- | utf8.c | 4 | ||||
-rw-r--r-- | utf8.h | 6 |
6 files changed, 15 insertions, 15 deletions
@@ -939,7 +939,7 @@ pR |OP* |invert |NULLOK OP* cmd ApR |I32 |is_lvalue_sub : Used in cop.h XopR |I32 |was_lvalue_sub -CpRTP |STRLEN |_is_utf8_char_helper|NN const U8 * const s|NN const U8 * e|const U32 flags +CpRTP |STRLEN |is_utf8_char_helper|NN const U8 * const s|NN const U8 * e|const U32 flags CbDpR |U32 |to_uni_upper_lc|U32 c CbDpR |U32 |to_uni_title_lc|U32 c CbDpR |U32 |to_uni_lower_lc|U32 c @@ -33,7 +33,6 @@ #define _is_uni_perl_idstart(a) Perl__is_uni_perl_idstart(aTHX_ a) #define _is_utf8_FOO(a,b,c,d,e,f,g,h) Perl__is_utf8_FOO(aTHX_ a,b,c,d,e,f,g,h) #define _is_utf8_FOO_with_len(a,b,c) Perl__is_utf8_FOO_with_len(aTHX_ a,b,c) -#define _is_utf8_char_helper Perl__is_utf8_char_helper #define _is_utf8_idcont(a) Perl__is_utf8_idcont(aTHX_ a) #define _is_utf8_idstart(a) Perl__is_utf8_idstart(aTHX_ a) #define _is_utf8_mark(a) Perl__is_utf8_mark(aTHX_ a) @@ -383,6 +382,7 @@ #ifndef NO_MATHOMS #define is_utf8_char Perl_is_utf8_char #endif +#define is_utf8_char_helper Perl_is_utf8_char_helper #ifndef NO_MATHOMS #define is_utf8_cntrl(a) Perl_is_utf8_cntrl(aTHX_ a) #endif @@ -1078,7 +1078,7 @@ Perl_isUTF8_CHAR(const U8 * const s0, const U8 * const e) #if defined(UV_IS_QUAD) || defined(EBCDIC) if (NATIVE_UTF8_TO_I8(*s0) == 0xFF && e - s0 >= UTF8_MAXBYTES) { - return _is_utf8_char_helper(s0, e, 0); + return is_utf8_char_helper(s0, e, 0); } #endif @@ -1702,7 +1702,7 @@ Perl_is_utf8_valid_partial_char_flags(const U8 * const s, const U8 * const e, co return FALSE; } - return cBOOL(_is_utf8_char_helper(s, e, flags)); + return cBOOL(is_utf8_char_helper(s, e, flags)); } /* @@ -98,12 +98,6 @@ PERL_CALLCONV bool Perl__is_utf8_FOO_with_len(pTHX_ const U8 classnum, const U8 #define PERL_ARGS_ASSERT__IS_UTF8_FOO_WITH_LEN \ assert(p); assert(e) -PERL_CALLCONV STRLEN Perl__is_utf8_char_helper(const U8 * const s, const U8 * e, const U32 flags) - __attribute__warn_unused_result__ - __attribute__pure__; -#define PERL_ARGS_ASSERT__IS_UTF8_CHAR_HELPER \ - assert(s); assert(e) - PERL_CALLCONV bool Perl__is_utf8_idcont(pTHX_ const U8 *p) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT__IS_UTF8_IDCONT \ @@ -1892,6 +1886,12 @@ PERL_CALLCONV STRLEN Perl_is_utf8_char_buf(const U8 *buf, const U8 *buf_end); #define PERL_ARGS_ASSERT_IS_UTF8_CHAR_BUF \ assert(buf); assert(buf_end) #endif +PERL_CALLCONV STRLEN Perl_is_utf8_char_helper(const U8 * const s, const U8 * e, const U32 flags) + __attribute__warn_unused_result__ + __attribute__pure__; +#define PERL_ARGS_ASSERT_IS_UTF8_CHAR_HELPER \ + assert(s); assert(e) + #ifndef NO_MATHOMS PERL_CALLCONV bool Perl_is_utf8_cntrl(pTHX_ const U8 *p) __attribute__deprecated__ @@ -921,7 +921,7 @@ S_does_utf8_overflow(const U8 * const s, #undef FF_OVERLONG_PREFIX STRLEN -Perl__is_utf8_char_helper(const U8 * const s, const U8 * e, const U32 flags) +Perl_is_utf8_char_helper(const U8 * const s, const U8 * e, const U32 flags) { STRLEN len; const U8 *x; @@ -958,7 +958,7 @@ Perl__is_utf8_char_helper(const U8 * const s, const U8 * e, const U32 flags) * */ - PERL_ARGS_ASSERT__IS_UTF8_CHAR_HELPER; + PERL_ARGS_ASSERT_IS_UTF8_CHAR_HELPER; assert(0 == (flags & ~(UTF8_DISALLOW_ILLEGAL_INTERCHANGE |UTF8_DISALLOW_PERL_EXTENDED))); @@ -851,14 +851,14 @@ fit in an IV on the current machine. && ( NATIVE_UTF8_TO_I8(*(s)) > 0xF9 \ || (NATIVE_UTF8_TO_I8(*((s) + 1)) >= 0xA2)) \ && LIKELY((s) + UTF8SKIP(s) <= (e))) \ - ? _is_utf8_char_helper(s, s + UTF8SKIP(s), 0) : 0) + ? is_utf8_char_helper(s, s + UTF8SKIP(s), 0) : 0) #else # define UTF8_IS_SUPER(s, e) \ (( LIKELY((e) > (s) + 3) \ && (*(U8*) (s)) >= 0xF4 \ && ((*(U8*) (s)) > 0xF4 || (*((U8*) (s) + 1) >= 0x90))\ && LIKELY((s) + UTF8SKIP(s) <= (e))) \ - ? _is_utf8_char_helper(s, s + UTF8SKIP(s), 0) : 0) + ? is_utf8_char_helper(s, s + UTF8SKIP(s), 0) : 0) #endif /* These are now machine generated, and the 'given' clause is no longer @@ -1029,7 +1029,7 @@ L</is_utf8_string_loclen_flags> to check entire strings. ? 1 \ : UNLIKELY(((e) - (s)) < UTF8SKIP(s)) \ ? 0 \ - : _is_utf8_char_helper(s, e, flags)) + : is_utf8_char_helper(s, e, flags)) /* Do not use; should be deprecated. Use isUTF8_CHAR() instead; this is * retained solely for backwards compatibility */ |