mirror/perl
1
0
Fork 0
mirror of https://github.com/Perl/perl5.git synced 2026-01-26 16:39:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

stop directly mutating $^H in strict::bits()

Browse Source 
This improves the code in two ways:

1. Considering strict::bits is used by B::Deparse and vars.pm as
   unofficial API, the function having this side effect is arguably
   a latent bug even if it doesn’t break those callers.

2. It is harder to follow the intended logic when the function modifies
   $^H itself but also returns a value for the caller to apply to $^H.
This commit is contained in:
Aristotle Pagaltzis 2016-08-14 06:42:06 +02:00
parent 9f953fcbeb
commit 065bd19b0d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/strict.pm
View File

@ -1,6 +1,6 @@
package strict;
$strict::VERSION = "1.13";
$strict::VERSION = "1.14";
my ( %bitmask, %explicit_bitmask );
@ -12,12 +12,15 @@ BEGIN {
if __FILE__ !~ ( '(?x) \b '.__PACKAGE__.' \.pmc? \z' )
&& __FILE__ =~ ( '(?x) \b (?i:'.__PACKAGE__.') \.pmc? \z' );
# which strictures are actually in force
%bitmask = (
refs => 0x00000002,
subs => 0x00000200,
vars => 0x00000400,
);
# which strictures have at some point been turned on or off explicitly
# and must therefore not be touched by any subsequent `use VERSION` or `no VERSION`
%explicit_bitmask = (
refs => 0x00000020,
subs => 0x00000040,
@ -38,12 +41,12 @@ BEGIN {
}
sub bits {
my $do_explicit = caller eq __PACKAGE__;
my $bits = 0;
my @wrong;
foreach my $s (@_) {
if (exists $bitmask{$s}) {
$^H |= $explicit_bitmask{$s};
$bits |= $explicit_bitmask{$s} if $do_explicit;
$bits |= $bitmask{$s};
}
else {
@ -66,7 +69,9 @@ sub unimport {
shift;
if (@_) {
$^H &= ~&bits;
my $bits = &bits;
$^H &= ~$bits;
$^H |= all_explicit_bits & $bits;
}
else {
$^H &= ~all_bits;
@ -75,6 +80,7 @@ sub unimport {
}
1;
__END__
=head1 NAME