X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Declare.xs;h=83ebc1d0062d68f46f396e2221f9258b2f9b02fd;hb=hook_parser;hp=d4b74f907ed4af76a6dfb4ecd68227c2c749afcc;hpb=79abf18a844b458deb088ac4fd79a7332e54eb1b;p=p5sagit%2FDevel-Declare.git

diff --git a/Declare.xs b/Declare.xs
index d4b74f9..83ebc1d 100644
--- a/Declare.xs
+++ b/Declare.xs
@@ -1,8 +1,7 @@
-#define PERL_CORE
-#define PERL_NO_GET_CONTEXT
 #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>
@@ -12,15 +11,7 @@
 # define Newx(v,n,t) New(0,v,n,t)
 #endif /* !Newx */
 
-#if 0
-#define DD_DEBUG
-#endif
-
-#ifdef DD_DEBUG
-#define DD_DEBUG_S printf("Buffer: %s\n", s);
-#else
-#define DD_DEBUG_S
-#endif
+static int dd_debug = 0;
 
 #define LEX_NORMAL    10
 #define LEX_INTERPNORMAL   9
@@ -35,7 +26,7 @@ static int in_declare = 0;
 
 #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)
@@ -61,6 +52,9 @@ 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);
 
@@ -112,44 +106,19 @@ void dd_linestr_callback (pTHX_ char* type, char* name) {
   LEAVE;
 }
 
-char* dd_get_linestr(pTHX) {
-  return SvPVX(PL_linestr);
-}
-
-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));
-
-  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));
-
-  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) : "");
 }
 
-char* dd_clear_lex_stuff(pTHX) {
+void dd_clear_lex_stuff(pTHX) {
   if (DD_HAVE_PARSER)
-    PL_lex_stuff = Nullsv;
+    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) {
 
   /*
@@ -192,32 +161,38 @@ int dd_toke_skipspace(pTHX_ int offset) {
 
 /* 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;
-#ifdef DD_DEBUG
-    printf("Deconstructing declare\n");
-    printf("PL_bufptr: %s\n", PL_bufptr);
-    printf("bufend at: %i\n", PL_bufend - PL_bufptr);
-    printf("linestr: %s\n", SvPVX(PL_linestr));
-    printf("linestr len: %i\n", PL_bufend - SvPVX(PL_linestr));
-#endif
-    call_argv("Devel::Declare::done_declare", G_VOID|G_DISCARD, cb_args);
-#ifdef DD_DEBUG
-    printf("PL_bufptr: %s\n", PL_bufptr);
-    printf("bufend at: %i\n", PL_bufend - PL_bufptr);
-    printf("linestr: %s\n", SvPVX(PL_linestr));
-    printf("linestr len: %i\n", PL_bufend - SvPVX(PL_linestr));
-    printf("actual len: %i\n", strlen(PL_bufptr));
-#endif
+    if (dd_debug) {
+      printf("Deconstructing declare\n");
+      printf("PL_bufptr: %s\n", PL_bufptr);
+      printf("bufend at: %i\n", PL_bufend - PL_bufptr);
+      printf("linestr: %s\n", SvPVX(PL_linestr));
+      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;
+    LEAVE;
+
+    if (dd_debug) {
+      printf("PL_bufptr: %s\n", PL_bufptr);
+      printf("bufend at: %i\n", PL_bufend - PL_bufptr);
+      printf("linestr: %s\n", SvPVX(PL_linestr));
+      printf("linestr len: %i\n", PL_bufend - SvPVX(PL_linestr));
+      printf("actual len: %i\n", strlen(PL_bufptr));
+    }
     return o;
   }
 
@@ -229,39 +204,34 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o) {
   if (!DD_AM_LEXING)
     return o; /* not lexing? */
 
-#ifdef DD_DEBUG
-  printf("Checking GV %s -> %s\n", HvNAME(GvSTASH(kGVOP_gv)), GvNAME(kGVOP_gv));
-#endif
+  if (dd_debug) {
+    printf("Checking GV %s -> %s\n", HvNAME(GvSTASH(kGVOP_gv)), GvNAME(kGVOP_gv));
+  }
 
   dd_flags = dd_is_declarator(aTHX_ GvNAME(kGVOP_gv));
 
   if (dd_flags == -1)
     return o;
 
-#ifdef DD_DEBUG
-  printf("dd_flags are: %i\n", dd_flags);
-#endif
-
-#ifdef DD_DEBUG
-  printf("PL_tokenbuf: %s\n", PL_tokenbuf);
-#endif
+  if (dd_debug) {
+    printf("dd_flags are: %i\n", dd_flags);
+    printf("PL_tokenbuf: %s\n", PL_tokenbuf);
+  }
 
   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;
   STRLEN len;
   const char* s;
   if (SvPOK(sv)) {
-#ifdef DD_DEBUG
-    printf("mangling eval sv\n");
-#endif
+    if (dd_debug) {
+      printf("mangling eval sv\n");
+    }
     if (SvREADONLY(sv))
       sv = sv_2mortal(newSVsv(sv));
     s = SvPVX(sv);
@@ -277,8 +247,7 @@ OP* dd_pp_entereval(pTHX) {
   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;
@@ -292,15 +261,10 @@ static I32 dd_filter_realloc(pTHX_ int idx, SV *sv, int maxlen)
   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 */
-
   /* if this is set, we just grabbed a delimited string or something,
      not a bareword, so NO TOUCHY */
 
@@ -333,28 +297,13 @@ void
 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);
@@ -374,13 +323,6 @@ 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);
@@ -419,3 +361,8 @@ void
 set_in_declare(int value)
   CODE:
     in_declare = value;
+
+BOOT:
+  if (getenv ("DD_DEBUG")) {
+    dd_debug = 1;
+  }