Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pattern: Fixed endian setting applied to structs not applying to its members

This commit is contained in:
WerWolv 2022-01-29 02:51:46 +01:00
parent 3987a5df6a
commit e71091f4a8
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libimhex/include/hex/pattern_language/ast_node.hpp
View File

@ -472,7 +472,9 @@ namespace hex::pl {
if (!this->m_name.empty())
pattern->setTypeName(this->m_name);
pattern->setEndian(this->m_endian.value_or(evaluator->getDefaultEndian()));
if (this->m_endian.has_value())
pattern->setEndian(this->m_endian.value());
}
return patterns;

45
lib/libimhex/include/hex/pattern_language/pattern_data.hpp
View File

@ -123,8 +123,9 @@ namespace hex::pl {
}
[[nodiscard]] bool hasOverriddenColor() const { return this->m_manualColor; }
[[nodiscard]] std::endian getEndian() const { return this->m_endian; }
void setEndian(std::endian endian) { this->m_endian = endian; }
[[nodiscard]] std::endian getEndian() const { return this->m_endian.value_or(this->getEvaluator()->getDefaultEndian()); }
virtual void setEndian(std::endian endian) { this->m_endian = endian; }
[[nodiscard]] bool hasOverriddenEndian() const { return this->m_endian.has_value(); }
[[nodiscard]] std::string getDisplayName() const { return this->m_displayName.value_or(this->m_variableName); }
void setDisplayName(const std::string &name) { this->m_displayName = name; }
@ -301,7 +302,7 @@ namespace hex::pl {
}
protected:
std::endian m_endian = std::endian::native;
std::optional<std::endian> m_endian;
bool m_hidden = false;
private:
@ -456,6 +457,12 @@ namespace hex::pl {
return this->m_pointedAt->getPattern(offset);
}
void setEndian(std::endian endian) override {
this->m_pointedAt->setEndian(endian);
PatternData::setEndian(endian);
}
private:
PatternData *m_pointedAt = nullptr;
u64 m_pointedAtAddress = 0;
@ -899,6 +906,14 @@ namespace hex::pl {
return (*iter)->getPattern(offset);
}
void setEndian(std::endian endian) override {
for (auto &entry : this->m_entries) {
entry->setEndian(endian);
}
PatternData::setEndian(endian);
}
private:
std::vector<PatternData *> m_entries;
u64 m_displayEnd = 50;
@ -1048,6 +1063,12 @@ namespace hex::pl {
}
}
void setEndian(std::endian endian) override {
this->m_template->setEndian(endian);
PatternData::setEndian(endian);
}
private:
PatternData *m_template;
mutable PatternData *m_highlightTemplate;
@ -1186,6 +1207,15 @@ namespace hex::pl {
return (*iter)->getPattern(offset);
}
void setEndian(std::endian endian) override {
for (auto &member : this->m_members) {
if (!member->hasOverriddenEndian())
member->setEndian(endian);
}
PatternData::setEndian(endian);
}
private:
std::vector<PatternData *> m_members;
std::vector<PatternData *> m_sortedMembers;
@ -1324,6 +1354,15 @@ namespace hex::pl {
;
}
void setEndian(std::endian endian) override {
for (auto &member : this->m_members) {
if (!member->hasOverriddenEndian())
member->setEndian(endian);
}
PatternData::setEndian(endian);
}
private:
std::vector<PatternData *> m_members;
std::vector<PatternData *> m_sortedMembers;