Don't define PERL_NO_GET_CONTEXT.

[p5sagit/Devel-Declare.git] / Declare.xs

diff --git a/Declare.xs b/Declare.xs
index 17a0cd3..142a816 100644 (file)
--- a/Declare.xs
+++ b/Declare.xs
@@ -1,5 +1,3 @@
-#define PERL_CORE
-#define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
@@ -12,18 +10,10 @@
 # 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
@@ -37,6 +27,22 @@
 
 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) {
@@ -82,10 +88,10 @@ 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;
 
@@ -112,10 +118,10 @@ void dd_set_linestr(pTHX_ char* new_value) {
   int new_len = strlen(new_value);
   char* old_linestr = SvPVX(PL_linestr);
 
-  SvGROW(PL_linestr, strlen(new_value));
+  SvGROW(PL_linestr, new_len);
 
   if (SvPVX(PL_linestr) != old_linestr)
-    Perl_croak(aTHX_ "forced to realloc PL_linestr for line %s, bailing out before we crash harder", SvPVX(PL_linestr));
+    croak("forced to realloc PL_linestr for line %s, bailing out before we crash harder", SvPVX(PL_linestr));
 
   memcpy(SvPVX(PL_linestr), new_value, new_len+1);
 
@@ -125,17 +131,23 @@ void dd_set_linestr(pTHX_ char* new_value) {
 }
 
 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 = (SV*)NULL;
 }
 
 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) {
 
   /*
@@ -182,17 +194,8 @@ 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 */
 
@@ -206,7 +209,6 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o) {
     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);
@@ -222,12 +224,9 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o) {
   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
@@ -241,15 +240,11 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o) {
   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;
 }
@@ -304,6 +299,12 @@ STATIC OP *dd_ck_const(pTHX_ OP *o) {
 
   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))
     return o;
@@ -315,9 +316,7 @@ STATIC OP *dd_ck_const(pTHX_ OP *o) {
   if (dd_flags == -1)
     return o;
 
-  s = PL_bufptr;
-
-  dd_linestr_callback(aTHX_ "const", name, s);
+  dd_linestr_callback(aTHX_ "const", name);
 
   return o;  
 }
@@ -373,6 +372,13 @@ get_curstash_name()
     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);