X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Declare.xs;h=d29488d77c314aece2b67e163b01034602420be2;hb=48ee5c99631eebd41576006e96e22750bdd43ebb;hp=e4cb7cb9c2163a74e9e67b023e050b97aa834dff;hpb=c48ac26fbfb55de0c056b972f887981947a61c66;p=p5sagit%2FDevel-Declare.git diff --git a/Declare.xs b/Declare.xs index e4cb7cb..d29488d 100644 --- a/Declare.xs +++ b/Declare.xs @@ -36,8 +36,6 @@ static int in_declare = 0; #define DD_AM_LEXING DD_AM_LEXING_CHECK #endif -static OP *previous_op = NULL; - /* thing that decides whether we're dealing with a declarator */ int dd_is_declarator(pTHX_ char* name) { @@ -55,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); @@ -75,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; @@ -345,11 +343,14 @@ STATIC OP *dd_ck_const(pTHX_ OP *o, void *user_data) { 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;