Generate C enums from internal enums, introduce Z_PARAM_ENUM() #20917
+460
−119
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
reviewed
Jan 12, 2026
|
|
||
| static zend_always_inline zend_long zend_enum_fetch_case_id(zend_object *zobj) | ||
| { | ||
| ZEND_ASSERT(zobj->ce->ce_flags & ZEND_ACC_ENUM); |
Member
There was a problem hiding this comment.
This assert is redundant with the one in zend_enum_obj_from_obj(). I also don't see how it could help with codegen.
Member
There was a problem hiding this comment.
The _decl files should be listed in .gitattributes as linguist-generated -diff.
|
|
||
| $cEnumName = 'zend_enum_' . str_replace('\\', '_', $this->name->toString()); | ||
|
|
||
| $code .= "typedef enum _{$cEnumName} {\n"; |
Member
There was a problem hiding this comment.
The leading underscore is not necessary and I believe for newer symbols we already don't have it:
Suggested change
| $code .= "typedef enum _{$cEnumName} {\n"; | |
| $code .= "typedef enum {$cEnumName} {\n"; |
| extern ZEND_API zend_object_handlers zend_enum_object_handlers; | ||
|
|
||
| typedef struct _zend_enum_obj { | ||
| zend_long case_id; |
Member
There was a problem hiding this comment.
Suggested change
| zend_long case_id; | |
| int case_id; |
I believe enums are int (unless a type is specified, which is only possible as of C23). Also applies to zend_enum_next_case_id() and similar.
|
|
||
| if (zend_string_equals_literal(entry, "UserInteractive")) { | ||
| switch (entry) { | ||
| cse ZEND_ENUM_Pcntl_QosClass_UserInteractive: |
Member
There was a problem hiding this comment.
Suggested change
| cse ZEND_ENUM_Pcntl_QosClass_UserInteractive: | |
| case ZEND_ENUM_Pcntl_QosClass_UserInteractive: |
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.
Update
gen_stubs.phpto generate C enums from internal enums. Enum values can be compared to the result ofzend_enum_fetch_case_id(zend_object*).The generated enums are added to separate files named
{$extensionName}_decl.h(one for each extension declaring some enums), so that it's possible to include these from anywhere._arginfo.hfiles would generate warnings if we tried to include them in a compilation unit that doesn't call theregister_{$class}functions, for instance.Introduce
Z_PARAM_ENUM()(similarly to #20898).cc @TimWolla