From 29fb1d0ef33facc7d4fe58f19322d7d81ade25a8 Mon Sep 17 00:00:00 2001 From: Brian Fraser Date: Sat, 6 Aug 2011 11:03:16 +0100 Subject: toke.c: "Possible unintended interpolation of %s in string" cleanup. --- t/lib/warnings/toke | 22 +++++++++++++++++++++- toke.c | 5 +++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/t/lib/warnings/toke b/t/lib/warnings/toke index 4ce6ae4da3..ef833bd347 100644 --- a/t/lib/warnings/toke +++ b/t/lib/warnings/toke @@ -844,11 +844,31 @@ no warning for overridden dump use warnings 'ambiguous'; "@mjd_previously_unused_array"; no warnings 'ambiguous'; -"@mjd_previously_unused_array"; +"@mjd_previously_unused_array2"; EXPECT Possible unintended interpolation of @mjd_previously_unused_array in string at - line 3. ######## # toke.c +use utf8; +use open qw( :utf8 :std ); +use warnings 'ambiguous'; +"@mjd_previously_unused_àrray"; +no warnings 'ambiguous'; +"@mjd_previously_unused_àrray2"; +EXPECT +Possible unintended interpolation of @mjd_previously_unused_àrray in string at - line 5. +######## +# toke.c +use utf8; +use open qw( :utf8 :std ); +use warnings 'ambiguous'; +"@mjd_previously_unused_ぁrrぁy"; +no warnings 'ambiguous'; +"@mjd_previously_unused_ぁrrぁy2"; +EXPECT +Possible unintended interpolation of @mjd_previously_unused_ぁrrぁy in string at - line 5. +######## +# toke.c # 20020328 mjd-perl-patch+@plover.com at behest of jfriedl@yahoo.com use warnings 'regexp'; "foo" =~ /foo/c; diff --git a/toke.c b/toke.c index 9b74b3cc7c..1696e24203 100644 --- a/toke.c +++ b/toke.c @@ -8568,8 +8568,9 @@ S_pending_ident(pTHX) { /* Downgraded from fatal to warning 20000522 mjd */ Perl_warner(aTHX_ packWARN(WARN_AMBIGUOUS), - "Possible unintended interpolation of %s in string", - PL_tokenbuf); + "Possible unintended interpolation of %"SVf" in string", + SVfARG(newSVpvn_flags(PL_tokenbuf, tokenbuf_len, + SVs_TEMP | ( UTF ? SVf_UTF8 : 0 )))); } } -- cgit v1.2.1