Update Tree-Sitter C grammar #3661
Merged
Conversation
This file contains 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
|
The only left unfixed for now is #2190 but this one is harder and better to do separately (likely not in this release either as it depends on the mainstream bug: tree-sitter/tree-sitter-c#126) |
Rot127
approved these changes
Jul 23, 2023
| node_malformed_error(state, child, text, "struct field"); | ||
| result = -1; | ||
| goto srnexit; | ||
| } |
There was a problem hiding this comment.
All those repeating tests could probably be moved to a separated function.
So result = -1 is moved to the failure label. And replace it with
if (!parse_YYY()) {
goto srn_fail_exit;
}| .name = membname, | ||
| .type = rz_type_clone(membtpair->type), | ||
| .offset = 0, // FIXME | ||
| .size = 0, // FIXME |
There was a problem hiding this comment.
Maybe describe what needs to be fixed here.
| .offset = 0, // FIXME | ||
| .size = 0, // FIXME | ||
| }; | ||
| void *element = rz_vector_push(members, &memb); // returns null if no space available |
There was a problem hiding this comment.
Comment that it returns NULL on failure can be removed.
| // AST looks like | ||
| // type: (primitive_type) declarator: (field_identifier) | ||
| // or type: (primitive_type) declarator: (...) declarator (...) | ||
| // Augment resulting type field with the data from parsed declarator |
There was a problem hiding this comment.
Maybe not in this PR as well. But moving each case into a separated function should increase readability greatly.
| .name = membname, | ||
| .type = rz_type_clone(membtpair->type), | ||
| .offset = 0, // FIXME | ||
| .size = 0, // FIXME |
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.
Your checklist for this pull request
Detailed description
As Tree-Sitter itself and C grammar fixed some of the issues that affected Rizin, update them before the release
Partially addresses #3498 (parsing stage)
Partially addresses #2308 (parsing stage)
Fixes #1666
Fixes #1337 (only left is preprocessor, should be handled differently: #3661)
Test plan
CI is green