Port to B::Hooks::Parser.

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

diff --git a/Declare.xs b/Declare.xs
index ae5b164..83ebc1d 100644 (file)
--- a/Declare.xs
+++ b/Declare.xs
@@ -1,6 +1,7 @@
 #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>
@@ -105,29 +106,6 @@ void dd_linestr_callback (pTHX_ char* type, char* name) {
   LEAVE;
 }
 
-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);
-
-  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) : "");
 }
@@ -141,15 +119,6 @@ char* dd_get_curstash_name(pTHX) {
   return HvNAME(PL_curstash);
 }
 
-int dd_get_linestr_offset(pTHX) {
-  char* linestr;
-  if (!DD_HAVE_PARSER) {
-    return -1;
-  }
-  linestr = SvPVX(PL_linestr);
-  return PL_bufptr - linestr;
-}
-
 char* dd_move_past_token (pTHX_ char* s) {
 
   /*
@@ -192,14 +161,10 @@ 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;
 
-  o = dd_old_ck_rv2cv(aTHX_ o); /* let the original do its job */
-
   if (in_declare) {
     if (dd_debug) {
       printf("Deconstructing declare\n");
@@ -258,8 +223,6 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o) {
   return o;
 }
 
-STATIC OP *(*dd_old_ck_entereval)(pTHX_ OP *op);
-
 OP* dd_pp_entereval(pTHX) {
   dSP;
   dPOPss;
@@ -284,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;
@@ -299,14 +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* 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 */
 
@@ -339,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);
@@ -380,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);