X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Declare.xs;h=d29488d77c314aece2b67e163b01034602420be2;hb=48ee5c99631eebd41576006e96e22750bdd43ebb;hp=99124d0211b7f693d83c78d671b63c5433fd54fa;hpb=f11d21b25ceebe4df4bbc27f189302a952d2acc6;p=p5sagit%2FDevel-Declare.git

diff --git a/Declare.xs b/Declare.xs
index 99124d0..d29488d 100644
--- a/Declare.xs
+++ b/Declare.xs
@@ -53,7 +53,7 @@ int dd_is_declarator(pTHX_ char* name) {
   /* $declarators{$current_package_name} */
 
   if (!HvNAME(PL_curstash))
-	  return -1;
+    return -1;
 
   is_declarator_pack_ref = hv_fetch(is_declarator, HvNAME(PL_curstash),
                              strlen(HvNAME(PL_curstash)), FALSE);
@@ -73,7 +73,7 @@ int dd_is_declarator(pTHX_ char* name) {
   /* 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 -1;
 
@@ -114,7 +114,7 @@ char* dd_get_linestr(pTHX) {
 }
 
 void dd_set_linestr(pTHX_ char* new_value) {
-  int new_len = strlen(new_value);
+  unsigned 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));
@@ -182,7 +182,6 @@ int dd_toke_scan_word(pTHX_ int offset, int handle_package) {
 int dd_toke_scan_ident(pTHX_ int offset) {
     char tmpbuf[sizeof PL_tokenbuf];
     char* base_s = SvPVX(PL_linestr) + offset;
-    STRLEN len;
     char* s = scan_ident(base_s, PL_bufend, tmpbuf, sizeof tmpbuf, 0);
     return s - base_s;
 }
@@ -206,6 +205,8 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o, void *user_data) {
   OP* kid;
   int dd_flags;
 
+  PERL_UNUSED_VAR(user_data);
+
   if (in_declare) {
     if (dd_debug) {
       printf("Deconstructing declare\n");
@@ -299,6 +300,8 @@ OP* dd_pp_entereval(pTHX) {
 }
 
 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;
@@ -316,6 +319,8 @@ STATIC OP *dd_ck_const(pTHX_ OP *o, void *user_data) {
   int dd_flags;
   char* name;
 
+  PERL_UNUSED_VAR(user_data);
+
   /* if this is set, we just grabbed a delimited string or something,
      not a bareword, so NO TOUCHY */
 
@@ -333,9 +338,22 @@ STATIC OP *dd_ck_const(pTHX_ OP *o, void *user_data) {
   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;
+  }
+
   dd_linestr_callback(aTHX_ "const", name);
 
-  return o;  
+  return o;
 }
 
 static int initialized = 0;