-
Notifications
You must be signed in to change notification settings - Fork 143
Allow using rfl::AddTagsToVariants
with rfl::Generic
and same-name-different-namespace structs
#467
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow using rfl::AddTagsToVariants
with rfl::Generic
and same-name-different-namespace structs
#467
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Summary of Changes
Hello @jmcken8, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!
This pull request enhances the rfl::AddTagsToVariants
functionality by ensuring that fully qualified type names are used as tags, which resolves previous issues with rfl::Generic
types causing name collisions and allows for proper serialization of same-name structs across different namespaces. This change slightly increases the size of serialized formats but significantly improves robustness and flexibility.
Highlights
- Core Logic Change: Modified
rfl::parsing::VariantAlternativeWrapper::make_tag
to no longer strip namespaces from type names when generating tags forrfl::AddTagsToVariants
. This ensures that fully qualified type names are used as tags, resolving issues with name collisions. - Support for
rfl::Generic
in Variants: Enabled the correct serialization and deserialization ofrfl::Generic
types when they are part of arfl::Variant
orstd::variant
andrfl::AddTagsToVariants
is applied. Previously,std::vector<Generic>
andrfl::Object<Generic>
would both be tagged as 'Generic', leading to compiler errors due to duplicate field names. - Support for Same-Name-Different-Namespace Structs: Improved compatibility for structs that share the same name but reside in different namespaces (e.g.,
NamespaceA::Message
andNamespaceB::Message
). These can now be correctly serialized as variant alternatives using their fully qualified names as tags. - New Test Cases: Added comprehensive test cases in
tests/json/test_add_tag_to_variant.cpp
to validate the new behavior forrfl::Generic
within variants and for structs with identical names in different namespaces.
Using Gemini Code Assist
The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.
Invoking Gemini
You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command>
or @gemini-code-assist <command>
. Below is a summary of the supported commands.
Feature | Command | Description |
---|---|---|
Code Review | /gemini review |
Performs a code review for the current pull request in its current state. |
Pull Request Summary | /gemini summary |
Provides a summary of the current pull request in its current state. |
Comment | @gemini-code-assist | Responds in comments when explicitly tagged, both in issue comments and review comments. |
Help | /gemini help |
Displays a list of available commands. |
Customization
To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/
folder in the base of the repository. Detailed instructions can be found here.
Limitations & Feedback
Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.
You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.
Footnotes
-
Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request modifies rfl::AddTagsToVariants
to include full type names with namespaces when generating tags for variant alternatives, resolving issues with rfl::Generic
and enabling the use of structs with identical names from different namespaces. The new tests validate these improvements. I've provided suggestions for the new test file to enhance comment clarity, code formatting, and test suite organization.
76961ba
to
2775153
Compare
…structs The first one was the main reason for this change; the second one was a result of applying the change. Added tests for both. The issue was that both `std::vector<Generic>` and `rfl::Object<Generic>` were getting the type name 'Generic', which caused a compiler error due to duplicated field names. This will slightly increase the size of serialized formats when using the AddTagsToVariants, but it seems like a worthwhile change.
2775153
to
ef5e781
Compare
@jmcken8 IMO, the additional size needed for namespaces, which are often nested, means that this change should be of an opt-in variety, as in |
@bryceschober I'm on the fence - AddTagsToVariants already seems like an edge-case issue where it really should just work no matter what's given to it, especially since there are several available ways to add tags explicitly (rfl::TaggedUnion, rfl::Variant with rfl::Field) if a user is worried about the serialized size. What would you suggest for the |
@jmcken8 Well I'm not sure how you would make your solution work either. I'm guessing that you've looked at the test failures reported here by now. Looking at GCC 12's test failure, I see:
But those are "internal" namespaces, so they're different on for example LLVM 17:
My initial guess is that is the original reason for removing the namespace, and I don't know how you would get to where you want from here. I don't know your use case's requirements, but you do have the opportunity to differentiate your variant members by using the manual tagging suggested in the docs for variants: namespace Result {
struct Message {
using Tag = rfl::Literal<"Result::Message">;
std::string result;
};
} // namespace Result
namespace Error {
struct Message {
using Tag = rfl::Literal<"Error::Message">;
std::string error;
int error_id;
};
}; // namespace Error ... or whatever naming method of manual disambiguation you'd like. I also wonder what would happen if you used more fully qualified aliases for the struct types: using ResultMessage = Result::Message;
using ErrorMessage = Result::Message;
using Messages = std::variant<ResultMessage, ErrorMessage>; If that method works, then at least you wouldn't be manually keeping string name around that could get out of sync over time. |
Hi @jmcken8 and @bryceschober , how should we proceed with this PR? Should I take a look? |
Yes, @liuzicheng1987 I think that would be helpful. |
Thanks, @liuzicheng1987, yes, that'd be helpful. @bryceschober that would work for the custom case, but it's really the I haven't had a chance to get back to this in the last month and won't for a few more weeks, so any information you can provide would be helpful @liuzicheng1987. |
@jmcken8 @bryceschober it may not be the most elegant solution I ever came up with, but it gets the job done. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IMO, this proposal puts the burden on the wrong side of the fence.
I'm guessing that the most common use-case in reflect-cpp
is with strongly typed members, since that's kinda most of the point of reflection - to enable generic processing on specific strong types, and leaning towards doing as much of that as practical at compile time.
Given that perspective, the use of Generic
is not at the core of the intended use-case. This solution forces all variant alternatives to be manually tagged in order to use the reflection-based rfl::AddTagsToVariants
without getting a lot of namespace "noise".
I was hoping that there could be an alternative solution, like:
-
Support optionally defining the tag name for a
Generic
, which could be reused internally for itsstd::vector<Generic>
andrfl::Object<Generic>
type aliases. -
Support a separate
rfl::AddNamespacedTagsToVariants
for the use-cases that need/want it. I hacked up a stupid-simple and not-upstream-worthy copy-paste version of this here. I'm guessing that someone smarter about modern C++ than I could figure out how to share more of the implementation layers by adding a non-type template variable with a default value.
All that said, this solution does seem to work, and I think it might be reasonable in my use-case to manually tag every variant alternative type. I've made some more specific PR comments elsewhere.
vec, | ||
R"([{"button_pressed_t":{}},{"button_released_t":{"button":4}},{"key_pressed":{"key":99}},{"int":3}])"); | ||
R"([{"test_add_tag_to_rfl_variant::button_pressed_t":{}},{"test_add_tag_to_rfl_variant::button_released_t":{"button":4}},{"key_pressed":{"key":99}},{"int":3}])"); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion: Add another test to explicitly demonstrate how to avoid any namespace decoration in the serialization.
} | |
// Alternatively, in order to avoid getting the namespace to every alternative in our auto-tagged | |
// variant, we must manually tag all variant alternatives to control all serialized names | |
struct button_pressed_tagged_t { | |
using Tag = rfl::Literal<"button_pressed">; | |
}; | |
struct button_released_tagged_t { | |
using Tag = rfl::Literal<"button_released">; | |
rfl::Box<int> button; | |
}; | |
using my_tagged_event_type_t = | |
rfl::Variant<button_pressed_tagged_t, button_released_tagged_t, key_pressed_t, int>; | |
TEST(json, test_add_manual_tags_to_rfl_variants) { | |
std::vector<my_tagged_event_type_t> vec; | |
vec.emplace_back(button_pressed_tagged_t{}); | |
vec.emplace_back(button_released_tagged_t{rfl::make_box<int>(4)}); | |
vec.emplace_back(key_pressed_t{'c'}); | |
vec.emplace_back(3); | |
write_and_read<rfl::AddTagsToVariants>( | |
vec, | |
R"([{"button_pressed":{}},{"button_released":{"button":4}},{"key_pressed":{"key":99}},{"int":3}])"); | |
} | |
rfl::Generic error; | ||
}; | ||
|
||
using APICallOutput = rfl::Variant<APIResult, APIError>; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please fix: I think this was meant to be std::variant
:
using APICallOutput = rfl::Variant<APIResult, APIError>; | |
using APICallOutput = std::variant<APIResult, APIError>; |
|
||
namespace Result { | ||
struct Message { | ||
std::string result; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion: Make a note of the alternative approach using rfl::Tag
:
std::string result; | |
// Alternatively, manually tag instead of getting the namespaced name: | |
// rfl::Tag<"result_message"> | |
std::string result; |
|
||
namespace Error { | ||
struct Message { | ||
std::string error; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion: Make a note of the alternative approach using rfl::Tag
:
std::string error; | |
// Alternatively, manually tag instead of getting the namespaced name: | |
// rfl::Tag<"error_message"> | |
std::string error; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion: Overall, I think it would be helpful to maintain the test structure of test_add_tag_to_variant.cpp
and test_add_tag_to_rfl_variant.cpp
in parallel as much as possible, because otherwise they kinda imply that they have different functionality.
@bryceschober I like your second proposal of simply having two separate processors. It would also be a non-braking change, which is always good. |
@liuzicheng1987, I have published #494 as my alternative for your and @jmcken8 to review. |
@jmcken8 @bryceschober I am going to close this, because the issue was solved in another PR. |
The first one was the main reason for this change; the second one (ex:
a::Message
andb::Message
) was a positive result of applying the change. Added tests for both.The issue was that both
std::vector<Generic>
andrfl::Object<Generic>
were getting the type name 'Generic', which caused a compiler error due to duplicated field names.This will slightly increase the size of serialized formats when using the AddTagsToVariants, but it seems like a worthwhile change.