X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Declare.xs;h=3a4ff9516929b449c7733e9ec084f6b97c13366f;hb=mxd_parameterized_bug;hp=4b66c31a8f04cc14421e71f6056aa9623746e2f6;hpb=c5912dc7bcfef549b39316544d7532ccf9d8f5b3;p=p5sagit%2FDevel-Declare.git

diff --git a/Declare.xs b/Declare.xs
index 4b66c31..3a4ff95 100644
--- a/Declare.xs
+++ b/Declare.xs
@@ -1,119 +1,174 @@
-#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>
 #include <string.h>
 
-#if 0
-#define DD_DEBUG
-#endif
+#ifndef Newx
+# define Newx(v,n,t) New(0,v,n,t)
+#endif /* !Newx */
 
-#define DD_HANDLE_NAME 1
-#define DD_HANDLE_PROTO 2
-#define DD_HANDLE_PACKAGE 8
+#define DD_DEBUGf_UPDATED_LINESTR 1
+#define DD_DEBUGf_TRACE 2
 
-#ifdef DD_DEBUG
-#define DD_DEBUG_S printf("Buffer: %s\n", s);
-#else
-#define DD_DEBUG_S
-#endif
+#define DD_DEBUG_UPDATED_LINESTR (dd_debug & DD_DEBUGf_UPDATED_LINESTR)
+#define DD_DEBUG_TRACE (dd_debug & DD_DEBUGf_TRACE)
+static int dd_debug = 0;
 
 #define LEX_NORMAL    10
 #define LEX_INTERPNORMAL   9
 
-/* placeholders for PL_check entries we wrap */
-
-STATIC OP *(*dd_old_ck_rv2cv)(pTHX_ OP *op);
-STATIC OP *(*dd_old_ck_lineseq)(pTHX_ OP *op);
-
 /* flag to trigger removal of temporary declaree sub */
 
 static int in_declare = 0;
 
-/* replacement PL_check rv2cv entry */
+/* 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 */
 
-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;
-  STRLEN len = 0;
-  HV *stash;
+#define DD_AM_LEXING_CHECK (PL_lex_state == LEX_NORMAL || PL_lex_state == LEX_INTERPNORMAL)
+
+#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)
+#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) {
   HV* is_declarator;
   SV** is_declarator_pack_ref;
   HV* is_declarator_pack_hash;
   SV** is_declarator_flag_ref;
   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;
-    call_argv("Devel::Declare::done_declare", G_VOID|G_DISCARD, cb_args);
-    in_declare--;
-    return o;
-  }
-
-  kid = cUNOPo->op_first;
-
-  if (kid->op_type != OP_GV) /* not a GV so ignore */
-    return o;
-
-  if (PL_lex_state != LEX_NORMAL && PL_lex_state != LEX_INTERPNORMAL)
-    return o; /* not lexing? */
-
-  stash = GvSTASH(kGVOP_gv);
-
-#ifdef DD_DEBUG
-  printf("Checking GV %s -> %s\n", HvNAME(stash), GvNAME(kGVOP_gv));
-#endif
 
   is_declarator = get_hv("Devel::Declare::declarators", FALSE);
 
   if (!is_declarator)
-    return o;
+    return -1;
+
+  /* $declarators{$current_package_name} */
+
+  if (!HvNAME(PL_curstash))
+    return -1;
 
-  is_declarator_pack_ref = hv_fetch(is_declarator, HvNAME(stash),
-                             strlen(HvNAME(stash)), FALSE);
+  is_declarator_pack_ref = hv_fetch(is_declarator, HvNAME(PL_curstash),
+                             strlen(HvNAME(PL_curstash)), FALSE);
 
   if (!is_declarator_pack_ref || !SvROK(*is_declarator_pack_ref))
-    return o; /* not a hashref */
+    return -1; /* not a hashref */
 
   is_declarator_pack_hash = (HV*) SvRV(*is_declarator_pack_ref);
 
-  is_declarator_flag_ref = hv_fetch(is_declarator_pack_hash, GvNAME(kGVOP_gv),
-                                strlen(GvNAME(kGVOP_gv)), FALSE);
+  /* $declarators{$current_package_name}{$name} */
+
+  is_declarator_flag_ref = hv_fetch(
+    is_declarator_pack_hash, name,
+    strlen(name), FALSE
+  );
 
   /* requires SvIOK as well as TRUE since flags not being an int is useless */
 
   if (!is_declarator_flag_ref
-        || !SvIOK(*is_declarator_flag_ref) 
+        || !SvIOK(*is_declarator_flag_ref)
         || !SvTRUE(*is_declarator_flag_ref))
-    return o;
+    return -1;
 
   dd_flags = SvIVX(*is_declarator_flag_ref);
 
-#ifdef DD_DEBUG
-  printf("dd_flags are: %i\n", dd_flags);
-#endif
+  return dd_flags;
+}
 
-  s = PL_bufptr; /* copy the current buffer pointer */
+/* callback thingy */
 
-  DD_DEBUG_S
+void dd_linestr_callback (pTHX_ char* type, char* name) {
 
-#ifdef DD_DEBUG
-  printf("PL_tokenbuf: %s\n", PL_tokenbuf);
-#endif
+  char* linestr = SvPVX(PL_linestr);
+  int offset = PL_bufptr - linestr;
+
+  dSP;
+
+  ENTER;
+  SAVETMPS;
+
+  PUSHMARK(SP);
+  XPUSHs(sv_2mortal(newSVpv(type, 0)));
+  XPUSHs(sv_2mortal(newSVpv(name, 0)));
+  XPUSHs(sv_2mortal(newSViv(offset)));
+  PUTBACK;
+
+  call_pv("Devel::Declare::linestr_callback", G_VOID|G_DISCARD);
+
+  FREETMPS;
+  LEAVE;
+}
+
+char* dd_get_linestr(pTHX) {
+  if (!DD_HAVE_PARSER) {
+    return NULL;
+  }
+  return SvPVX(PL_linestr);
+}
+
+void dd_set_linestr(pTHX_ char* new_value) {
+  unsigned int new_len = strlen(new_value);
+
+  if (SvLEN(PL_linestr) < new_len) {
+    croak("PL_linestr not long enough, was Devel::Declare loaded soon enough in %s",
+      CopFILE(&PL_compiling)
+    );
+  }
+
+
+  memcpy(SvPVX(PL_linestr), new_value, new_len+1);
+
+  SvCUR_set(PL_linestr, new_len);
+
+  PL_bufend = SvPVX(PL_linestr) + new_len;
+
+  if ( DD_DEBUG_UPDATED_LINESTR && PERLDB_LINE && PL_curstash != PL_debstash) {
+    // Cribbed from toke.c
+    SV * const sv = NEWSV(85,0);
+
+    sv_upgrade(sv, SVt_PVMG);
+    sv_setpvn(sv,PL_bufptr,PL_bufend-PL_bufptr);
+    (void)SvIOK_on(sv);
+    SvIV_set(sv, 0);
+    av_store(CopFILEAV(&PL_compiling),(I32)CopLINE(&PL_compiling),sv);
+  }
+}
+
+char* dd_get_lex_stuff(pTHX) {
+  return (DD_HAVE_LEX_STUFF ? SvPVX(PL_lex_stuff) : "");
+}
+
+void dd_clear_lex_stuff(pTHX) {
+  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;
+  if (!DD_HAVE_PARSER) {
+    return -1;
+  }
+  linestr = SvPVX(PL_linestr);
+  return PL_bufptr - linestr;
+}
+
+char* dd_move_past_token (pTHX_ char* s) {
 
   /*
    *   buffer will be at the beginning of the declarator, -unless- the
@@ -124,139 +179,239 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o) {
   while (s < PL_bufend && isSPACE(*s)) s++;
   if (memEQ(s, PL_tokenbuf, strlen(PL_tokenbuf)))
     s += strlen(PL_tokenbuf);
+  return s;
+}
 
-  DD_DEBUG_S
+int dd_toke_move_past_token (pTHX_ int offset) {
+  char* base_s = SvPVX(PL_linestr) + offset;
+  char* s = dd_move_past_token(aTHX_ base_s);
+  return s - base_s;
+}
 
-  if (dd_flags & DD_HANDLE_NAME) {
+int dd_toke_scan_word(pTHX_ int offset, int handle_package) {
+  char tmpbuf[sizeof PL_tokenbuf];
+  char* base_s = SvPVX(PL_linestr) + offset;
+  STRLEN len;
+  char* s = scan_word(base_s, tmpbuf, sizeof tmpbuf, handle_package, &len);
+  return s - base_s;
+}
 
-    /* find next word */
+int dd_toke_scan_ident(pTHX_ int offset) {
+    char tmpbuf[sizeof PL_tokenbuf];
+    char* base_s = SvPVX(PL_linestr) + offset;
+    char* s = scan_ident(base_s, PL_bufend, tmpbuf, sizeof tmpbuf, 0);
+    return s - base_s;
+}
 
-    s = skipspace(s);
+int dd_toke_scan_str(pTHX_ int offset) {
+  STRLEN remaining = sv_len(PL_linestr) - offset;
+  SV* line_copy = newSVsv(PL_linestr);
+  char* base_s = SvPVX(PL_linestr) + offset;
+  char* s = scan_str(base_s, FALSE, FALSE);
+  if (s != base_s && sv_len(PL_lex_stuff) > remaining) {
+    int ret = (s - SvPVX(PL_linestr)) + remaining;
+    sv_catsv(line_copy, PL_linestr);
+    dd_set_linestr(aTHX_ SvPV_nolen(line_copy));
+    SvREFCNT_dec(line_copy);
+    return ret;
+  }
+  return s - base_s;
+}
 
-    DD_DEBUG_S
+int dd_toke_skipspace(pTHX_ int offset) {
+  char* base_s = SvPVX(PL_linestr) + offset;
+  char* s = skipspace_force(base_s);
+  return s - base_s;
+}
 
-    /* arg 4 is allow_package */
+/* replacement PL_check rv2cv entry */
 
-    s = scan_word(s, tmpbuf, sizeof tmpbuf, dd_flags & DD_HANDLE_PACKAGE, &len);
+STATIC OP *dd_ck_rv2cv(pTHX_ OP *o, void *user_data) {
+  dSP;
+  OP* kid;
+  int dd_flags;
 
-    DD_DEBUG_S
+  PERL_UNUSED_VAR(user_data);
 
-    if (len) {
-      strcpy(found_name, tmpbuf);
-#ifdef DD_DEBUG
-      printf("Found %s\n", found_name);
-#endif
+  if (in_declare) {
+    if (DD_DEBUG_TRACE) {
+      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));
     }
-  }
 
-  if (dd_flags & DD_HANDLE_PROTO) {
+    ENTER;
+    SAVETMPS;
 
-    s = skipspace(s);
+    PUSHMARK(SP);
 
-    if (*s == '(') { /* found a prototype-ish thing */
-      save_s = s;
-      s = scan_str(s, FALSE, FALSE); /* no keep_quoted, no keep_delims */
-      if (SvPOK(PL_lex_stuff)) {
-#ifdef DD_DEBUG
-        printf("Found proto %s\n", SvPVX(PL_lex_stuff));
-#endif
-        found_proto = SvPVX(PL_lex_stuff);
-        if (len) /* foo name () => foo name  X, only foo parsed so works */
-          *save_s++ = ' ';
-        else /* foo () => foo =X, TOKEN('&') won't handle foo X */
-          *save_s++ = '=';
-        *save_s++ = 'X';
-        while (save_s < s) {
-          *save_s++ = ' ';
-        }
-#ifdef DD_DEBUG
-        printf("Curbuf %s\n", PL_bufptr);
-#endif
-      }
+    call_pv("Devel::Declare::done_declare", G_VOID|G_DISCARD);
+
+    FREETMPS;
+    LEAVE;
+
+    if (DD_DEBUG_TRACE) {
+      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;
   }
 
-  if (!len)
-    found_name[0] = 0;
+  kid = cUNOPo->op_first;
 
-#ifdef DD_DEBUG
-  printf("Calling init_declare\n");
-#endif
-  cb_args[0] = HvNAME(stash);
-  cb_args[1] = GvNAME(kGVOP_gv);
-  cb_args[2] = HvNAME(PL_curstash);
-  cb_args[3] = found_name;
-  cb_args[4] = found_proto;
-  cb_args[5] = NULL;
-
-  if (len && found_proto)
-    in_declare = 2;
-  else if (len || found_proto)
-    in_declare = 1;
-  if (found_proto)
-    PL_lex_stuff = Nullsv;
-  s = skipspace(s);
-#ifdef DD_DEBUG
-  printf("cur buf: %s\n", s);
-  printf("bufend at: %i\n", PL_bufend - s);
-  printf("linestr: %s\n", SvPVX(PL_linestr));
-  printf("linestr len: %i\n", PL_bufend - SvPVX(PL_linestr));
-#endif
-  if (*s++ == '{') {
-    call_argv("Devel::Declare::init_declare", G_SCALAR, cb_args);
-    SPAGAIN;
-    retstr = POPpx;
-    PUTBACK;
-    if (retstr && strlen(retstr)) {
-      const int old_len = SvCUR(PL_linestr);
-#ifdef DD_DEBUG
-      printf("Got string %s\n", retstr);
-#endif
-      SvGROW(PL_linestr, (STRLEN)(old_len + strlen(retstr)));
-      memmove(s+strlen(retstr), s, (PL_bufend - s)+1);
-      memmove(s, retstr, strlen(retstr));
-      SvCUR_set(PL_linestr, old_len + strlen(retstr));
-      PL_bufend += strlen(retstr);
-#ifdef DD_DEBUG
-  printf("cur buf: %s\n", s);
-  printf("bufend at: %i\n", PL_bufend - s);
-  printf("linestr: %s\n", SvPVX(PL_linestr));
-  printf("linestr len: %i\n", PL_bufend - SvPVX(PL_linestr));
+  if (kid->op_type != OP_GV) /* not a GV so ignore */
+    return o;
+
+  if (!DD_AM_LEXING)
+    return o; /* not lexing? */
+
+  if (DD_DEBUG_TRACE) {
+    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;
+
+  if (DD_DEBUG_TRACE) {
+    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;
+}
+
+OP* dd_pp_entereval(pTHX) {
+  dSP;
+  STRLEN len;
+  const char* s;
+  SV *sv;
+#ifdef PERL_5_9_PLUS
+  SV *saved_hh;
+  if (PL_op->op_private & OPpEVAL_HAS_HH) {
+    saved_hh = POPs;
+  }
 #endif
+  sv = POPs;
+  if (SvPOK(sv)) {
+    if (DD_DEBUG_TRACE) {
+      printf("mangling eval sv\n");
     }
-  } else {
-    call_argv("Devel::Declare::init_declare", G_VOID|G_DISCARD, cb_args);
+    if (SvREADONLY(sv))
+      sv = sv_2mortal(newSVsv(sv));
+    s = SvPVX(sv);
+    len = SvCUR(sv);
+    if (!len || s[len-1] != ';') {
+      if (!(SvFLAGS(sv) & SVs_TEMP))
+        sv = sv_2mortal(newSVsv(sv));
+      sv_catpvn(sv, "\n;", 2);
+    }
+    SvGROW(sv, 8192);
+  }
+  PUSHs(sv);
+#ifdef PERL_5_9_PLUS
+  if (PL_op->op_private & OPpEVAL_HAS_HH) {
+    PUSHs(saved_hh);
   }
+#endif
+  return PL_ppaddr[OP_ENTEREVAL](aTHX);
+}
+
+STATIC OP *dd_ck_entereval(pTHX_ OP *o, void *user_data) {
+  PERL_UNUSED_VAR(user_data);
+
+  if (o->op_ppaddr == PL_ppaddr[OP_ENTEREVAL])
+    o->op_ppaddr = dd_pp_entereval;
   return o;
 }
 
-STATIC OP *dd_ck_lineseq(pTHX_ OP *o) {
-  AV* pad_inject_list;
-  SV** to_inject_ref;
-  int i, pad_inject_list_last;
+static I32 dd_filter_realloc(pTHX_ int idx, SV *sv, int maxlen)
+{
+  const I32 count = FILTER_READ(idx+1, sv, maxlen);
+  SvGROW(sv, 8192); /* please try not to have a line longer than this :) */
+  /* filter_del(dd_filter_realloc); */
+  return count;
+}
 
-  o = dd_old_ck_lineseq(aTHX_ o);
+STATIC OP *dd_ck_const(pTHX_ OP *o, void *user_data) {
+  int dd_flags;
+  char* name;
 
-  pad_inject_list = get_av("Devel::Declare::next_pad_inject", FALSE);
-  if (!pad_inject_list)
+  PERL_UNUSED_VAR(user_data);
+
+  if (DD_HAVE_PARSER && PL_expect == XOPERATOR) {
     return o;
+  }
 
-  pad_inject_list_last = av_len(pad_inject_list);
+  /* if this is set, we just grabbed a delimited string or something,
+     not a bareword, so NO TOUCHY */
 
-  if (pad_inject_list_last == -1)
+  if (DD_HAVE_LEX_STUFF)
     return o;
 
-  for (i = 0; i <= pad_inject_list_last; i++) {
-    to_inject_ref = av_fetch(pad_inject_list, i, FALSE);
-    if (to_inject_ref && SvPOK(*to_inject_ref)) {
-#ifdef DD_DEBUG
-  printf("Injecting %s into pad\n", SvPVX(*to_inject_ref));
-#endif
-      allocmy(SvPVX(*to_inject_ref));
+  /* don't try and look this up if it's not a string const */
+  if (!SvPOK(cSVOPo->op_sv))
+    return o;
+
+  name = SvPVX(cSVOPo->op_sv);
+
+  dd_flags = dd_is_declarator(aTHX_ name);
+
+  if (dd_flags == -1)
+    return o;
+
+  switch (PL_lex_inwhat) {
+    case OP_QR:
+    case OP_MATCH:
+    case OP_SUBST:
+    case OP_TRANS:
+    case OP_BACKTICK:
+    case OP_STRINGIFY:
+      return o;
+      break;
+    default:
+      break;
+  }
+
+  if (strnEQ(PL_bufptr, "->", 2)) {
+    return o;
+  }
+
+  {
+    char buf[256];
+    STRLEN len;
+    char *s = PL_bufptr;
+    STRLEN old_offset = PL_bufptr - SvPVX(PL_linestr);
+
+    s = scan_word(s, buf, sizeof buf, FALSE, &len);
+    if (strnEQ(buf, name, len)) {
+      char *d;
+      SV *inject = newSVpvn(SvPVX(PL_linestr), PL_bufptr - SvPVX(PL_linestr));
+      sv_catpvn(inject, buf, len);
+
+      d = peekspace(s);
+      sv_catpvn(inject, s, d - s);
+
+      if ((PL_bufend - d) >= 2 && strnEQ(d, "=>", 2)) {
+        return o;
+      }
+
+      sv_catpv(inject, d);
+      dd_set_linestr(aTHX_ SvPV_nolen(inject));
+      PL_bufptr = SvPVX(PL_linestr) + old_offset;
+      SvREFCNT_dec (inject);
     }
   }
 
-  av_clear(pad_inject_list);
+  dd_linestr_callback(aTHX_ "const", name);
 
   return o;
 }
@@ -271,17 +426,105 @@ void
 setup()
   CODE:
   if (!initialized++) {
-    dd_old_ck_rv2cv = PL_check[OP_RV2CV];
-    PL_check[OP_RV2CV] = dd_ck_rv2cv;
-    dd_old_ck_lineseq = PL_check[OP_LINESEQ];
-    PL_check[OP_LINESEQ] = dd_ck_lineseq;
+    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);
+  OUTPUT:
+    RETVAL
+
+void
+clear_lex_stuff()
+  CODE:
+    dd_clear_lex_stuff(aTHX);
+
+char*
+get_curstash_name()
+  CODE:
+    RETVAL = dd_get_curstash_name(aTHX);
+  OUTPUT:
+    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);
+  OUTPUT:
+    RETVAL
+
+int
+toke_move_past_token(int offset);
+  CODE:
+    RETVAL = dd_toke_move_past_token(aTHX_ offset);
+  OUTPUT:
+    RETVAL
+
+int
+toke_scan_str(int offset);
+  CODE:
+    RETVAL = dd_toke_scan_str(aTHX_ offset);
+  OUTPUT:
+    RETVAL
+
+int
+toke_scan_ident(int offset)
+  CODE:
+    RETVAL = dd_toke_scan_ident(aTHX_ offset);
+  OUTPUT:
+    RETVAL
+
+int
+toke_skipspace(int offset)
+  CODE:
+    RETVAL = dd_toke_skipspace(aTHX_ offset);
+  OUTPUT:
+    RETVAL
+
+int
+get_in_declare()
+  CODE:
+    RETVAL = in_declare;
+  OUTPUT:
+    RETVAL
 
 void
-teardown()
+set_in_declare(int value)
   CODE:
-  /* ensure we only uninit when number of teardown calls matches 
-     number of setup calls */
-  if (initialized && !--initialized) {
-    PL_check[OP_RV2CV] = dd_old_ck_rv2cv;
+    in_declare = value;
+
+BOOT:
+{
+  char *endptr;
+  char *debug_str = getenv ("DD_DEBUG");
+  if (debug_str) {
+    dd_debug = strtol (debug_str, &endptr, 10);
+    if (*endptr != '\0') {
+      dd_debug = 0;
+    }
   }
+}