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

Fixed built-in types to not work inside structs

This commit is contained in:
WerWolv 2020-11-20 15:52:06 +01:00
parent 302caba403
commit 0d9175dc15
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/lang/evaluator.cpp
View File

@ -21,8 +21,6 @@ namespace hex::lang {
const auto &member = static_cast<ASTNodeVariableDecl*>(node); const auto &member = static_cast<ASTNodeVariableDecl*>(node);
const auto typeDeclNode = static_cast<ASTNodeTypeDecl*>(this->m_types[member->getCustomVariableTypeName()]); const auto typeDeclNode = static_cast<ASTNodeTypeDecl*>(this->m_types[member->getCustomVariableTypeName()]);
if (typeDeclNode == nullptr)
return { nullptr, 0 };
if (member->getVariableType() == Token::TypeToken::Type::Signed8Bit && member->getArraySize() > 1) { if (member->getVariableType() == Token::TypeToken::Type::Signed8Bit && member->getArraySize() > 1) {
const auto &[pattern, size] = this->createStringPattern(member, offset + structSize); const auto &[pattern, size] = this->createStringPattern(member, offset + structSize);
@ -33,7 +31,7 @@ namespace hex::lang {
members.push_back(pattern); members.push_back(pattern);
structSize += size; structSize += size;
} else if (member->getVariableType() == Token::TypeToken::Type::CustomType } else if (member->getVariableType() == Token::TypeToken::Type::CustomType
&& typeDeclNode->getAssignedType() == Token::TypeToken::Type::Signed8Bit && typeDeclNode != nullptr && typeDeclNode->getAssignedType() == Token::TypeToken::Type::Signed8Bit
&& member->getArraySize() > 1) { && member->getArraySize() > 1) {
const auto &[pattern, size] = this->createStringPattern(member, offset + structSize); const auto &[pattern, size] = this->createStringPattern(member, offset + structSize);