X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/68cad0541e26db0a9da20fbbfa9c6f9402e4cde7..f8ff62a0b7c5ec858ae67e3f79488621e8f03107:/mathoms.c diff --git a/mathoms.c b/mathoms.c index 9e1c546..b3c79e8 100644 --- a/mathoms.c +++ b/mathoms.c @@ -1,6 +1,7 @@ /* mathoms.c * - * Copyright (C) 2005, 2006, 2007, 2007, 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. @@ -8,13 +9,15 @@ */ /* - * "Anything that Hobbits had no immediate use for, but were unwilling to - * throw away, they called a mathom. Their dwellings were apt to become - * rather crowded with mathoms, and many of the presents that passed from - * hand to hand were of that sort." + * Anything that Hobbits had no immediate use for, but were unwilling to + * throw away, they called a mathom. Their dwellings were apt to become + * rather crowded with mathoms, and many of the presents that passed from + * hand to hand were of that sort. + * + * [p.5 of _The Lord of the Rings_: "Prologue"] */ -#ifndef NO_MATHOMS + /* * This file contains mathoms, various binary artifacts from previous @@ -29,11 +32,23 @@ #define PERL_IN_MATHOMS_C #include "perl.h" +#ifdef NO_MATHOMS +/* ..." warning: ISO C forbids an empty source file" + So make sure we have something in here by processing the headers anyway. + */ +#else + +/* Not all of these have prototypes elsewhere, so do this to get + * non-mangled names. + */ +START_EXTERN_C + 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); @@ -57,7 +72,6 @@ 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); @@ -68,6 +82,17 @@ 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); +PERL_CALLCONV UV Perl_to_utf8_lower(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp); +PERL_CALLCONV UV Perl_to_utf8_title(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp); +PERL_CALLCONV UV Perl_to_utf8_upper(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp); +PERL_CALLCONV UV Perl_to_utf8_fold(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp); /* ref() is now a macro using Perl_doref; * this version provided for binary compatibility only. @@ -92,6 +117,8 @@ being zero. See C. void Perl_sv_unref(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_UNREF; + sv_unref_flags(sv, 0); } @@ -99,12 +126,15 @@ Perl_sv_unref(pTHX_ SV *sv) =for apidoc sv_taint Taint an SV. Use C instead. + =cut */ void Perl_sv_taint(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_TAINT; + sv_magic((sv), NULL, PERL_MAGIC_taint, NULL, 0); } @@ -128,6 +158,17 @@ Perl_sv_2uv(pTHX_ register SV *sv) return sv_2uv_flags(sv, SV_GMAGIC); } +/* sv_2nv() is now a macro using Perl_sv_2nv_flags(); + * this function provided for binary compatibility only + */ + +NV +Perl_sv_2nv(pTHX_ register SV *sv) +{ + return sv_2nv_flags(sv, SV_GMAGIC); +} + + /* sv_2pv() is now a macro using Perl_sv_2pv_flags(); * this function provided for binary compatibility only */ @@ -143,12 +184,14 @@ Perl_sv_2pv(pTHX_ register SV *sv, STRLEN *lp) 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_ARGS_ASSERT_SV_2PV_NOLEN; return sv_2pv(sv, NULL); } @@ -166,6 +209,8 @@ Usually accessed via the C macro. char * Perl_sv_2pvbyte_nolen(pTHX_ register SV *sv) { + PERL_ARGS_ASSERT_SV_2PVBYTE_NOLEN; + return sv_2pvbyte(sv, NULL); } @@ -183,6 +228,8 @@ Usually accessed via the C macro. char * Perl_sv_2pvutf8_nolen(pTHX_ register SV *sv) { + PERL_ARGS_ASSERT_SV_2PVUTF8_NOLEN; + return sv_2pvutf8(sv, NULL); } @@ -199,6 +246,8 @@ an xpvmg. See also C. void Perl_sv_force_normal(pTHX_ register SV *sv) { + PERL_ARGS_ASSERT_SV_FORCE_NORMAL; + sv_force_normal_flags(sv, 0); } @@ -209,6 +258,8 @@ Perl_sv_force_normal(pTHX_ register SV *sv) void Perl_sv_setsv(pTHX_ SV *dstr, register SV *sstr) { + PERL_ARGS_ASSERT_SV_SETSV; + sv_setsv_flags(dstr, sstr, SV_GMAGIC); } @@ -219,6 +270,8 @@ Perl_sv_setsv(pTHX_ SV *dstr, register SV *sstr) void Perl_sv_catpvn(pTHX_ SV *dsv, const char* sstr, STRLEN slen) { + PERL_ARGS_ASSERT_SV_CATPVN; + sv_catpvn_flags(dsv, sstr, slen, SV_GMAGIC); } @@ -233,6 +286,8 @@ Like C, but also handles 'set' magic. void Perl_sv_catpvn_mg(pTHX_ register SV *sv, register const char *ptr, register STRLEN len) { + PERL_ARGS_ASSERT_SV_CATPVN_MG; + sv_catpvn_flags(sv,ptr,len,SV_GMAGIC|SV_SMAGIC); } @@ -243,6 +298,8 @@ 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_ARGS_ASSERT_SV_CATSV; + sv_catsv_flags(dstr, sstr, SV_GMAGIC); } @@ -257,6 +314,8 @@ Like C, but also handles 'set' magic. void Perl_sv_catsv_mg(pTHX_ SV *dsv, register SV *ssv) { + PERL_ARGS_ASSERT_SV_CATSV_MG; + sv_catsv_flags(dsv,ssv,SV_GMAGIC|SV_SMAGIC); } @@ -272,6 +331,8 @@ cope with complex macro expressions. Always use the macro instead. IV Perl_sv_iv(pTHX_ register SV *sv) { + PERL_ARGS_ASSERT_SV_IV; + if (SvIOK(sv)) { if (SvIsUV(sv)) return (IV)SvUVX(sv); @@ -292,6 +353,8 @@ cope with complex macro expressions. Always use the macro instead. UV Perl_sv_uv(pTHX_ register SV *sv) { + PERL_ARGS_ASSERT_SV_UV; + if (SvIOK(sv)) { if (SvIsUV(sv)) return SvUVX(sv); @@ -312,6 +375,8 @@ cope with complex macro expressions. Always use the macro instead. NV Perl_sv_nv(pTHX_ register SV *sv) { + PERL_ARGS_ASSERT_SV_NV; + if (SvNOK(sv)) return SvNVX(sv); return sv_2nv(sv); @@ -333,6 +398,8 @@ cope with complex macro expressions. Always use the macro instead. char * Perl_sv_pvn(pTHX_ SV *sv, STRLEN *lp) { + PERL_ARGS_ASSERT_SV_PVN; + if (SvPOK(sv)) { *lp = SvCUR(sv); return SvPVX(sv); @@ -344,6 +411,8 @@ Perl_sv_pvn(pTHX_ SV *sv, STRLEN *lp) char * Perl_sv_pvn_nomg(pTHX_ register SV *sv, STRLEN *lp) { + PERL_ARGS_ASSERT_SV_PVN_NOMG; + if (SvPOK(sv)) { *lp = SvCUR(sv); return SvPVX(sv); @@ -358,6 +427,8 @@ Perl_sv_pvn_nomg(pTHX_ register SV *sv, STRLEN *lp) char * Perl_sv_pv(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_PV; + if (SvPOK(sv)) return SvPVX(sv); @@ -371,6 +442,8 @@ Perl_sv_pv(pTHX_ SV *sv) char * Perl_sv_pvn_force(pTHX_ SV *sv, STRLEN *lp) { + PERL_ARGS_ASSERT_SV_PVN_FORCE; + return sv_pvn_force_flags(sv, lp, SV_GMAGIC); } @@ -381,6 +454,8 @@ Perl_sv_pvn_force(pTHX_ SV *sv, STRLEN *lp) char * Perl_sv_pvbyte(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_PVBYTE; + sv_utf8_downgrade(sv, FALSE); return sv_pv(sv); } @@ -402,6 +477,8 @@ instead. char * Perl_sv_pvbyten(pTHX_ SV *sv, STRLEN *lp) { + PERL_ARGS_ASSERT_SV_PVBYTEN; + sv_utf8_downgrade(sv, FALSE); return sv_pvn(sv,lp); } @@ -413,6 +490,8 @@ Perl_sv_pvbyten(pTHX_ SV *sv, STRLEN *lp) char * Perl_sv_pvutf8(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_PVUTF8; + sv_utf8_upgrade(sv); return sv_pv(sv); } @@ -434,6 +513,8 @@ instead. char * Perl_sv_pvutf8n(pTHX_ SV *sv, STRLEN *lp) { + PERL_ARGS_ASSERT_SV_PVUTF8N; + sv_utf8_upgrade(sv); return sv_pvn(sv,lp); } @@ -445,6 +526,8 @@ Perl_sv_pvutf8n(pTHX_ SV *sv, STRLEN *lp) STRLEN Perl_sv_utf8_upgrade(pTHX_ register SV *sv) { + PERL_ARGS_ASSERT_SV_UTF8_UPGRADE; + return sv_utf8_upgrade_flags(sv, SV_GMAGIC); } @@ -453,6 +536,13 @@ Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...) { dTHXs; va_list(arglist); + + /* Easier to special case this here than in embed.pl. (Look at what it + generates for proto.h) */ +#ifdef PERL_IMPLICIT_CONTEXT + PERL_ARGS_ASSERT_FPRINTF_NOCONTEXT; +#endif + va_start(arglist, format); return PerlIO_vprintf(stream, format, arglist); } @@ -462,6 +552,11 @@ Perl_printf_nocontext(const char *format, ...) { dTHX; va_list(arglist); + +#ifdef PERL_IMPLICIT_CONTEXT + PERL_ARGS_ASSERT_PRINTF_NOCONTEXT; +#endif + va_start(arglist, format); return PerlIO_vprintf(PerlIO_stdout(), format, arglist); } @@ -487,6 +582,8 @@ Perl_huge(void) void Perl_gv_fullname(pTHX_ SV *sv, const GV *gv) { + PERL_ARGS_ASSERT_GV_FULLNAME; + gv_fullname3(sv, gv, sv == (const SV*)gv ? "*" : ""); } @@ -494,25 +591,31 @@ Perl_gv_fullname(pTHX_ SV *sv, const GV *gv) void Perl_gv_efullname(pTHX_ SV *sv, const GV *gv) { + PERL_ARGS_ASSERT_GV_EFULLNAME; + gv_efullname3(sv, gv, sv == (const SV*)gv ? "*" : ""); } void Perl_gv_fullname3(pTHX_ SV *sv, const GV *gv, const char *prefix) { + PERL_ARGS_ASSERT_GV_FULLNAME3; + gv_fullname4(sv, gv, prefix, TRUE); } void Perl_gv_efullname3(pTHX_ SV *sv, const GV *gv, const char *prefix) { + PERL_ARGS_ASSERT_GV_EFULLNAME3; + gv_efullname4(sv, gv, prefix, TRUE); } /* =for apidoc gv_fetchmethod -See L. +See L. =cut */ @@ -520,45 +623,33 @@ See L. GV * Perl_gv_fetchmethod(pTHX_ HV *stash, const char *name) { + PERL_ARGS_ASSERT_GV_FETCHMETHOD; + return gv_fetchmethod_autoload(stash, name, TRUE); } HE * Perl_hv_iternext(pTHX_ HV *hv) { + PERL_ARGS_ASSERT_HV_ITERNEXT; + return hv_iternext_flags(hv, 0); } void Perl_hv_magic(pTHX_ HV *hv, GV *gv, int how) { - sv_magic((SV*)hv, (SV*)gv, how, NULL, 0); -} + PERL_ARGS_ASSERT_HV_MAGIC; -AV * -Perl_av_fake(pTHX_ register I32 size, register SV **strp) -{ - register SV** ary; - register AV * const av = (AV*)newSV_type(SVt_PVAV); - Newx(ary,size+1,SV*); - AvALLOC(av) = ary; - Copy(strp,ary,size,SV*); - AvREIFY_only(av); - AvARRAY(av) = ary; - AvFILLp(av) = size - 1; - AvMAX(av) = size - 1; - while (size--) { - assert (*strp); - SvTEMP_off(*strp); - strp++; - } - return av; + sv_magic(MUTABLE_SV(hv), MUTABLE_SV(gv), how, NULL, 0); } bool Perl_do_open(pTHX_ GV *gv, register const char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp) { + PERL_ARGS_ASSERT_DO_OPEN; + return do_openn(gv, name, len, as_raw, rawmode, rawperm, supplied_fp, (SV **) NULL, 0); } @@ -569,6 +660,8 @@ as_raw, int rawmode, int rawperm, PerlIO *supplied_fp, SV *svs, I32 num_svs) { + PERL_ARGS_ASSERT_DO_OPEN9; + PERL_UNUSED_ARG(num_svs); return do_openn(gv, name, len, as_raw, rawmode, rawperm, supplied_fp, &svs, 1); @@ -581,6 +674,9 @@ Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int mode) * This is a stub for any XS code which might have been calling it. */ const char *name = ":raw"; + + PERL_ARGS_ASSERT_DO_BINMODE; + #ifdef PERLIO_USING_CRLF if (!(mode & O_BINARY)) name = ":crlf"; @@ -592,15 +688,9 @@ Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int mode) bool Perl_do_aexec(pTHX_ SV *really, register SV **mark, register SV **sp) { - return do_aexec5(really, mark, sp, 0, 0); -} -#endif + PERL_ARGS_ASSERT_DO_AEXEC; -#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION -bool -Perl_do_exec(pTHX_ const char *cmd) -{ - return do_exec3(cmd,0,0); + return do_aexec5(really, mark, sp, 0, 0); } #endif @@ -611,447 +701,19 @@ Perl_init_i18nl14n(pTHX_ int printwarn) return init_i18nl10n(printwarn); } -OP * -Perl_oopsCV(pTHX_ OP *o) -{ - Perl_croak(aTHX_ "NOT IMPL LINE %d",__LINE__); - /* STUB */ - PERL_UNUSED_ARG(o); - NORETURN_FUNCTION_END; -} - -PP(pp_padany) -{ - DIE(aTHX_ "NOT IMPL LINE %d",__LINE__); -} - -PP(pp_mapstart) -{ - DIE(aTHX_ "panic: mapstart"); /* uses grepstart */ -} - -/* These ops all have the same body as pp_null. */ -PP(pp_scalar) -{ - dVAR; - return NORMAL; -} - -PP(pp_regcmaybe) -{ - dVAR; - return NORMAL; -} - -PP(pp_lineseq) -{ - dVAR; - return NORMAL; -} - -PP(pp_scope) -{ - dVAR; - return NORMAL; -} - -/* Ops that are calls to do_kv. */ -PP(pp_values) -{ - return do_kv(); -} - -PP(pp_keys) -{ - return do_kv(); -} - -/* Ops that are simply calls to other ops. */ -PP(pp_dump) -{ - return pp_goto(); - /*NOTREACHED*/ -} - -PP(pp_dofile) -{ - return pp_require(); -} - -PP(pp_dbmclose) -{ - return pp_untie(); -} - -PP(pp_read) -{ - return pp_sysread(); -} - -PP(pp_recv) -{ - return pp_sysread(); -} - -PP(pp_seek) -{ - return pp_sysseek(); -} - -PP(pp_fcntl) -{ - return pp_ioctl(); -} - -PP(pp_gsockopt) -{ - return pp_ssockopt(); -} - -PP(pp_getsockname) -{ - return pp_getpeername(); -} - -PP(pp_lstat) -{ - return pp_stat(); -} - -PP(pp_fteowned) -{ - return pp_ftrowned(); -} - -PP(pp_ftbinary) -{ - return pp_fttext(); -} - -PP(pp_localtime) -{ - return pp_gmtime(); -} - -PP(pp_shmget) -{ - return pp_semget(); -} - -PP(pp_shmctl) -{ - return pp_semctl(); -} - -PP(pp_shmread) -{ - return pp_shmwrite(); -} - -PP(pp_msgget) -{ - return pp_semget(); -} - -PP(pp_msgctl) -{ - return pp_semctl(); -} - -PP(pp_ghbyname) -{ - return pp_ghostent(); -} - -PP(pp_ghbyaddr) -{ - return pp_ghostent(); -} - -PP(pp_gnbyname) -{ - return pp_gnetent(); -} - -PP(pp_gnbyaddr) -{ - return pp_gnetent(); -} - -PP(pp_gpbyname) -{ - return pp_gprotoent(); -} - -PP(pp_gpbynumber) -{ - return pp_gprotoent(); -} - -PP(pp_gsbyname) -{ - return pp_gservent(); -} - -PP(pp_gsbyport) -{ - return pp_gservent(); -} - -PP(pp_gpwnam) -{ - return pp_gpwent(); -} - -PP(pp_gpwuid) -{ - return pp_gpwent(); -} - -PP(pp_ggrnam) -{ - return pp_ggrent(); -} - -PP(pp_ggrgid) -{ - return pp_ggrent(); -} - -PP(pp_ftsize) -{ - return pp_ftis(); -} - -PP(pp_ftmtime) -{ - return pp_ftis(); -} - -PP(pp_ftatime) -{ - return pp_ftis(); -} - -PP(pp_ftctime) -{ - return pp_ftis(); -} - -PP(pp_ftzero) -{ - return pp_ftrowned(); -} - -PP(pp_ftsock) -{ - return pp_ftrowned(); -} - -PP(pp_ftchr) -{ - return pp_ftrowned(); -} - -PP(pp_ftblk) -{ - return pp_ftrowned(); -} - -PP(pp_ftfile) -{ - return pp_ftrowned(); -} - -PP(pp_ftdir) -{ - return pp_ftrowned(); -} - -PP(pp_ftpipe) -{ - return pp_ftrowned(); -} - -PP(pp_ftsuid) -{ - return pp_ftrowned(); -} - -PP(pp_ftsgid) -{ - return pp_ftrowned(); -} - -PP(pp_ftsvtx) -{ - return pp_ftrowned(); -} - -PP(pp_unlink) -{ - return pp_chown(); -} - -PP(pp_chmod) -{ - return pp_chown(); -} - -PP(pp_utime) -{ - return pp_chown(); -} - -PP(pp_kill) -{ - return pp_chown(); -} - -PP(pp_symlink) -{ - return pp_link(); -} - -PP(pp_ftrwrite) -{ - return pp_ftrread(); -} - -PP(pp_ftrexec) -{ - return pp_ftrread(); -} - -PP(pp_fteread) -{ - return pp_ftrread(); -} - -PP(pp_ftewrite) -{ - return pp_ftrread(); -} - -PP(pp_fteexec) -{ - return pp_ftrread(); -} - -PP(pp_msgsnd) -{ - return pp_shmwrite(); -} - -PP(pp_msgrcv) -{ - return pp_shmwrite(); -} - -PP(pp_syswrite) -{ - return pp_send(); -} - -PP(pp_semop) -{ - return pp_shmwrite(); -} - -PP(pp_dor) -{ - return pp_defined(); -} - -PP(pp_andassign) -{ - return pp_and(); -} - -PP(pp_orassign) -{ - return pp_or(); -} - -PP(pp_dorassign) -{ - return pp_defined(); -} - -PP(pp_lcfirst) -{ - return pp_ucfirst(); -} - -PP(pp_slt) -{ - return pp_sle(); -} - -PP(pp_sgt) -{ - return pp_sle(); -} - -PP(pp_sge) -{ - return pp_sle(); -} - -PP(pp_rindex) -{ - return pp_index(); -} - -PP(pp_hex) -{ - return pp_oct(); -} - -PP(pp_pop) -{ - return pp_shift(); -} - -PP(pp_cos) -{ - return pp_sin(); -} - -PP(pp_exp) -{ - return pp_sin(); -} - -PP(pp_log) -{ - return pp_sin(); -} - -PP(pp_sqrt) -{ - return pp_sin(); -} - -PP(pp_bit_xor) -{ - return pp_bit_or(); -} - -PP(pp_rv2hv) -{ - return Perl_pp_rv2av(aTHX); -} - 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_ARGS_ASSERT_IS_UTF8_STRING_LOC; + return is_utf8_string_loclen(s, len, ep, 0); } @@ -1098,29 +760,38 @@ void Perl_save_long(pTHX_ long int *longp) { dVAR; + + PERL_ARGS_ASSERT_SAVE_LONG; + SSCHECK(3); SSPUSHLONG(*longp); SSPUSHPTR(longp); - SSPUSHINT(SAVEt_LONG); + SSPUSHUV(SAVEt_LONG); } void Perl_save_iv(pTHX_ IV *ivp) { dVAR; + + PERL_ARGS_ASSERT_SAVE_IV; + SSCHECK(3); SSPUSHIV(*ivp); SSPUSHPTR(ivp); - SSPUSHINT(SAVEt_IV); + SSPUSHUV(SAVEt_IV); } void Perl_save_nogv(pTHX_ GV *gv) { dVAR; + + PERL_ARGS_ASSERT_SAVE_NOGV; + SSCHECK(2); SSPUSHPTR(gv); - SSPUSHINT(SAVEt_NSTAB); + SSPUSHUV(SAVEt_NSTAB); } void @@ -1129,13 +800,15 @@ Perl_save_list(pTHX_ register SV **sarg, I32 maxsarg) dVAR; register I32 i; + PERL_ARGS_ASSERT_SAVE_LIST; + for (i = 1; i <= maxsarg; i++) { register SV * const sv = newSV(0); sv_setsv(sv,sarg[i]); SSCHECK(3); SSPUSHPTR(sarg[i]); /* remember the pointer */ SSPUSHPTR(sv); /* remember the value */ - SSPUSHINT(SAVEt_ITEM); + SSPUSHUV(SAVEt_ITEM); } } @@ -1150,6 +823,8 @@ Like C, but also handles 'set' magic. void Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len) { + PERL_ARGS_ASSERT_SV_USEPVN_MG; + sv_usepvn_flags(sv,ptr,len, SV_SMAGIC); } @@ -1166,13 +841,9 @@ magic. See C. void Perl_sv_usepvn(pTHX_ SV *sv, char *ptr, STRLEN len) { - sv_usepvn_flags(sv,ptr,len, 0); -} + PERL_ARGS_ASSERT_SV_USEPVN; -void -Perl_cv_ckproto(pTHX_ const CV *cv, const GV *gv, const char *p) -{ - cv_ckproto_len(cv, gv, p, p ? strlen(p) : 0); + sv_usepvn_flags(sv,ptr,len, 0); } /* @@ -1188,6 +859,8 @@ 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) { + PERL_ARGS_ASSERT_UNPACK_STR; + PERL_UNUSED_ARG(strbeg); PERL_UNUSED_ARG(new_s); PERL_UNUSED_ARG(ocnt); @@ -1207,6 +880,8 @@ flags are not used. This call should not be used; use packlist instead. 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_ARGS_ASSERT_PACK_CAT; + PERL_UNUSED_ARG(next_in_list); PERL_UNUSED_ARG(flags); @@ -1222,6 +897,8 @@ Perl_hv_store_ent(pTHX_ HV *hv, SV *keysv, SV *val, U32 hash) bool 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; } @@ -1229,6 +906,8 @@ Perl_hv_exists_ent(pTHX_ HV *hv, SV *keysv, U32 hash) HE * Perl_hv_fetch_ent(pTHX_ HV *hv, SV *keysv, I32 lval, U32 hash) { + PERL_ARGS_ASSERT_HV_FETCH_ENT; + return (HE *)hv_common(hv, keysv, NULL, 0, 0, (lval ? HV_FETCH_LVALUE : 0), NULL, hash); } @@ -1236,8 +915,10 @@ Perl_hv_fetch_ent(pTHX_ HV *hv, SV *keysv, I32 lval, U32 hash) SV * Perl_hv_delete_ent(pTHX_ HV *hv, SV *keysv, I32 flags, U32 hash) { - return (SV *) hv_common(hv, keysv, NULL, 0, 0, flags | HV_DELETE, NULL, - hash); + PERL_ARGS_ASSERT_HV_DELETE_ENT; + + return MUTABLE_SV(hv_common(hv, keysv, NULL, 0, 0, flags | HV_DELETE, NULL, + hash)); } SV** @@ -1271,6 +952,8 @@ Perl_hv_exists(pTHX_ HV *hv, const char *key, I32 klen_i32) STRLEN klen; int flags; + PERL_ARGS_ASSERT_HV_EXISTS; + if (klen_i32 < 0) { klen = -klen_i32; flags = HVhek_UTF8; @@ -1288,6 +971,8 @@ Perl_hv_fetch(pTHX_ HV *hv, const char *key, I32 klen_i32, I32 lval) STRLEN klen; int flags; + PERL_ARGS_ASSERT_HV_FETCH; + if (klen_i32 < 0) { klen = -klen_i32; flags = HVhek_UTF8; @@ -1306,6 +991,8 @@ Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen_i32, I32 flags) STRLEN klen; int k_flags; + PERL_ARGS_ASSERT_HV_DELETE; + if (klen_i32 < 0) { klen = -klen_i32; k_flags = HVhek_UTF8; @@ -1313,8 +1000,8 @@ Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen_i32, I32 flags) klen = klen_i32; k_flags = 0; } - return (SV *) hv_common(hv, NULL, key, klen, k_flags, flags | HV_DELETE, - NULL, 0); + return MUTABLE_SV(hv_common(hv, NULL, key, klen, k_flags, flags | HV_DELETE, + NULL, 0)); } /* Functions after here were made mathoms post 5.10.0 but pre 5.8.9 */ @@ -1322,7 +1009,7 @@ Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen_i32, I32 flags) AV * Perl_newAV(pTHX) { - return (AV*)newSV_type(SVt_PVAV); + return MUTABLE_AV(newSV_type(SVt_PVAV)); /* sv_upgrade does AvREAL_only(): AvALLOC(av) = 0; AvARRAY(av) = NULL; @@ -1332,20 +1019,199 @@ Perl_newAV(pTHX) HV * Perl_newHV(pTHX) { - HV * const hv = (HV*)newSV_type(SVt_PVHV); + HV * const hv = MUTABLE_HV(newSV_type(SVt_PVHV)); assert(!SvOK(hv)); return hv; } +void +Perl_sv_insert(pTHX_ SV *const bigstr, const STRLEN offset, const STRLEN len, + const char *const little, const STRLEN littlelen) +{ + PERL_ARGS_ASSERT_SV_INSERT; + sv_insert_flags(bigstr, offset, len, little, littlelen, SV_GMAGIC); +} + +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); +} + +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(); +} + +#ifdef PERL_DONT_CREATE_GVSV +GV * +Perl_gv_SVadd(pTHX_ GV *gv) +{ + return gv_SVadd(gv); +} +#endif + +GV * +Perl_gv_AVadd(pTHX_ GV *gv) +{ + return gv_AVadd(gv); +} + +GV * +Perl_gv_HVadd(pTHX_ register GV *gv) +{ + return gv_HVadd(gv); +} + +GV * +Perl_gv_IOadd(pTHX_ register GV *gv) +{ + return gv_IOadd(gv); +} + +IO * +Perl_newIO(pTHX) +{ + return MUTABLE_IO(newSV_type(SVt_PVIO)); +} + +I32 +Perl_my_stat(pTHX) +{ + return my_stat_flags(SV_GMAGIC); +} + +I32 +Perl_my_lstat(pTHX) +{ + return my_lstat_flags(SV_GMAGIC); +} + +I32 +Perl_sv_eq(pTHX_ register SV *sv1, register SV *sv2) +{ + return sv_eq_flags(sv1, sv2, SV_GMAGIC); +} + +#ifdef USE_LOCALE_COLLATE +char * +Perl_sv_collxfrm(pTHX_ SV *const sv, STRLEN *const nxp) +{ + return sv_collxfrm_flags(sv, nxp, SV_GMAGIC); +} +#endif + +bool +Perl_sv_2bool(pTHX_ register SV *const sv) +{ + return sv_2bool_flags(sv, SV_GMAGIC); +} + + +/* +=for apidoc custom_op_name +Return the name for a given custom op. This was once used by the OP_NAME +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 +compatibility, and should not be used. + +=cut +*/ + +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); +} + +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); +} + +CV * +Perl_newSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *block) +{ + return Perl_newATTRSUB(aTHX_ floor, o, proto, NULL, block); +} + +UV +Perl_to_utf8_fold(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp) +{ + PERL_ARGS_ASSERT_TO_UTF8_FOLD; + + return _to_utf8_fold_flags(p, ustrp, lenp, FOLD_FLAGS_FULL, NULL); +} + +UV +Perl_to_utf8_lower(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp) +{ + PERL_ARGS_ASSERT_TO_UTF8_LOWER; + + return _to_utf8_lower_flags(p, ustrp, lenp, FALSE, NULL); +} + +UV +Perl_to_utf8_title(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp) +{ + PERL_ARGS_ASSERT_TO_UTF8_TITLE; + + return _to_utf8_title_flags(p, ustrp, lenp, FALSE, NULL); +} + +UV +Perl_to_utf8_upper(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp) +{ + PERL_ARGS_ASSERT_TO_UTF8_UPPER; + + return _to_utf8_upper_flags(p, ustrp, lenp, FALSE, NULL); +} + +END_EXTERN_C + #endif /* NO_MATHOMS */ /* * Local variables: * c-indentation-style: bsd * c-basic-offset: 4 - * indent-tabs-mode: t + * indent-tabs-mode: nil * End: * - * ex: set ts=8 sts=4 sw=4 noet: + * ex: set ts=8 sts=4 sw=4 et: */