X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/ca8b95d7953a6d52ffd20ab9d0daa5dfa007bb3d..36f453d19563f9476d4310b8310ce4080209b04f:/mathoms.c diff --git a/mathoms.c b/mathoms.c index 18dcea4..fb21563 100644 --- a/mathoms.c +++ b/mathoms.c @@ -1,6 +1,7 @@ /* mathoms.c * - * Copyright (C) 2005, 2006, 2007, 2008 by Larry Wall and others + * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, + * 2011, 2012 by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -18,15 +19,48 @@ -/* +/* * This file contains mathoms, various binary artifacts from previous - * versions of Perl. For binary or source compatibility reasons, though, - * we cannot completely remove them from the core code. + * versions of Perl which we cannot completely remove from the core + * code. There are two reasons functions should be here: + * + * 1) A function has been replaced by a macro within a minor release, + * so XS modules compiled against an older release will expect to + * still be able to link against the function + * 2) A function Perl_foo(...) with #define foo Perl_foo(aTHX_ ...) + * has been replaced by a macro, e.g. #define foo(...) foo_flags(...,0) + * but XS code may still explicitly use the long form, i.e. + * Perl_foo(aTHX_ ...) + * + * NOTE: ALL FUNCTIONS IN THIS FILE should have an entry with the 'b' flag in + * embed.fnc. + * + * To move a function to this file, simply cut and paste it here, and change + * its embed.fnc entry to additionally have the 'b' flag. If, for some reason + * a function you'd like to be treated as mathoms can't be moved from its + * current place, simply enclose it between * - * SMP - Oct. 24, 2005 + * #ifndef NO_MATHOMS + * ... + * #endif * + * and add the 'b' flag in embed.fnc. + * + * The compilation of this file can be suppressed; see INSTALL + * + * Some blurb for perlapi.pod: + + head1 Obsolete backwards compatibility functions + +Some of these are also deprecated. You can exclude these from +your compiled Perl by adding this option to Configure: +C<-Accflags='-DNO_MATHOMS'> + +=cut + */ + #include "EXTERN.h" #define PERL_IN_MATHOMS_C #include "perl.h" @@ -37,53 +71,9 @@ */ #else -PERL_CALLCONV OP * Perl_ref(pTHX_ OP *o, I32 type); -PERL_CALLCONV void Perl_sv_unref(pTHX_ SV *sv); -PERL_CALLCONV void Perl_sv_taint(pTHX_ SV *sv); -PERL_CALLCONV IV Perl_sv_2iv(pTHX_ register SV *sv); -PERL_CALLCONV UV Perl_sv_2uv(pTHX_ register SV *sv); -PERL_CALLCONV NV Perl_sv_2nv(pTHX_ register SV *sv); -PERL_CALLCONV char * Perl_sv_2pv(pTHX_ register SV *sv, STRLEN *lp); -PERL_CALLCONV char * Perl_sv_2pv_nolen(pTHX_ register SV *sv); -PERL_CALLCONV char * Perl_sv_2pvbyte_nolen(pTHX_ register SV *sv); -PERL_CALLCONV char * Perl_sv_2pvutf8_nolen(pTHX_ register SV *sv); -PERL_CALLCONV void Perl_sv_force_normal(pTHX_ register SV *sv); -PERL_CALLCONV void Perl_sv_setsv(pTHX_ SV *dstr, register SV *sstr); -PERL_CALLCONV void Perl_sv_catpvn(pTHX_ SV *dsv, const char* sstr, STRLEN slen); -PERL_CALLCONV void Perl_sv_catpvn_mg(pTHX_ register SV *sv, register const char *ptr, register STRLEN len); -PERL_CALLCONV void Perl_sv_catsv(pTHX_ SV *dstr, register SV *sstr); -PERL_CALLCONV void Perl_sv_catsv_mg(pTHX_ SV *dsv, register SV *ssv); -PERL_CALLCONV char * Perl_sv_pv(pTHX_ SV *sv); -PERL_CALLCONV char * Perl_sv_pvn_force(pTHX_ SV *sv, STRLEN *lp); -PERL_CALLCONV char * Perl_sv_pvbyte(pTHX_ SV *sv); -PERL_CALLCONV char * Perl_sv_pvutf8(pTHX_ SV *sv); -PERL_CALLCONV STRLEN Perl_sv_utf8_upgrade(pTHX_ register SV *sv); -PERL_CALLCONV NV Perl_huge(void); -PERL_CALLCONV void Perl_gv_fullname3(pTHX_ SV *sv, const GV *gv, const char *prefix); -PERL_CALLCONV void Perl_gv_efullname3(pTHX_ SV *sv, const GV *gv, const char *prefix); -PERL_CALLCONV GV * Perl_gv_fetchmethod(pTHX_ HV *stash, const char *name); -PERL_CALLCONV HE * Perl_hv_iternext(pTHX_ HV *hv); -PERL_CALLCONV void Perl_hv_magic(pTHX_ HV *hv, GV *gv, int how); -PERL_CALLCONV bool Perl_do_open(pTHX_ GV *gv, register const char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp); -PERL_CALLCONV bool Perl_do_aexec(pTHX_ SV *really, register SV **mark, register SV **sp); -PERL_CALLCONV bool Perl_do_exec(pTHX_ const char *cmd); -PERL_CALLCONV U8 * Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv); -PERL_CALLCONV bool Perl_is_utf8_string_loc(pTHX_ const U8 *s, STRLEN len, const U8 **ep); -PERL_CALLCONV void Perl_sv_nolocking(pTHX_ SV *sv); -PERL_CALLCONV void Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len); -PERL_CALLCONV void Perl_sv_usepvn(pTHX_ SV *sv, char *ptr, STRLEN len); -PERL_CALLCONV int Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...); -PERL_CALLCONV int Perl_printf_nocontext(const char *format, ...); -PERL_CALLCONV int Perl_magic_setglob(pTHX_ SV* sv, MAGIC* mg); -PERL_CALLCONV AV * Perl_newAV(pTHX); -PERL_CALLCONV HV * Perl_newHV(pTHX); -PERL_CALLCONV IO * Perl_newIO(pTHX); -PERL_CALLCONV I32 Perl_my_stat(pTHX); -PERL_CALLCONV I32 Perl_my_lstat(pTHX); -PERL_CALLCONV I32 Perl_sv_eq(pTHX_ register SV *sv1, register SV *sv2); -PERL_CALLCONV char * Perl_sv_collxfrm(pTHX_ SV *const sv, STRLEN *const nxp); -PERL_CALLCONV bool Perl_sv_2bool(pTHX_ register SV *const sv); -PERL_CALLCONV CV * Perl_newSUB(pTHX_ I32 floor, OP* o, OP* proto, OP* block); +/* The functions in this file should be able to call other deprecated functions + * without a compiler warning */ +GCC_DIAG_IGNORE(-Wdeprecated-declarations) /* ref() is now a macro using Perl_doref; * this version provided for binary compatibility only. @@ -95,12 +85,13 @@ Perl_ref(pTHX_ OP *o, I32 type) } /* +=for apidoc_section $SV =for apidoc sv_unref Unsets the RV status of the SV, and decrements the reference count of whatever was being referenced by the RV. This can almost be thought of as a reversal of C. This is C with the C -being zero. See C. +being zero. See C>. =cut */ @@ -116,7 +107,8 @@ Perl_sv_unref(pTHX_ SV *sv) /* =for apidoc sv_taint -Taint an SV. Use C instead. +Taint an SV. Use C instead. + =cut */ @@ -133,8 +125,10 @@ Perl_sv_taint(pTHX_ SV *sv) */ IV -Perl_sv_2iv(pTHX_ register SV *sv) +Perl_sv_2iv(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_2IV; + return sv_2iv_flags(sv, SV_GMAGIC); } @@ -143,8 +137,10 @@ Perl_sv_2iv(pTHX_ register SV *sv) */ UV -Perl_sv_2uv(pTHX_ register SV *sv) +Perl_sv_2uv(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_2UV; + return sv_2uv_flags(sv, SV_GMAGIC); } @@ -153,7 +149,7 @@ Perl_sv_2uv(pTHX_ register SV *sv) */ NV -Perl_sv_2nv(pTHX_ register SV *sv) +Perl_sv_2nv(pTHX_ SV *sv) { return sv_2nv_flags(sv, SV_GMAGIC); } @@ -164,21 +160,24 @@ Perl_sv_2nv(pTHX_ register SV *sv) */ char * -Perl_sv_2pv(pTHX_ register SV *sv, STRLEN *lp) +Perl_sv_2pv(pTHX_ SV *sv, STRLEN *lp) { + PERL_ARGS_ASSERT_SV_2PV; + return sv_2pv_flags(sv, lp, SV_GMAGIC); } /* =for apidoc sv_2pv_nolen -Like C, but doesn't return the length too. You should usually +Like C, but doesn't return the length too. You should usually use the macro wrapper C instead. + =cut */ char * -Perl_sv_2pv_nolen(pTHX_ register SV *sv) +Perl_sv_2pv_nolen(pTHX_ SV *sv) { PERL_ARGS_ASSERT_SV_2PV_NOLEN; return sv_2pv(sv, NULL); @@ -196,7 +195,7 @@ Usually accessed via the C macro. */ char * -Perl_sv_2pvbyte_nolen(pTHX_ register SV *sv) +Perl_sv_2pvbyte_nolen(pTHX_ SV *sv) { PERL_ARGS_ASSERT_SV_2PVBYTE_NOLEN; @@ -215,7 +214,7 @@ Usually accessed via the C macro. */ char * -Perl_sv_2pvutf8_nolen(pTHX_ register SV *sv) +Perl_sv_2pvutf8_nolen(pTHX_ SV *sv) { PERL_ARGS_ASSERT_SV_2PVUTF8_NOLEN; @@ -227,13 +226,13 @@ Perl_sv_2pvutf8_nolen(pTHX_ register SV *sv) Undo various types of fakery on an SV: if the PV is a shared string, make a private copy; if we're a ref, stop refing; if we're a glob, downgrade to -an xpvmg. See also C. +an C. See also C>. =cut */ void -Perl_sv_force_normal(pTHX_ register SV *sv) +Perl_sv_force_normal(pTHX_ SV *sv) { PERL_ARGS_ASSERT_SV_FORCE_NORMAL; @@ -245,11 +244,11 @@ Perl_sv_force_normal(pTHX_ register SV *sv) */ void -Perl_sv_setsv(pTHX_ SV *dstr, register SV *sstr) +Perl_sv_setsv(pTHX_ SV *dsv, SV *ssv) { PERL_ARGS_ASSERT_SV_SETSV; - sv_setsv_flags(dstr, sstr, SV_GMAGIC); + sv_setsv_flags(dsv, ssv, SV_GMAGIC); } /* sv_catpvn() is now a macro using Perl_sv_catpvn_flags(); @@ -264,20 +263,12 @@ Perl_sv_catpvn(pTHX_ SV *dsv, const char* sstr, STRLEN slen) sv_catpvn_flags(dsv, sstr, slen, SV_GMAGIC); } -/* -=for apidoc sv_catpvn_mg - -Like C, but also handles 'set' magic. - -=cut -*/ - void -Perl_sv_catpvn_mg(pTHX_ register SV *sv, register const char *ptr, register STRLEN len) +Perl_sv_catpvn_mg(pTHX_ SV *dsv, const char *sstr, STRLEN len) { PERL_ARGS_ASSERT_SV_CATPVN_MG; - sv_catpvn_flags(sv,ptr,len,SV_GMAGIC|SV_SMAGIC); + sv_catpvn_flags(dsv,sstr,len,SV_GMAGIC|SV_SMAGIC); } /* sv_catsv() is now a macro using Perl_sv_catsv_flags(); @@ -285,40 +276,32 @@ Perl_sv_catpvn_mg(pTHX_ register SV *sv, register const char *ptr, register STRL */ void -Perl_sv_catsv(pTHX_ SV *dstr, register SV *sstr) +Perl_sv_catsv(pTHX_ SV *dsv, SV *sstr) { PERL_ARGS_ASSERT_SV_CATSV; - sv_catsv_flags(dstr, sstr, SV_GMAGIC); + sv_catsv_flags(dsv, sstr, SV_GMAGIC); } -/* -=for apidoc sv_catsv_mg - -Like C, but also handles 'set' magic. - -=cut -*/ - void -Perl_sv_catsv_mg(pTHX_ SV *dsv, register SV *ssv) +Perl_sv_catsv_mg(pTHX_ SV *dsv, SV *sstr) { PERL_ARGS_ASSERT_SV_CATSV_MG; - sv_catsv_flags(dsv,ssv,SV_GMAGIC|SV_SMAGIC); + sv_catsv_flags(dsv,sstr,SV_GMAGIC|SV_SMAGIC); } /* =for apidoc sv_iv A private implementation of the C macro for compilers which can't -cope with complex macro expressions. Always use the macro instead. +cope with complex macro expressions. Always use the macro instead. =cut */ IV -Perl_sv_iv(pTHX_ register SV *sv) +Perl_sv_iv(pTHX_ SV *sv) { PERL_ARGS_ASSERT_SV_IV; @@ -334,13 +317,13 @@ Perl_sv_iv(pTHX_ register SV *sv) =for apidoc sv_uv A private implementation of the C macro for compilers which can't -cope with complex macro expressions. Always use the macro instead. +cope with complex macro expressions. Always use the macro instead. =cut */ UV -Perl_sv_uv(pTHX_ register SV *sv) +Perl_sv_uv(pTHX_ SV *sv) { PERL_ARGS_ASSERT_SV_UV; @@ -356,13 +339,13 @@ Perl_sv_uv(pTHX_ register SV *sv) =for apidoc sv_nv A private implementation of the C macro for compilers which can't -cope with complex macro expressions. Always use the macro instead. +cope with complex macro expressions. Always use the macro instead. =cut */ NV -Perl_sv_nv(pTHX_ register SV *sv) +Perl_sv_nv(pTHX_ SV *sv) { PERL_ARGS_ASSERT_SV_NV; @@ -379,7 +362,7 @@ Use the C macro instead =for apidoc sv_pvn A private implementation of the C macro for compilers which can't -cope with complex macro expressions. Always use the macro instead. +cope with complex macro expressions. Always use the macro instead. =cut */ @@ -398,7 +381,7 @@ Perl_sv_pvn(pTHX_ SV *sv, STRLEN *lp) char * -Perl_sv_pvn_nomg(pTHX_ register SV *sv, STRLEN *lp) +Perl_sv_pvn_nomg(pTHX_ SV *sv, STRLEN *lp) { PERL_ARGS_ASSERT_SV_PVN_NOMG; @@ -457,7 +440,7 @@ Use C instead. =for apidoc sv_pvbyten A private implementation of the C macro for compilers -which can't cope with complex macro expressions. Always use the macro +which can't cope with complex macro expressions. Always use the macro instead. =cut @@ -493,7 +476,7 @@ Use the C macro instead =for apidoc sv_pvutf8n A private implementation of the C macro for compilers -which can't cope with complex macro expressions. Always use the macro +which can't cope with complex macro expressions. Always use the macro instead. =cut @@ -513,7 +496,7 @@ Perl_sv_pvutf8n(pTHX_ SV *sv, STRLEN *lp) */ STRLEN -Perl_sv_utf8_upgrade(pTHX_ register SV *sv) +Perl_sv_utf8_upgrade(pTHX_ SV *sv) { PERL_ARGS_ASSERT_SV_UTF8_UPGRADE; @@ -523,8 +506,8 @@ Perl_sv_utf8_upgrade(pTHX_ register SV *sv) int Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...) { - dTHXs; - va_list(arglist); + int ret = 0; + va_list arglist; /* Easier to special case this here than in embed.pl. (Look at what it generates for proto.h) */ @@ -533,21 +516,26 @@ Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...) #endif va_start(arglist, format); - return PerlIO_vprintf(stream, format, arglist); + ret = PerlIO_vprintf(stream, format, arglist); + va_end(arglist); + return ret; } int Perl_printf_nocontext(const char *format, ...) { dTHX; - va_list(arglist); + va_list arglist; + int ret = 0; #ifdef PERL_IMPLICIT_CONTEXT PERL_ARGS_ASSERT_PRINTF_NOCONTEXT; #endif va_start(arglist, format); - return PerlIO_vprintf(PerlIO_stdout(), format, arglist); + ret = PerlIO_vprintf(PerlIO_stdout(), format, arglist); + va_end(arglist); + return ret; } #if defined(HUGE_VAL) || (defined(USE_LONG_DOUBLE) && defined(HUGE_VALL)) @@ -602,6 +590,7 @@ Perl_gv_efullname3(pTHX_ SV *sv, const GV *gv, const char *prefix) } /* +=for apidoc_section $GV =for apidoc gv_fetchmethod See L. @@ -634,7 +623,7 @@ Perl_hv_magic(pTHX_ HV *hv, GV *gv, int how) } bool -Perl_do_open(pTHX_ GV *gv, register const char *name, I32 len, int as_raw, +Perl_do_open(pTHX_ GV *gv, const char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp) { PERL_ARGS_ASSERT_DO_OPEN; @@ -644,7 +633,7 @@ Perl_do_open(pTHX_ GV *gv, register const char *name, I32 len, int as_raw, } bool -Perl_do_open9(pTHX_ GV *gv, register const char *name, I32 len, int +Perl_do_open9(pTHX_ GV *gv, const char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp, SV *svs, I32 num_svs) @@ -675,7 +664,7 @@ Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int mode) #ifndef OS2 bool -Perl_do_aexec(pTHX_ SV *really, register SV **mark, register SV **sp) +Perl_do_aexec(pTHX_ SV *really, SV **mark, SV **sp) { PERL_ARGS_ASSERT_DO_AEXEC; @@ -683,16 +672,6 @@ Perl_do_aexec(pTHX_ SV *really, register SV **mark, register SV **sp) } #endif -#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION -bool -Perl_do_exec(pTHX_ const char *cmd) -{ - PERL_ARGS_ASSERT_DO_EXEC; - - return do_exec3(cmd,0,0); -} -#endif - /* Backwards compatibility. */ int Perl_init_i18nl14n(pTHX_ int printwarn) @@ -700,16 +679,8 @@ Perl_init_i18nl14n(pTHX_ int printwarn) return init_i18nl10n(printwarn); } -U8 * -Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv) -{ - PERL_ARGS_ASSERT_UVUNI_TO_UTF8; - - return Perl_uvuni_to_utf8_flags(aTHX_ d, uv, 0); -} - bool -Perl_is_utf8_string_loc(pTHX_ const U8 *s, STRLEN len, const U8 **ep) +Perl_is_utf8_string_loc(const U8 *s, const STRLEN len, const U8 **ep) { PERL_ARGS_ASSERT_IS_UTF8_STRING_LOC; @@ -717,13 +688,14 @@ Perl_is_utf8_string_loc(pTHX_ const U8 *s, STRLEN len, const U8 **ep) } /* +=for apidoc_section $SV =for apidoc sv_nolocking Dummy routine which "locks" an SV when there is no locking module present. -Exists to avoid test for a NULL function pointer and because it could +Exists to avoid test for a C function pointer and because it could potentially warn under some level of strict-ness. -"Superseded" by sv_nosharing(). +"Superseded" by C. =cut */ @@ -740,12 +712,16 @@ Perl_sv_nolocking(pTHX_ SV *sv) =for apidoc sv_nounlocking Dummy routine which "unlocks" an SV when there is no locking module present. -Exists to avoid test for a NULL function pointer and because it could +Exists to avoid test for a C function pointer and because it could potentially warn under some level of strict-ness. -"Superseded" by sv_nosharing(). +"Superseded" by C. =cut + +PERL_UNLOCK_HOOK in intrpvar.h is the macro that refers to this, and guarantees +that mathoms gets loaded. + */ void @@ -758,8 +734,6 @@ Perl_sv_nounlocking(pTHX_ SV *sv) void Perl_save_long(pTHX_ long int *longp) { - dVAR; - PERL_ARGS_ASSERT_SAVE_LONG; SSCHECK(3); @@ -769,23 +743,8 @@ Perl_save_long(pTHX_ long int *longp) } void -Perl_save_iv(pTHX_ IV *ivp) -{ - dVAR; - - PERL_ARGS_ASSERT_SAVE_IV; - - SSCHECK(3); - SSPUSHIV(*ivp); - SSPUSHPTR(ivp); - SSPUSHUV(SAVEt_IV); -} - -void Perl_save_nogv(pTHX_ GV *gv) { - dVAR; - PERL_ARGS_ASSERT_SAVE_NOGV; SSCHECK(2); @@ -794,16 +753,17 @@ Perl_save_nogv(pTHX_ GV *gv) } void -Perl_save_list(pTHX_ register SV **sarg, I32 maxsarg) +Perl_save_list(pTHX_ SV **sarg, I32 maxsarg) { - dVAR; - register I32 i; + I32 i; PERL_ARGS_ASSERT_SAVE_LIST; for (i = 1; i <= maxsarg; i++) { - register SV * const sv = newSV(0); - sv_setsv(sv,sarg[i]); + SV *sv; + SvGETMAGIC(sarg[i]); + sv = newSV(0); + sv_setsv_nomg(sv,sarg[i]); SSCHECK(3); SSPUSHPTR(sarg[i]); /* remember the pointer */ SSPUSHPTR(sv); /* remember the value */ @@ -830,9 +790,9 @@ Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len) /* =for apidoc sv_usepvn -Tells an SV to use C to find its string value. Implemented by +Tells an SV to use C to find its string value. Implemented by calling C with C of 0, hence does not handle 'set' -magic. See C. +magic. See C>. =cut */ @@ -846,14 +806,16 @@ Perl_sv_usepvn(pTHX_ SV *sv, char *ptr, STRLEN len) } /* +=for apidoc_section $pack =for apidoc unpack_str -The engine implementing unpack() Perl function. Note: parameters strbeg, new_s -and ocnt are not used. This call should not be used, use unpackstring instead. +The engine implementing C Perl function. Note: parameters C, +C and C are not used. This call should not be used, use +C instead. =cut */ -I32 +SSize_t Perl_unpack_str(pTHX_ const char *pat, const char *patend, const char *s, const char *strbeg, const char *strend, char **new_s, I32 ocnt, U32 flags) @@ -870,14 +832,15 @@ Perl_unpack_str(pTHX_ const char *pat, const char *patend, const char *s, /* =for apidoc pack_cat -The engine implementing pack() Perl function. Note: parameters next_in_list and -flags are not used. This call should not be used; use packlist instead. +The engine implementing C Perl function. Note: parameters +C and C are not used. This call should not be used; use +C> instead. =cut */ void -Perl_pack_cat(pTHX_ SV *cat, const char *pat, const char *patend, register SV **beglist, SV **endlist, SV ***next_in_list, U32 flags) +Perl_pack_cat(pTHX_ SV *cat, const char *pat, const char *patend, SV **beglist, SV **endlist, SV ***next_in_list, U32 flags) { PERL_ARGS_ASSERT_PACK_CAT; @@ -898,8 +861,7 @@ Perl_hv_exists_ent(pTHX_ HV *hv, SV *keysv, U32 hash) { PERL_ARGS_ASSERT_HV_EXISTS_ENT; - return hv_common(hv, keysv, NULL, 0, 0, HV_FETCH_ISEXISTS, 0, hash) - ? TRUE : FALSE; + return cBOOL(hv_common(hv, keysv, NULL, 0, 0, HV_FETCH_ISEXISTS, 0, hash)); } HE * @@ -960,8 +922,7 @@ Perl_hv_exists(pTHX_ HV *hv, const char *key, I32 klen_i32) klen = klen_i32; flags = 0; } - return hv_common(hv, NULL, key, klen, flags, HV_FETCH_ISEXISTS, 0, 0) - ? TRUE : FALSE; + return cBOOL(hv_common(hv, NULL, key, klen, flags, HV_FETCH_ISEXISTS, 0, 0)); } SV** @@ -1003,8 +964,6 @@ Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen_i32, I32 flags) NULL, 0)); } -/* Functions after here were made mathoms post 5.10.0 but pre 5.8.9 */ - AV * Perl_newAV(pTHX) { @@ -1035,15 +994,12 @@ Perl_sv_insert(pTHX_ SV *const bigstr, const STRLEN offset, const STRLEN len, void Perl_save_freesv(pTHX_ SV *sv) { - dVAR; save_freesv(sv); } void Perl_save_mortalizesv(pTHX_ SV *sv) { - dVAR; - PERL_ARGS_ASSERT_SAVE_MORTALIZESV; save_mortalizesv(sv); @@ -1052,21 +1008,18 @@ Perl_save_mortalizesv(pTHX_ SV *sv) void Perl_save_freeop(pTHX_ OP *o) { - dVAR; save_freeop(o); } void Perl_save_freepv(pTHX_ char *pv) { - dVAR; save_freepv(pv); } void Perl_save_op(pTHX) { - dVAR; save_op(); } @@ -1085,13 +1038,13 @@ Perl_gv_AVadd(pTHX_ GV *gv) } GV * -Perl_gv_HVadd(pTHX_ register GV *gv) +Perl_gv_HVadd(pTHX_ GV *gv) { return gv_HVadd(gv); } GV * -Perl_gv_IOadd(pTHX_ register GV *gv) +Perl_gv_IOadd(pTHX_ GV *gv) { return gv_IOadd(gv); } @@ -1115,7 +1068,7 @@ Perl_my_lstat(pTHX) } I32 -Perl_sv_eq(pTHX_ register SV *sv1, register SV *sv2) +Perl_sv_eq(pTHX_ SV *sv1, SV *sv2) { return sv_eq_flags(sv1, sv2, SV_GMAGIC); } @@ -1124,26 +1077,41 @@ Perl_sv_eq(pTHX_ register SV *sv1, register SV *sv2) char * Perl_sv_collxfrm(pTHX_ SV *const sv, STRLEN *const nxp) { + PERL_ARGS_ASSERT_SV_COLLXFRM; return sv_collxfrm_flags(sv, nxp, SV_GMAGIC); } + +char * +Perl_mem_collxfrm(pTHX_ const char *input_string, STRLEN len, STRLEN *xlen) +{ + /* This function is retained for compatibility in case someone outside core + * is using this (but it is undocumented) */ + + PERL_ARGS_ASSERT_MEM_COLLXFRM; + + return _mem_collxfrm(input_string, len, xlen, FALSE); +} + #endif bool -Perl_sv_2bool(pTHX_ register SV *const sv) +Perl_sv_2bool(pTHX_ SV *const sv) { + PERL_ARGS_ASSERT_SV_2BOOL; return sv_2bool_flags(sv, SV_GMAGIC); } /* +=for apidoc_section $custom =for apidoc custom_op_name -Return the name for a given custom op. This was once used by the OP_NAME +Return the name for a given custom op. This was once used by the C macro, but is no longer: it has only been kept for compatibility, and should not be used. =for apidoc custom_op_desc -Return the description of a given custom op. This was once used by the -OP_DESC macro, but is no longer: it has only been kept for +Return the description of a given custom op. This was once used by the +C macro, but is no longer: it has only been kept for compatibility, and should not be used. =cut @@ -1153,29 +1121,298 @@ const char* Perl_custom_op_name(pTHX_ const OP* o) { PERL_ARGS_ASSERT_CUSTOM_OP_NAME; - return XopENTRY(Perl_custom_op_xop(aTHX_ o), xop_name); + return XopENTRYCUSTOM(o, xop_name); } const char* Perl_custom_op_desc(pTHX_ const OP* o) { PERL_ARGS_ASSERT_CUSTOM_OP_DESC; - return XopENTRY(Perl_custom_op_xop(aTHX_ o), xop_desc); + return XopENTRYCUSTOM(o, xop_desc); } CV * Perl_newSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *block) { - return Perl_newATTRSUB(aTHX_ floor, o, proto, NULL, block); + return newATTRSUB(floor, o, proto, NULL, block); +} + +SV * +Perl_sv_mortalcopy(pTHX_ SV *const oldsv) +{ + return Perl_sv_mortalcopy_flags(aTHX_ oldsv, SV_GMAGIC); } + +void +Perl_sv_copypv(pTHX_ SV *const dsv, SV *const ssv) +{ + PERL_ARGS_ASSERT_SV_COPYPV; + + sv_copypv_flags(dsv, ssv, SV_GMAGIC); +} + +UV /* Made into a function, so can be deprecated */ +NATIVE_TO_NEED(const UV enc, const UV ch) +{ + PERL_UNUSED_ARG(enc); + return ch; +} + +UV /* Made into a function, so can be deprecated */ +ASCII_TO_NEED(const UV enc, const UV ch) +{ + PERL_UNUSED_ARG(enc); + return ch; +} + +/* +=for apidoc_section $unicode +=for apidoc is_utf8_char + +Tests if some arbitrary number of bytes begins in a valid UTF-8 +character. Note that an INVARIANT (i.e. ASCII on non-EBCDIC machines) +character is a valid UTF-8 character. The actual number of bytes in the UTF-8 +character will be returned if it is valid, otherwise 0. + +This function is deprecated due to the possibility that malformed input could +cause reading beyond the end of the input buffer. Use L +instead. + +=cut */ + +STRLEN +Perl_is_utf8_char(const U8 *s) +{ + PERL_ARGS_ASSERT_IS_UTF8_CHAR; + + /* Assumes we have enough space, which is why this is deprecated. But the + * UTF8_CHK_SKIP(s)) makes it safe for the common case of NUL-terminated + * strings */ + return isUTF8_CHAR(s, s + UTF8_CHK_SKIP(s)); +} + +/* +=for apidoc is_utf8_char_buf + +This is identical to the macro L. + +=cut */ + +STRLEN +Perl_is_utf8_char_buf(const U8 *buf, const U8* buf_end) +{ + + PERL_ARGS_ASSERT_IS_UTF8_CHAR_BUF; + + return isUTF8_CHAR(buf, buf_end); +} + +/* DEPRECATED! + * Like L(), but should only be called when it is known that + * there are no malformations in the input UTF-8 string C. Surrogates, + * non-character code points, and non-Unicode code points are allowed */ + +UV +Perl_valid_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen) +{ + PERL_UNUSED_CONTEXT; + PERL_ARGS_ASSERT_VALID_UTF8_TO_UVUNI; + + return NATIVE_TO_UNI(valid_utf8_to_uvchr(s, retlen)); +} + +/* +=for apidoc utf8_to_uvuni + +Returns the Unicode code point of the first character in the string C +which is assumed to be in UTF-8 encoding; C will be set to the +length, in bytes, of that character. + +Some, but not all, UTF-8 malformations are detected, and in fact, some +malformed input could cause reading beyond the end of the input buffer, which +is one reason why this function is deprecated. The other is that only in +extremely limited circumstances should the Unicode versus native code point be +of any interest to you. See L for alternatives. + +If C points to one of the detected malformations, and UTF8 warnings are +enabled, zero is returned and C<*retlen> is set (if C doesn't point to +NULL) to -1. If those warnings are off, the computed value if well-defined (or +the Unicode REPLACEMENT CHARACTER, if not) is silently returned, and C<*retlen> +is set (if C isn't NULL) so that (S + C<*retlen>>) is the +next possible position in C that could begin a non-malformed character. +See L for details on when the REPLACEMENT CHARACTER is returned. + +=cut +*/ + +UV +Perl_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen) +{ + PERL_UNUSED_CONTEXT; + PERL_ARGS_ASSERT_UTF8_TO_UVUNI; + + return NATIVE_TO_UNI(valid_utf8_to_uvchr(s, retlen)); +} + +/* +=for apidoc pad_compname_type + +Looks up the type of the lexical variable at position C in the +currently-compiling pad. If the variable is typed, the stash of the +class to which it is typed is returned. If not, C is returned. + +Use L> instead. + +=cut +*/ + +HV * +Perl_pad_compname_type(pTHX_ const PADOFFSET po) +{ + return PAD_COMPNAME_TYPE(po); +} + +/* return ptr to little string in big string, NULL if not found */ +/* The original version of this routine was donated by Corey Satten. */ + +char * +Perl_instr(const char *big, const char *little) +{ + PERL_ARGS_ASSERT_INSTR; + + return instr(big, little); +} + +SV * +Perl_newSVsv(pTHX_ SV *const old) +{ + return newSVsv(old); +} + +bool +Perl_sv_utf8_downgrade(pTHX_ SV *const sv, const bool fail_ok) +{ + PERL_ARGS_ASSERT_SV_UTF8_DOWNGRADE; + + return sv_utf8_downgrade(sv, fail_ok); +} + +char * +Perl_sv_2pvutf8(pTHX_ SV *sv, STRLEN *const lp) +{ + PERL_ARGS_ASSERT_SV_2PVUTF8; + + return sv_2pvutf8(sv, lp); +} + +char * +Perl_sv_2pvbyte(pTHX_ SV *sv, STRLEN *const lp) +{ + PERL_ARGS_ASSERT_SV_2PVBYTE; + + return sv_2pvbyte(sv, lp); +} + +U8 * +Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv) +{ + PERL_ARGS_ASSERT_UVUNI_TO_UTF8; + + return uvoffuni_to_utf8_flags(d, uv, 0); +} + +/* +=for apidoc utf8n_to_uvuni + +Instead use L, or rarely, L. + +This function was useful for code that wanted to handle both EBCDIC and +ASCII platforms with Unicode properties, but starting in Perl v5.20, the +distinctions between the platforms have mostly been made invisible to most +code, so this function is quite unlikely to be what you want. If you do need +this precise functionality, use instead +C> +or C>. + +=cut +*/ + +UV +Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) +{ + PERL_ARGS_ASSERT_UTF8N_TO_UVUNI; + + return NATIVE_TO_UNI(utf8n_to_uvchr(s, curlen, retlen, flags)); +} + +/* +=for apidoc uvuni_to_utf8_flags + +Instead you almost certainly want to use L or +L. + +This function is a deprecated synonym for L, +which itself, while not deprecated, should be used only in isolated +circumstances. These functions were useful for code that wanted to handle +both EBCDIC and ASCII platforms with Unicode properties, but starting in Perl +v5.20, the distinctions between the platforms have mostly been made invisible +to most code, so this function is quite unlikely to be what you want. + +=cut +*/ + +U8 * +Perl_uvuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags) +{ + PERL_ARGS_ASSERT_UVUNI_TO_UTF8_FLAGS; + + return uvoffuni_to_utf8_flags(d, uv, flags); +} + +/* +=for apidoc utf8_to_uvchr + +Returns the native code point of the first character in the string C +which is assumed to be in UTF-8 encoding; C will be set to the +length, in bytes, of that character. + +Some, but not all, UTF-8 malformations are detected, and in fact, some +malformed input could cause reading beyond the end of the input buffer, which +is why this function is deprecated. Use L instead. + +If C points to one of the detected malformations, and UTF8 warnings are +enabled, zero is returned and C<*retlen> is set (if C isn't +C) to -1. If those warnings are off, the computed value if well-defined (or +the Unicode REPLACEMENT CHARACTER, if not) is silently returned, and C<*retlen> +is set (if C isn't NULL) so that (S + C<*retlen>>) is the +next possible position in C that could begin a non-malformed character. +See L for details on when the REPLACEMENT CHARACTER is returned. + +=cut +*/ + +UV +Perl_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen) +{ + PERL_ARGS_ASSERT_UTF8_TO_UVCHR; + + /* This function is unsafe if malformed UTF-8 input is given it, which is + * why the function is deprecated. If the first byte of the input + * indicates that there are more bytes remaining in the sequence that forms + * the character than there are in the input buffer, it can read past the + * end. But we can make it safe if the input string happens to be + * NUL-terminated, as many strings in Perl are, by refusing to read past a + * NUL, which is what UTF8_CHK_SKIP() does. A NUL indicates the start of + * the next character anyway. If the input isn't NUL-terminated, the + * function remains unsafe, as it always has been. */ + + return utf8_to_uvchr_buf(s, s + UTF8_CHK_SKIP(s), retlen); +} + +GCC_DIAG_RESTORE + #endif /* NO_MATHOMS */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * - * ex: set ts=8 sts=4 sw=4 noet: + * ex: set ts=8 sts=4 sw=4 et: */