Simplify strict.pm #22848
Merged
Simplify strict.pm #22848
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Needs a version bump in lib/strict.pm. |
|
@jkeenan Yes, but that’s the least of the problems. Turns out |
|
(OTOH this has unearthed the fact that some of the use of |
|
new docs are always good |
ap
force-pushed
the
ap/simpler-strict
branch
2 times, most recently
from
497a220 to
1766feb
Compare
mauke
reviewed
Feb 2, 2025
lib/strict.pm
Outdated
| @@ -59,14 +61,15 @@ sub bits { | |||
|
|
|||
| sub import { | |||
| shift; | |||
| $^H |= @_ ? &bits : all_bits | all_explicit_bits; | |||
| $^H |= @_ ? &bits | $explicit_bits : all_bits | all_explicit_bits; | |||
There was a problem hiding this comment.
&bits | $explicit_bits relies on left-to-right evaluation in | since &bits resets the value of $explicit_bits. Does perl guarantee left-to-right evaluation in non-shortcutting operators?
|
Perhaps an alternative: diff --git i/lib/strict.pm w/lib/strict.pm
index ad31edcacf..0579fce7d2 100644
--- i/lib/strict.pm
+++ w/lib/strict.pm
@@ -42,8 +42,7 @@ sub bits {
my @wrong;
foreach my $s (@_) {
if (exists $bitmask{$s}) {
- $^H |= $explicit_bitmask{$s};
-
+ $bits |= $explicit_bitmask{$s};
$bits |= $bitmask{$s};
}
else {
@@ -66,7 +65,9 @@ sub unimport {
shift;
if (@_) {
- $^H &= ~&bits;
+ my $bits = &bits;
+ $^H &= ~$bits;
+ $^H |= all_explicit_bits & $bits;
}
else {
$^H &= ~all_bits; |
ap
force-pushed
the
ap/simpler-strict
branch
2 times, most recently
from
41e3117 to
8bf9adf
Compare
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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
strict.pm is slightly confusing to follow. Restructuring it to make it more legible makes it more apparent that there are some optimizations to be had, which make it no harder to understand, so I’ve taken that opportunity as well.