Repository navigation
Conversation
…lue and seperate raw/transformed pattern value accessors
This branch has not been deployed
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
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.
Refactors pattern value access and formatting so user [[format]] attribute handling is centralized in
Pattern::getFormattedValue()andPattern::toString(), while per-pattern formatting moves intodefaultToDisplayValue()anddefaultToString()fallbacks. For accessing pattern's value addedgetRawValuefor pre-[[transform]] access.Make [[format]] functions to always receive the untransformed value (via
getRawValue()) instead of the transformed one for scalar types.Previously,
fn format_field(u32 x) { ... }andfn transform_field(u32 x) { ... }applied on fieldu32 field [[format("format_field"), transform("transform_field")]]will applytransform_field()before passing the value toformat_field(). But this is not the same for pattern types likestruct, meaning for pattern values it will not applytransform_field(), and direclty pass pattern's value toformat_fieldfunction. This change fixes the inconsistent behavior by never applying [[transform]] before [[format]].I ran tests on the ImHex-Pattern repo with code from this PR and confirmed that existing hexpats do not rely on this behavior.
API changes
getValue() const override->getRawValue() const override+ droptransformValue(...).toString() override->defaultToString() const override.formatDisplayValue() override->defaultToDisplayValue() const override.callUserFormatFunc(literal, fromCast)->callUserFormatFunc(fromCast).getValue()andtoString()are no longer virtual.Due to these breaking API changes, the main ImHex repo will not compile because it relied on them. I opened a draft PR for ImHex repo to adapt to these changes when this PR is merged - WerWolv/ImHex#2910