uri: Inline parser and uri into uri_object_t
#19906
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
TimWolla
commented
Sep 21, 2025
Comment on lines
-348
to
+347
| const uri_internal_t *internal_base_url = &base_url_object->internal; | ||
| URI_ASSERT_INITIALIZATION(internal_base_url); | ||
| ZEND_ASSERT(internal_base_url->parser == uri_parser); | ||
| base_url = internal_base_url->uri; | ||
| ZEND_ASSERT(base_url_object->uri != NULL); | ||
| ZEND_ASSERT(base_url_object->parser == uri_parser); | ||
| base_url = base_url_object->uri; |
There was a problem hiding this comment.
I think the improvement is particularly visible here, since the assertions are no longer mixed with declarations.
Changes performed with Coccinelle with some minor adjustments in places where
it choked due to macros:
@@
expression e;
@@
- Z_URI_INTERNAL_P(e)
+ &Z_URI_OBJECT_P(e)->internal
@@
expression e;
@@
- uri_internal_from_obj(e)
+ &uri_object_from_obj(e)->internal
While a `NULL` pointer to `zend_object` would result in `->internal` also
sitting at `0`, this is not a particularly useful assertion to have. Instead
just assert that we have a parsed `->uri` available.
Changes made with Coccinelle + some manual adjustments:
@@
uri_internal_t *u;
expression e;
@@
u = &Z_URI_OBJECT_P(e)->internal
... when != u
- URI_ASSERT_INITIALIZATION(u);
+ ZEND_ASSERT(u->uri != NULL);
@@
uri_internal_t *u;
expression e;
@@
u = &uri_object_from_obj(e)->internal
... when != u
- URI_ASSERT_INITIALIZATION(u);
+ ZEND_ASSERT(u->uri != NULL);
After this, `uri_internal_t` will only be used when interacting with the URI
parsers without having a full-blown URI object.
Changes made with Coccinelle and some manual adjustments:
@@
identifier u;
expression e;
@@
- uri_internal_t *u = &e->internal;
+ uri_object_t *u = e;
@@
uri_object_t *u;
identifier t;
@@
- u->internal.t
+ u->t
TimWolla
force-pushed
the
uri-internal-t
branch
from
cc24615 to
1f9d9ec
Compare
|
Rebased after the merge of #19903. |
kocsismate
approved these changes
Sep 22, 2025
edorian
approved these changes
Sep 22, 2025
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.
This PR includes and depends on #19903 with the first 2 commits. The PRs are independent for better commit history after merging.The purpose of this change is to improve readability of the code by avoiding:
.internalmember that does not provide a value-add when already dealing with URI objects and just adds needless verbosity.