ext/standard: Some more small refactoring #15391
Merged
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
Girgias
commented
Aug 13, 2024
Comment on lines
+37
to
-46
| } else if (c >= 'A' && c <= 'F') { | ||
| return c - 'A' + 10; | ||
| } | ||
| else if (c >= 'a' && c <= 'f') { | ||
| } else { | ||
| ZEND_ASSERT(c >= 'a' && c <= 'f'); | ||
| return c - 'a' + 10; | ||
| } | ||
| else { | ||
| return -1; | ||
| } |
There was a problem hiding this comment.
I'm wondering if we should not just use a bitwise operation to make it unconditionally lower/uppercase so that we don't need to do another if check.
There was a problem hiding this comment.
That might be probably more expensive if I understand correct you want to use store (not just load). What you can do is is maybe to get rid of one condition but not sure if it's worth the readability:
if (isdigit(c)) {
return c - '0';
} else if (c >= 'a') {
ZEND_ASSERT(c <= 'f');
return c - 'a' + 10;
} else {
ZEND_ASSERT(c >= 'A' && c <= 'F');
return c - 'A' + 10;
}
bukka
approved these changes
Aug 24, 2024
Comment on lines
+37
to
-46
| } else if (c >= 'A' && c <= 'F') { | ||
| return c - 'A' + 10; | ||
| } | ||
| else if (c >= 'a' && c <= 'f') { | ||
| } else { | ||
| ZEND_ASSERT(c >= 'a' && c <= 'f'); | ||
| return c - 'a' + 10; | ||
| } | ||
| else { | ||
| return -1; | ||
| } |
There was a problem hiding this comment.
That might be probably more expensive if I understand correct you want to use store (not just load). What you can do is is maybe to get rid of one condition but not sure if it's worth the readability:
if (isdigit(c)) {
return c - '0';
} else if (c >= 'a') {
ZEND_ASSERT(c <= 'f');
return c - 'a' + 10;
} else {
ZEND_ASSERT(c >= 'A' && c <= 'F');
return c - 'A' + 10;
}
We already check, and assume, that the value is hexadecimal
Main objective is to remove the PHP_STR_STR(C)SPN symbols which are only used with this static function
This is not used from a quick search on SourceGraph and this allows us to refactor it
Girgias
force-pushed
the
std-refacto
branch
2 times, most recently
from
1d542c7 to
74330b9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.