/* placeholders for PL_check entries we wrap */
STATIC OP *(*dd_old_ck_rv2cv)(pTHX_ OP *op);
-STATIC OP *(*dd_old_ck_lineseq)(pTHX_ OP *op);
+STATIC OP *(*dd_old_ck_entereval)(pTHX_ OP *op);
/* flag to trigger removal of temporary declaree sub */
while (*s && *s != '{') ++s;
if (*s) {
int tlen = s - traitstart;
- Newx(found_traits, tlen+1, char);
+ New(0, found_traits, tlen+1, char);
Copy(traitstart, found_traits, tlen, char);
found_traits[tlen] = 0;
#ifdef DD_DEBUG
#endif
SvGROW(PL_linestr, (STRLEN)(old_len + strlen(retstr)));
if (start_diff = SvPVX(PL_linestr) - old_start) {
-#ifdef DD_DEBUG
- printf("linestr realloc'ed, moving stuff about by %i\n", start_diff);
-#endif
- s += start_diff;
- PL_linestart += start_diff;
- PL_bufptr += start_diff;
- PL_bufend += start_diff;
- PL_oldbufptr += start_diff;
- PL_oldoldbufptr += start_diff;
- if (PL_last_lop)
- PL_last_lop += start_diff;
- if (PL_last_uni)
- PL_last_uni += start_diff;
+ Perl_croak(aTHX_ "forced to realloc PL_linestr for line %s, bailing out before we crash harder", SvPVX(PL_linestr));
}
memmove(s+strlen(retstr), s, (PL_bufend - s)+1);
memmove(s, retstr, strlen(retstr));
return o;
}
-STATIC OP *dd_ck_lineseq(pTHX_ OP *o) {
- AV* pad_inject_list;
- SV** to_inject_ref;
- int i, pad_inject_list_last;
-
- o = dd_old_ck_lineseq(aTHX_ o);
-
- pad_inject_list = get_av("Devel::Declare::next_pad_inject", FALSE);
- if (!pad_inject_list)
- return o;
-
- pad_inject_list_last = av_len(pad_inject_list);
-
- if (pad_inject_list_last == -1)
- return o;
-
- for (i = 0; i <= pad_inject_list_last; i++) {
- to_inject_ref = av_fetch(pad_inject_list, i, FALSE);
- if (to_inject_ref && SvPOK(*to_inject_ref)) {
+OP* dd_pp_entereval(pTHX) {
+ dSP;
+ dPOPss;
+ STRLEN len;
+ const char* s;
+ if (SvPOK(sv)) {
#ifdef DD_DEBUG
- printf("Injecting %s into pad\n", SvPVX(*to_inject_ref));
+ printf("mangling eval sv\n");
#endif
- allocmy(SvPVX(*to_inject_ref));
+ if (SvREADONLY(sv))
+ sv = sv_2mortal(newSVsv(sv));
+ s = SvPVX(sv);
+ len = SvCUR(sv);
+ if (!len || s[len-1] != ';') {
+ if (!(SvFLAGS(sv) & SVs_TEMP))
+ sv = sv_2mortal(newSVsv(sv));
+ sv_catpvn(sv, "\n;", 2);
}
+ SvGROW(sv, 8192);
}
+ PUSHs(sv);
+ return PL_ppaddr[OP_ENTEREVAL](aTHX);
+}
- av_clear(pad_inject_list);
-
+STATIC OP *dd_ck_entereval(pTHX_ OP *o) {
+ o = dd_old_ck_entereval(aTHX_ o); /* let the original do its job */
+ if (o->op_ppaddr == PL_ppaddr[OP_ENTEREVAL])
+ o->op_ppaddr = dd_pp_entereval;
return o;
}
+static I32 dd_filter_realloc(pTHX_ int idx, SV *sv, int maxlen)
+{
+ const I32 count = FILTER_READ(idx+1, sv, maxlen);
+ SvGROW(sv, 8192); /* please try not to have a line longer than this :) */
+ /* filter_del(dd_filter_realloc); */
+ return count;
+}
+
static int initialized = 0;
MODULE = Devel::Declare PACKAGE = Devel::Declare
if (!initialized++) {
dd_old_ck_rv2cv = PL_check[OP_RV2CV];
PL_check[OP_RV2CV] = dd_ck_rv2cv;
- dd_old_ck_lineseq = PL_check[OP_LINESEQ];
- PL_check[OP_LINESEQ] = dd_ck_lineseq;
- }
-
-void
-teardown()
- CODE:
- /* ensure we only uninit when number of teardown calls matches
- number of setup calls */
- if (initialized && !--initialized) {
- PL_check[OP_RV2CV] = dd_old_ck_rv2cv;
+ dd_old_ck_entereval = PL_check[OP_ENTEREVAL];
+ PL_check[OP_ENTEREVAL] = dd_ck_entereval;
}
+ filter_add(dd_filter_realloc, NULL);