#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 Newx(v,n,t) New(0,v,n,t)
#endif /* !Newx */
-#if 1
-#define DD_HAS_TRAITS
-#endif
-
#if 0
#define DD_DEBUG
#endif
-#define DD_HANDLE_NAME 1
-#define DD_HANDLE_PROTO 2
-#define DD_HANDLE_PACKAGE 8
-
#ifdef DD_DEBUG
#define DD_DEBUG_S printf("Buffer: %s\n", s);
#else
static int in_declare = 0;
+/* in 5.10, PL_parser will be NULL if we aren't parsing, and PL_lex_stuff
+ is a lookup into it - so if anything else we can use to tell, so we
+ need to be a bit more careful if PL_parser exists */
+
+#define DD_AM_LEXING_CHECK (PL_lex_state == LEX_NORMAL || PL_lex_state == LEX_INTERPNORMAL)
+
+#ifdef PL_parser
+#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)
+#else
+#define DD_HAVE_PARSER 1
+#define DD_HAVE_LEX_STUFF PL_lex_stuff
+#define DD_AM_LEXING DD_AM_LEXING_CHECK
+#endif
+
/* thing that decides whether we're dealing with a declarator */
int dd_is_declarator(pTHX_ char* name) {
/* callback thingy */
-void dd_linestr_callback (pTHX_ char* type, char* name, char* s) {
+void dd_linestr_callback (pTHX_ char* type, char* name) {
char* linestr = SvPVX(PL_linestr);
- int offset = s - linestr;
+ int offset = PL_bufptr - linestr;
dSP;
}
char* dd_get_lex_stuff(pTHX) {
- return SvPVX(PL_lex_stuff);
+ return (DD_HAVE_LEX_STUFF ? SvPVX(PL_lex_stuff) : "");
}
char* dd_clear_lex_stuff(pTHX) {
- PL_lex_stuff = Nullsv;
+ if (DD_HAVE_PARSER)
+ PL_lex_stuff = Nullsv;
}
char* dd_get_curstash_name(pTHX) {
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) {
OP* kid;
- char* s;
- char* save_s;
- char tmpbuf[sizeof PL_tokenbuf];
- char found_name[sizeof PL_tokenbuf];
- char* found_proto = NULL, *found_traits = NULL;
- STRLEN len = 0;
int dd_flags;
char* cb_args[6];
- dSP; /* define stack pointer for later call stuff */
- char* retstr;
- STRLEN n_a; /* for POPpx */
-
- o = dd_old_ck_rv2cv(aTHX_ o); /* let the original do its job */
if (in_declare) {
cb_args[0] = NULL;
printf("linestr len: %i\n", PL_bufend - SvPVX(PL_linestr));
#endif
call_argv("Devel::Declare::done_declare", G_VOID|G_DISCARD, cb_args);
- in_declare--;
#ifdef DD_DEBUG
printf("PL_bufptr: %s\n", PL_bufptr);
printf("bufend at: %i\n", PL_bufend - PL_bufptr);
if (kid->op_type != OP_GV) /* not a GV so ignore */
return o;
- if (PL_lex_state != LEX_NORMAL && PL_lex_state != LEX_INTERPNORMAL)
+ if (!DD_AM_LEXING)
return o; /* not lexing? */
- /* I was doing this, but the CONST wrap can't so it didn't gain anything
- stash = GvSTASH(kGVOP_gv); */
-
#ifdef DD_DEBUG
printf("Checking GV %s -> %s\n", HvNAME(GvSTASH(kGVOP_gv)), GvNAME(kGVOP_gv));
#endif
printf("dd_flags are: %i\n", dd_flags);
#endif
- s = PL_bufptr; /* copy the current buffer pointer */
-
- DD_DEBUG_S
-
#ifdef DD_DEBUG
printf("PL_tokenbuf: %s\n", PL_tokenbuf);
#endif
- dd_linestr_callback(aTHX_ "rv2cv", GvNAME(kGVOP_gv), s);
+ dd_linestr_callback(aTHX_ "rv2cv", GvNAME(kGVOP_gv));
return o;
}
-STATIC OP *(*dd_old_ck_entereval)(pTHX_ OP *op);
-
OP* dd_pp_entereval(pTHX) {
dSP;
dPOPss;
}
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;
return count;
}
-STATIC OP *(*dd_old_ck_const)(pTHX_ OP*op);
-
STATIC OP *dd_ck_const(pTHX_ OP *o) {
int dd_flags;
char* s;
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 */
+
+ if (DD_HAVE_LEX_STUFF)
+ return o;
/* don't try and look this up if it's not a string const */
if (!SvPOK(cSVOPo->op_sv))
if (dd_flags == -1)
return o;
- s = PL_bufptr;
-
- dd_linestr_callback(aTHX_ "const", name, s);
+ dd_linestr_callback(aTHX_ "const", name);
return o;
}
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);
+ hook_op_check(OP_ENTEREVAL, dd_ck_entereval);
+ hook_op_check(OP_CONST, dd_ck_const);
}
filter_add(dd_filter_realloc, NULL);
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);