#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)
/* $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);
LEAVE;
}
-char* dd_get_linestr(pTHX) {
- return SvPVX(PL_linestr);
-}
-
-void dd_set_linestr(pTHX_ char* new_value) {
- 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));
- }
-
- SvGROW(PL_linestr, new_len);
-
- memcpy(SvPVX(PL_linestr), new_value, new_len+1);
-
- SvCUR_set(PL_linestr, new_len);
-
- PL_bufend = SvPVX(PL_linestr) + new_len;
-}
-
char* dd_get_lex_stuff(pTHX) {
return (DD_HAVE_LEX_STUFF ? SvPVX(PL_lex_stuff) : "");
}
return HvNAME(PL_curstash);
}
-int dd_get_linestr_offset(pTHX) {
- char* linestr = SvPVX(PL_linestr);
- return PL_bufptr - linestr;
-}
-
char* dd_move_past_token (pTHX_ char* s) {
/*
/* 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) {
OP* kid;
int dd_flags;
- char* cb_args[6];
-
- o = dd_old_ck_rv2cv(aTHX_ o); /* let the original do its job */
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);
+
+ dSP;
+
+ 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;
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) {
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* name;
- o = dd_old_ck_const(aTHX_ o); /* let the original do its job */
-
/* if this is set, we just grabbed a delimited string or something,
not a bareword, so NO TOUCHY */
setup()
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);
}
filter_add(dd_filter_realloc, NULL);
char*
-get_linestr()
- CODE:
- RETVAL = dd_get_linestr(aTHX);
- OUTPUT:
- RETVAL
-
-void
-set_linestr(char* new_value)
- CODE:
- dd_set_linestr(aTHX_ new_value);
-
-char*
get_lex_stuff()
CODE:
RETVAL = dd_get_lex_stuff(aTHX);
RETVAL
int
-get_linestr_offset()
- CODE:
- RETVAL = dd_get_linestr_offset(aTHX);
- OUTPUT:
- RETVAL
-
-int
toke_scan_word(int offset, int handle_package)
CODE:
RETVAL = dd_toke_scan_word(aTHX_ offset, handle_package);