feat: copy inner composite for struct array keys #67
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
glihm
approved these changes
Oct 25, 2024
| @@ -121,4 +123,68 @@ impl Token { | |||
| _ => (), | |||
| } | |||
| } | |||
|
|
|||
| pub fn hydrate(token: Self, filtered: &HashMap<String, Token>) -> Self { | |||
There was a problem hiding this comment.
Could we have a function doc here to keep in mind what was the need of it? Cainome generally needs a bit more doc. :)
Comment on lines
+330
to
+351
| if let Token::Composite(composite_0) = &tokens[0] { | ||
| let unique_composite = composite_0.clone(); | ||
| let inners = composite_0 | ||
| .inners | ||
| .iter() | ||
| .map(|inner| { | ||
| let inner_tokens = tokens | ||
| .iter() | ||
| .filter_map(|__t| { | ||
| __t.to_composite().ok().and_then(|comp| { | ||
| comp.inners | ||
| .iter() | ||
| .find(|__t_inner| __t_inner.name == inner.name) | ||
| }) | ||
| }) | ||
| .fold(HashMap::new(), |mut acc, __t_inner| { | ||
| let type_path = __t_inner.token.type_path(); | ||
| let counter = acc | ||
| .entry(type_path.clone()) | ||
| .or_insert((0, __t_inner.clone())); | ||
| counter.0 += 1; | ||
| acc | ||
| }); |
There was a problem hiding this comment.
This part we need to make a new pass. Thanks for the refactoring though.
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.
For dojo.js bindgen we need to add copies of composites inside nested
core::array::Arrayfields.We might need to do the same for
tuplebut I need to test with real abi so PR will be completed tomorrow