Skip to content

Commit a30bf9e

Browse files
committed
Convert uv_to_utf8 and kin to inline functions
These used the ill-advised mTHX construct which is being entirely removed.
1 parent a9cb6dd commit a30bf9e

File tree

5 files changed

+39
-22
lines changed

5 files changed

+39
-22
lines changed

embed.fnc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3858,13 +3858,13 @@ Cp |U8 * |uvoffuni_to_utf8_flags_msgs \
38583858
|const UV flags \
38593859
|NULLOK HV **msgs
38603860

3861-
Admp |U8 * |uv_to_utf8 |NN U8 *d \
3861+
Adip |U8 * |uv_to_utf8 |NN U8 *d \
38623862
|UV uv
3863-
Admp |U8 * |uv_to_utf8_flags \
3863+
Adip |U8 * |uv_to_utf8_flags \
38643864
|NN U8 *d \
38653865
|UV uv \
38663866
|UV flags
3867-
Admp |U8 * |uv_to_utf8_msgs|NN U8 *d \
3867+
Adip |U8 * |uv_to_utf8_msgs|NN U8 *d \
38683868
|UV uv \
38693869
|UV flags \
38703870
|NULLOK HV **msgs

embed.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -823,9 +823,9 @@
823823
# define utf8n_to_uvchr Perl_utf8n_to_uvchr
824824
# define utf8n_to_uvchr_error Perl_utf8n_to_uvchr_error
825825
# define utf8n_to_uvchr_msgs Perl_utf8n_to_uvchr_msgs
826-
# define uv_to_utf8(a,b) Perl_uv_to_utf8(aTHX,a,b)
827-
# define uv_to_utf8_flags(a,b,c) Perl_uv_to_utf8_flags(aTHX,a,b,c)
828-
# define uv_to_utf8_msgs(a,b,c,d) Perl_uv_to_utf8_msgs(aTHX,a,b,c,d)
826+
# define uv_to_utf8(a,b) Perl_uv_to_utf8(aTHX_ a,b)
827+
# define uv_to_utf8_flags(a,b,c) Perl_uv_to_utf8_flags(aTHX_ a,b,c)
828+
# define uv_to_utf8_msgs(a,b,c,d) Perl_uv_to_utf8_msgs(aTHX_ a,b,c,d)
829829
# define uvchr_to_utf8(a,b) Perl_uvchr_to_utf8(aTHX,a,b)
830830
# define uvchr_to_utf8_flags(a,b,c) Perl_uvchr_to_utf8_flags(aTHX,a,b,c)
831831
# define uvchr_to_utf8_flags_msgs(a,b,c,d) Perl_uvchr_to_utf8_flags_msgs(aTHX,a,b,c,d)

inline.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3272,6 +3272,24 @@ Perl_utf8_to_uvchr_buf(pTHX_ const U8 *s, const U8 *send, STRLEN *retlen)
32723272
return 0;
32733273
}
32743274

3275+
PERL_STATIC_INLINE U8 *
3276+
Perl_uv_to_utf8(pTHX_ U8 *d, UV uv)
3277+
{
3278+
return uv_to_utf8_msgs(d, uv, 0, 0);
3279+
}
3280+
3281+
PERL_STATIC_INLINE U8 *
3282+
Perl_uv_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags)
3283+
{
3284+
return uv_to_utf8_msgs(d, uv, flags, 0);
3285+
}
3286+
3287+
PERL_STATIC_INLINE U8 *
3288+
Perl_uv_to_utf8_msgs(pTHX_ U8 *d, UV uv, UV flags , HV **msgs)
3289+
{
3290+
return uvoffuni_to_utf8_flags_msgs(d, NATIVE_TO_UNI(uv), flags, msgs);
3291+
}
3292+
32753293
/* ------------------------------- perl.h ----------------------------- */
32763294

32773295
/*

proto.h

Lines changed: 15 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

utf8.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,6 @@ typedef enum {
142142
#define uvoffuni_to_utf8_flags(d,uv,flags) \
143143
uvoffuni_to_utf8_flags_msgs(d, uv, flags, 0)
144144

145-
#define Perl_uv_to_utf8(mTHX, d, u) \
146-
Perl_uv_to_utf8_flags(aTHX, d, u, 0)
147-
#define Perl_uv_to_utf8_flags(mTHX, d, u, f) \
148-
Perl_uv_to_utf8_msgs(aTHX, d, u, f, 0)
149-
#define Perl_uv_to_utf8_msgs(mTHX, d, u, f , m) \
150-
Perl_uvoffuni_to_utf8_flags_msgs(aTHX_ d, NATIVE_TO_UNI(u), f, m)
151-
152145
/* This is needed to cast the parameters for all those calls that had them
153146
* improperly as chars */
154147
#define utf8_to_uvchr_buf(s, e, lenp) \

0 commit comments

Comments
 (0)