/* $declarators{$current_package_name} */
if (!HvNAME(PL_curstash))
- return -1;
+ return -1;
is_declarator_pack_ref = hv_fetch(is_declarator, HvNAME(PL_curstash),
strlen(HvNAME(PL_curstash)), FALSE);
/* requires SvIOK as well as TRUE since flags not being an int is useless */
if (!is_declarator_flag_ref
- || !SvIOK(*is_declarator_flag_ref)
+ || !SvIOK(*is_declarator_flag_ref)
|| !SvTRUE(*is_declarator_flag_ref))
return -1;
}
void dd_set_linestr(pTHX_ char* new_value) {
- int new_len = strlen(new_value);
+ unsigned int new_len = strlen(new_value);
if (SvLEN(PL_linestr) < new_len) {
croak("forced to realloc PL_linestr for line %s, bailing out before we crash harder", SvPVX(PL_linestr));
return s - base_s;
}
+int dd_toke_scan_ident(pTHX_ int offset) {
+ char tmpbuf[sizeof PL_tokenbuf];
+ char* base_s = SvPVX(PL_linestr) + offset;
+ char* s = scan_ident(base_s, PL_bufend, tmpbuf, sizeof tmpbuf, 0);
+ return s - base_s;
+}
+
int dd_toke_scan_str(pTHX_ int offset) {
char* base_s = SvPVX(PL_linestr) + offset;
char* s = scan_str(base_s, FALSE, FALSE);
/* replacement PL_check rv2cv entry */
STATIC OP *dd_ck_rv2cv(pTHX_ OP *o, void *user_data) {
+ dSP;
OP* kid;
int dd_flags;
+ PERL_UNUSED_VAR(user_data);
+
if (in_declare) {
if (dd_debug) {
printf("Deconstructing declare\n");
printf("linestr len: %i\n", PL_bufend - SvPVX(PL_linestr));
}
- dSP;
-
ENTER;
SAVETMPS;
-
+
PUSHMARK(SP);
-
+
call_pv("Devel::Declare::done_declare", G_VOID|G_DISCARD);
FREETMPS;
OP* dd_pp_entereval(pTHX) {
dSP;
- dPOPss;
STRLEN len;
const char* s;
+ SV *sv;
+#ifdef PERL_5_9_PLUS
+ SV *saved_hh;
+ if (PL_op->op_private & OPpEVAL_HAS_HH) {
+ saved_hh = POPs;
+ }
+#endif
+ sv = POPs;
if (SvPOK(sv)) {
if (dd_debug) {
printf("mangling eval sv\n");
SvGROW(sv, 8192);
}
PUSHs(sv);
+#ifdef PERL_5_9_PLUS
+ if (PL_op->op_private & OPpEVAL_HAS_HH) {
+ PUSHs(saved_hh);
+ }
+#endif
return PL_ppaddr[OP_ENTEREVAL](aTHX);
}
STATIC OP *dd_ck_entereval(pTHX_ OP *o, void *user_data) {
+ PERL_UNUSED_VAR(user_data);
+
if (o->op_ppaddr == PL_ppaddr[OP_ENTEREVAL])
o->op_ppaddr = dd_pp_entereval;
return o;
int dd_flags;
char* name;
+ PERL_UNUSED_VAR(user_data);
+
/* if this is set, we just grabbed a delimited string or something,
not a bareword, so NO TOUCHY */
if (dd_flags == -1)
return o;
+ switch (PL_lex_inwhat) {
+ case OP_QR:
+ case OP_MATCH:
+ case OP_SUBST:
+ case OP_TRANS:
+ case OP_BACKTICK:
+ case OP_STRINGIFY:
+ return o;
+ break;
+ default:
+ break;
+ }
+
dd_linestr_callback(aTHX_ "const", name);
- return o;
+ return o;
}
static int initialized = 0;
RETVAL
int
+toke_scan_ident(int offset)
+ CODE:
+ RETVAL = dd_toke_scan_ident(aTHX_ offset);
+ OUTPUT:
+ RETVAL
+
+int
toke_skipspace(int offset)
CODE:
RETVAL = dd_toke_skipspace(aTHX_ offset);