Adding support for handling YAML Merge Key (#41) #1243
Closed
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
Support for YAML Merge keys ( <<: [*dict1, *dict2] ) is added. The merge key is a specific scalar with value << (and tag !!merge) that implies that during node construction, the map (or sequence of maps) are merged into the current map. The priority rules are that each key from maps within the value associated with << are added iff the key is not yet present in the current map (and first map gets higher priority). Test cases have been added accordingly.
|
I tested this PR and it appears to work as expected for my project. Thanks for the contribution, @nlescoua ! |
azat
reviewed
May 3, 2024
| detail::shared_memory_holder& pMemory) { | ||
| const detail::node& const_map_to = map_to; | ||
| for (auto j = map_from.begin(); j != map_from.end(); j++) { | ||
| detail::node* s = const_map_to.get(*j->first, pMemory); |
There was a problem hiding this comment.
This compares the shared_ptr of the keys, so it will not work correctly, this can be visible by iterating over keys, here is a fix for this case - #1279
It is based on your PR, with this fix and a test on top - da04fa3 (#1279)
azat
reviewed
May 3, 2024
| EXPECT_EQ(3, node["z"]["b"].as<int>()); | ||
| EXPECT_EQ(1, node["z"]["c"].as<int>()); | ||
|
|
||
| EXPECT_EQ(1, node["w"]["a"].as<int>()); |
There was a problem hiding this comment.
I've also changed the order of merging, to make it more compatible, see - 2a1aada (#1279)
Author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Support for YAML Merge keys ( <<: [*dict1, *dict2] ) is added. The merge key is a specific scalar with value << (and tag !!merge) that implies that during node construction, the map (or sequence of maps) are merged into the current map. The priority rules are that each key from maps within the value associated with << are added iff the key is not yet present in the current map (and first map gets higher priority). Test cases have been added accordingly.