#include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
+#include "hook_op_check.h"
#undef printf
#include "stolen_chunk_of_toke.c"
#include <stdio.h>
#define DD_AM_LEXING_CHECK (PL_lex_state == LEX_NORMAL || PL_lex_state == LEX_INTERPNORMAL)
-#ifdef PL_parser
+#if defined(PL_parser) || defined(PERL_5_9_PLUS)
#define DD_HAVE_PARSER PL_parser
#define DD_HAVE_LEX_STUFF (PL_parser && PL_lex_stuff)
#define DD_AM_LEXING (PL_parser && DD_AM_LEXING_CHECK)
#define DD_AM_LEXING DD_AM_LEXING_CHECK
#endif
+static OP *previous_op = NULL;
+
/* thing that decides whether we're dealing with a declarator */
int dd_is_declarator(pTHX_ char* name) {
/* $declarators{$current_package_name} */
+ if (!HvNAME(PL_curstash))
+ return -1;
+
is_declarator_pack_ref = hv_fetch(is_declarator, HvNAME(PL_curstash),
strlen(HvNAME(PL_curstash)), FALSE);
}
char* dd_get_linestr(pTHX) {
+ if (!DD_HAVE_PARSER) {
+ return NULL;
+ }
return SvPVX(PL_linestr);
}
void dd_set_linestr(pTHX_ char* new_value) {
- int new_len = strlen(new_value);
- char* old_linestr = SvPVX(PL_linestr);
+ 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 (DD_HAVE_LEX_STUFF ? SvPVX(PL_lex_stuff) : "");
}
-char* dd_clear_lex_stuff(pTHX) {
+void dd_clear_lex_stuff(pTHX) {
if (DD_HAVE_PARSER)
PL_lex_stuff = (SV*)NULL;
}
}
int dd_get_linestr_offset(pTHX) {
- char* linestr = SvPVX(PL_linestr);
+ char* linestr;
+ if (!DD_HAVE_PARSER) {
+ return -1;
+ }
+ linestr = SvPVX(PL_linestr);
return PL_bufptr - 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_old_ck_rv2cv)(pTHX_ OP *op);
-
-STATIC OP *dd_ck_rv2cv(pTHX_ OP *o) {
+STATIC OP *dd_ck_rv2cv(pTHX_ OP *o, void *user_data) {
+ dSP;
OP* kid;
int dd_flags;
- char* cb_args[6];
- o = dd_old_ck_rv2cv(aTHX_ o); /* let the original do its job */
+ PERL_UNUSED_VAR(user_data);
if (in_declare) {
- cb_args[0] = NULL;
if (dd_debug) {
printf("Deconstructing declare\n");
printf("PL_bufptr: %s\n", PL_bufptr);
printf("linestr: %s\n", SvPVX(PL_linestr));
printf("linestr len: %i\n", PL_bufend - SvPVX(PL_linestr));
}
- call_argv("Devel::Declare::done_declare", G_VOID|G_DISCARD, cb_args);
+
+ ENTER;
+ SAVETMPS;
+
+ PUSHMARK(SP);
+
+ call_pv("Devel::Declare::done_declare", G_VOID|G_DISCARD);
+
+ FREETMPS;
+ LEAVE;
+
if (dd_debug) {
printf("PL_bufptr: %s\n", PL_bufptr);
printf("bufend at: %i\n", PL_bufend - PL_bufptr);
return o;
}
-STATIC OP *(*dd_old_ck_entereval)(pTHX_ OP *op);
-
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) {
- o = dd_old_ck_entereval(aTHX_ o); /* let the original do its job */
+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;
return count;
}
-STATIC OP *(*dd_old_ck_const)(pTHX_ OP*op);
-
-STATIC OP *dd_ck_const(pTHX_ OP *o) {
+STATIC OP *dd_ck_const(pTHX_ OP *o, void *user_data) {
int dd_flags;
- char* s;
char* name;
- o = dd_old_ck_const(aTHX_ o); /* let the original do its job */
+ 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;
+ if (previous_op != NULL) {
+ switch (previous_op->op_type) {
+ case OP_QR:
+ case OP_MATCH:
+ case OP_SUBST:
+ case OP_TRANS:
+ return o;
+ break;
+ default:
+ break;
+ }
+ }
dd_linestr_callback(aTHX_ "const", name);
- return o;
+ return o;
+}
+
+STATIC OP *
+remember_previous_op (pTHX_ OP *o, void *user_data)
+{
+ PERL_UNUSED_VAR (user_data);
+ previous_op = o;
+ return o;
}
static int initialized = 0;
void
setup()
+ PREINIT:
+ I32 i;
CODE:
if (!initialized++) {
- dd_old_ck_rv2cv = PL_check[OP_RV2CV];
- PL_check[OP_RV2CV] = dd_ck_rv2cv;
- dd_old_ck_entereval = PL_check[OP_ENTEREVAL];
- PL_check[OP_ENTEREVAL] = dd_ck_entereval;
- dd_old_ck_const = PL_check[OP_CONST];
- PL_check[OP_CONST] = dd_ck_const;
+ hook_op_check(OP_RV2CV, dd_ck_rv2cv, NULL);
+ hook_op_check(OP_ENTEREVAL, dd_ck_entereval, NULL);
+ hook_op_check(OP_CONST, dd_ck_const, NULL);
+ }
+ for (i = 0; i < OP_max; i++) {
+ (void)hook_op_check(i, remember_previous_op, NULL);
}
filter_add(dd_filter_realloc, NULL);
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);
projects / p5sagit/Devel-Declare.git / blobdiff