# define MGf_LOCAL 0
#endif
+#ifndef IN_PERL_COMPILETIME
+# define IN_PERL_COMPILETIME (PL_curcop == &PL_compiling)
+#endif
+
/* uvar magic and Hash::Util::FieldHash were commited with 28419 */
#if VMG_HAS_PERL_MAINT(5, 9, 4, 28419) || VMG_HAS_PERL(5, 10, 0)
# define VMG_UVAR 1
#define vmg_data_new(C, S, A) vmg_data_new(aTHX_ (C), (S), (A))
SV *nsv;
I32 i, alen = (args == NULL) ? 0 : av_len(args);
+ I32 flags = G_SCALAR;
dSP;
int count;
PUSHs(*av_fetch(args, i, 0));
PUTBACK;
- count = call_sv(ctor, G_SCALAR);
+ if (IN_PERL_COMPILETIME)
+ flags |= G_EVAL | G_KEEPERR;
+
+ count = call_sv(ctor, flags);
SPAGAIN;
SV *svr;
int ret;
unsigned int i;
+ I32 flags = G_SCALAR;
dSP;
int count;
va_end(ap);
PUTBACK;
- count = call_sv(cb, G_SCALAR);
+ if (IN_PERL_COMPILETIME)
+ flags |= G_EVAL | G_KEEPERR;
+
+ count = call_sv(cb, flags);
SPAGAIN;
STATIC U32 vmg_svt_len(pTHX_ SV *sv, MAGIC *mg) {
SV *svr;
- I32 len;
+ I32 len, has_array;
U32 ret;
+ I32 flags = G_SCALAR;
dSP;
int count;
+ has_array = SvTYPE(sv) == SVt_PVAV;
+
ENTER;
SAVETMPS;
EXTEND(SP, 3);
PUSHs(sv_2mortal(newRV_inc(sv)));
PUSHs(mg->mg_obj ? mg->mg_obj : &PL_sv_undef);
- if (SvTYPE(sv) == SVt_PVAV) {
+ if (has_array) {
len = av_len((AV *) sv) + 1;
mPUSHi(len);
} else {
- len = 1;
+ len = 0;
PUSHs(&PL_sv_undef);
}
PUTBACK;
- count = call_sv(SV2MGWIZ(mg->mg_ptr)->cb_len, G_SCALAR);
+ if (IN_PERL_COMPILETIME)
+ flags |= G_EVAL | G_KEEPERR;
+
+ count = call_sv(SV2MGWIZ(mg->mg_ptr)->cb_len, flags);
SPAGAIN;
FREETMPS;
LEAVE;
- return ret - 1;
+ return has_array ? ret - 1 : ret;
}
STATIC int vmg_svt_clear(pTHX_ SV *sv, MAGIC *mg) {