diff options
| -rw-r--r-- | lib/charnames.pm | 10 | ||||
| -rw-r--r-- | lib/charnames.t | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lib/charnames.pm b/lib/charnames.pm index 4f7fdeb6ed..f0a4446b4d 100644 --- a/lib/charnames.pm +++ b/lib/charnames.pm @@ -190,8 +190,8 @@ sub import ## fill %h keys with our @_ args. ## my ($promote, %h, @args) = (0); - while (@_ and $_ = shift) { - if ($_ eq ":alias") { + while (my $arg = shift) { + if ($arg eq ":alias") { @_ or croak ":alias needs an argument in charnames"; my $alias = shift; @@ -210,11 +210,11 @@ sub import alias_file ($alias); next; } - if (m/^:/ and ! ($_ eq ":full" || $_ eq ":short")) { - warn "unsupported special '$_' in charnames"; + if (substr($arg, 0, 1) eq ':' and ! ($arg eq ":full" || $arg eq ":short")) { + warn "unsupported special '$arg' in charnames"; next; } - push @args, $_; + push @args, $arg; } @args == 0 && $promote and @args = (":full"); @h{@args} = (1) x @args; diff --git a/lib/charnames.t b/lib/charnames.t index 3502b74d5b..49917c5ad6 100644 --- a/lib/charnames.t +++ b/lib/charnames.t @@ -15,7 +15,7 @@ require File::Spec; $| = 1; -print "1..73\n"; +print "1..74\n"; use charnames ':full'; @@ -328,6 +328,12 @@ for (@prgs) { 1 while unlink $alifile; } +# [perl #30409] charnames.pm clobbers default variable +$_ = 'foobar'; +eval "use charnames ':full';"; +print "not " unless $_ eq 'foobar'; +print "ok 74\n"; + __END__ # unsupported pragma use charnames ":scoobydoo"; |