cata_variant enhancements #33697
Merged
cata_variant enhancements #33697
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
ZhilkinSerg
added
Code: Infrastructure / Style / Static Analysis
Also renamed tuple_hash to hash_utils, because it contains more than just a tuple hash.
Previously it had bespoke stringification infrastructure. Switch to the shared code.
This is needed for deserialization code.
Actually say what the invalid string and the corresponding enum type were to assist with debugging.
This is supposed to by in the standard library in C++14, but gcc 5.3 is missing it.
jbytheway
force-pushed
the
cata_variant_enhancements
branch
from
04d37e1 to
e1db9b2
Compare
misterprimus
pushed a commit
to misterprimus/Cataclysm-DDA
that referenced
this pull request
Sep 21, 2019
* Comparison and hash support for cata_variant Also renamed tuple_hash to hash_utils, because it contains more than just a tuple hash. * Fix cata_variant construction from const lvalue * Convert cata_variant to io::enum_to_string Previously it had bespoke stringification infrastructure. Switch to the shared code. * Add default construction to empty cata_variant This is needed for deserialization code. * Serialization support for cata_variant * Better error on invalid enum strings Actually say what the invalid string and the corresponding enum type were to assist with debugging. * Support for deserializing enums from strings * Additional cata_variant tests * Explicit hash specialization for cata_variant_type This is supposed to by in the standard library in C++14, but gcc 5.3 is missing it. * Fix clang-tidy errors
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.
Summary
SUMMARY: Infrastructure "More cata_variant features, including comparison and serialization"
Purpose of change
Make
cata_varianta more "fully-featured" type applicable in more situations.Motivated by the need to serialize and compare
eventobjects in the forthcoming statistics tracker feature I'm working on for scores and achievements (#4173).Describe the solution
Add the following to
cata_variant:cata_variant_type.Incidental changes:
string_to_enumnow gives a more helpful error message in the event that the given string is not valid.tuple_hash.htohash_utils.hbecause it contains more than justtuple_hash(alsohash_combine).Additional context
These are commits extracted from the branch where I'm adding a class for tracking event statistics. That branch was getting large, so I'm pulling out these features.
The new features are not currently used anywhere, but hopefully they are obviously useful things to have.
The renaming of
tuple_hash.htohash_utils.hprobably seems slightly random here, but that's a side-effect of me picking apart commits. Renames are hard to deal with in that context. I have more features to add to that header in a future PR that will make the renaming more logical, but I could remove that aspect from this branch if it seems too unwarranted.