Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-29 19:17:28 +01:00
Code Releases Wiki Activity

patterns: Fixed passing structs to functions as argument

Browse Source 
Fixes #385
This commit is contained in:
WerWolv 2022-01-10 20:02:18 +01:00
parent d2704242f2
commit e204ef629f
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/libimhex/include/hex/pattern_language/ast_node.hpp
View File

@ -1717,15 +1717,21 @@ namespace hex::pl {
currPattern = newPattern; currPattern = newPattern;
} }
if (auto structPattern = dynamic_cast<PatternDataStruct*>(currPattern)) PatternData *indexPattern;
if (currPattern->isLocal())
indexPattern = std::get<PatternData*>(evaluator->getStack()[currPattern->getOffset()]);
else
indexPattern = currPattern;
if (auto structPattern = dynamic_cast<PatternDataStruct*>(indexPattern))
searchScope = structPattern->getMembers(); searchScope = structPattern->getMembers();
else if (auto unionPattern = dynamic_cast<PatternDataUnion*>(currPattern)) else if (auto unionPattern = dynamic_cast<PatternDataUnion*>(indexPattern))
searchScope = unionPattern->getMembers(); searchScope = unionPattern->getMembers();
else if (auto bitfieldPattern = dynamic_cast<PatternDataBitfield*>(currPattern)) else if (auto bitfieldPattern = dynamic_cast<PatternDataBitfield*>(indexPattern))
searchScope = bitfieldPattern->getFields(); searchScope = bitfieldPattern->getFields();
else if (auto dynamicArrayPattern = dynamic_cast<PatternDataDynamicArray*>(currPattern)) else if (auto dynamicArrayPattern = dynamic_cast<PatternDataDynamicArray*>(indexPattern))
searchScope = dynamicArrayPattern->getEntries(); searchScope = dynamicArrayPattern->getEntries();
else if (auto staticArrayPattern = dynamic_cast<PatternDataStaticArray*>(currPattern)) else if (auto staticArrayPattern = dynamic_cast<PatternDataStaticArray*>(indexPattern))
searchScope = { staticArrayPattern->getTemplate() }; searchScope = { staticArrayPattern->getTemplate() };
} }