X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mathoms.c;h=7154245d70c29f96a126f4ff448a2d9eb0c7dd16;hb=321499b5be1bfbade4d0e2e11136d1d4d87a5e7f;hp=179c608698f644fe1b877c1d9aa46aa9ca5e64e9;hpb=b429380fd7d54c14783866916eff039809949692;p=p5sagit%2Fp5-mst-13.2.git diff --git a/mathoms.c b/mathoms.c index 179c608..7154245 100644 --- a/mathoms.c +++ b/mathoms.c @@ -16,7 +16,7 @@ * [p.5 of _The Lord of the Rings_: "Prologue"] */ -#ifndef NO_MATHOMS + /* * This file contains mathoms, various binary artifacts from previous @@ -31,11 +31,18 @@ #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 + 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); @@ -70,6 +77,7 @@ 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); /* ref() is now a macro using Perl_doref; * this version provided for binary compatibility only. @@ -134,6 +142,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 */ @@ -155,6 +174,7 @@ use the macro wrapper C instead. char * Perl_sv_2pv_nolen(pTHX_ register SV *sv) { + PERL_ARGS_ASSERT_SV_2PV_NOLEN; return sv_2pv(sv, NULL); } @@ -607,29 +627,6 @@ Perl_hv_magic(pTHX_ HV *hv, GV *gv, int how) sv_magic(MUTABLE_SV(hv), MUTABLE_SV(gv), how, NULL, 0); } -AV * -Perl_av_fake(pTHX_ register I32 size, register SV **strp) -{ - register SV** ary; - register AV * const av = MUTABLE_AV(newSV_type(SVt_PVAV)); - - PERL_ARGS_ASSERT_AV_FAKE; - - 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; -} - bool Perl_do_open(pTHX_ GV *gv, register const char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp) @@ -700,11 +697,13 @@ Perl_init_i18nl14n(pTHX_ int printwarn) PP(pp_padany) { DIE(aTHX_ "NOT IMPL LINE %d",__LINE__); + return NORMAL; } PP(pp_mapstart) { DIE(aTHX_ "panic: mapstart"); /* uses grepstart */ + return NORMAL; } /* These ops all have the same body as pp_null. */ @@ -1185,7 +1184,7 @@ Perl_save_long(pTHX_ long int *longp) SSCHECK(3); SSPUSHLONG(*longp); SSPUSHPTR(longp); - SSPUSHINT(SAVEt_LONG); + SSPUSHUV(SAVEt_LONG); } void @@ -1198,7 +1197,7 @@ Perl_save_iv(pTHX_ IV *ivp) SSCHECK(3); SSPUSHIV(*ivp); SSPUSHPTR(ivp); - SSPUSHINT(SAVEt_IV); + SSPUSHUV(SAVEt_IV); } void @@ -1210,7 +1209,7 @@ Perl_save_nogv(pTHX_ GV *gv) SSCHECK(2); SSPUSHPTR(gv); - SSPUSHINT(SAVEt_NSTAB); + SSPUSHUV(SAVEt_NSTAB); } void @@ -1227,7 +1226,7 @@ Perl_save_list(pTHX_ register SV **sarg, I32 maxsarg) SSCHECK(3); SSPUSHPTR(sarg[i]); /* remember the pointer */ SSPUSHPTR(sv); /* remember the value */ - SSPUSHINT(SAVEt_ITEM); + SSPUSHUV(SAVEt_ITEM); } } @@ -1452,6 +1451,76 @@ Perl_sv_insert(pTHX_ SV *const bigstr, const STRLEN offset, const STRLEN len, 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)); +} + #endif /* NO_MATHOMS */ /*