imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-02 05:27:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

sys: Improved ScopeGuard syntax a lot

Browse Source
This commit is contained in:
WerWolv
2021-03-31 22:54:43 +02:00
parent a2c80e3fd6
commit 2f19ff768d
8 changed files with 70 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/libimhex/source/lang/evaluator.cpp
View File

@@ -121,10 +121,10 @@ namespace hex::lang {
ASTNode* Evaluator::evaluateFunctionCall(ASTNodeFunctionCall *node) {
std::vector<ASTNode*> evaluatedParams;
ScopeExit paramCleanup([&] {
ON_SCOPE_EXIT {
for (auto &param : evaluatedParams)
delete param;
});
};
for (auto &param : node->getParams()) {
if (auto numericExpression = dynamic_cast<ASTNodeNumericExpression*>(param); numericExpression != nullptr)
@@ -310,7 +310,7 @@ namespace hex::lang {
switch (node->getOperator()) {
case Token::Operator::TernaryConditional: {
auto condition = this->evaluateOperand(node->getFirstOperand());
SCOPE_EXIT( delete condition; );
ON_SCOPE_EXIT { delete condition; };
if (std::visit([](auto &&value){ return value != 0; }, condition->getValue()))
return this->evaluateOperand(node->getSecondOperand());
@@ -437,7 +437,7 @@ namespace hex::lang {
std::vector<PatternData*> memberPatterns;
this->m_currMembers.push_back(&memberPatterns);
SCOPE_EXIT( this->m_currMembers.pop_back(); );
ON_SCOPE_EXIT { this->m_currMembers.pop_back(); };
this->m_currRecursionDepth++;
if (this->m_currRecursionDepth > this->m_recursionLimit)
@@ -457,7 +457,7 @@ namespace hex::lang {
std::vector<PatternData*> memberPatterns;
this->m_currMembers.push_back(&memberPatterns);
SCOPE_EXIT( this->m_currMembers.pop_back(); );
ON_SCOPE_EXIT { this->m_currMembers.pop_back(); };
auto startOffset = this->m_currOffset;
@@ -501,7 +501,7 @@ namespace hex::lang {
this->getConsole().abortEvaluation("invalid expression in enum value");
auto valueNode = evaluateMathematicalExpression(expression);
SCOPE_EXIT( delete valueNode; );
ON_SCOPE_EXIT { delete valueNode; };
entryPatterns.push_back({ Token::castTo(builtinUnderlyingType->getType(), valueNode->getValue()), name });
}
@@ -522,7 +522,7 @@ namespace hex::lang {
this->getConsole().abortEvaluation("invalid expression in bitfield field size");
auto valueNode = evaluateMathematicalExpression(expression);
SCOPE_EXIT( delete valueNode; );
ON_SCOPE_EXIT { delete valueNode; };
auto fieldBits = std::visit([this, node, type = valueNode->getType()] (auto &&value) {
if (Token::isFloatingPoint(type))
@@ -580,7 +580,7 @@ namespace hex::lang {
if (auto offset = dynamic_cast<ASTNodeNumericExpression*>(node->getPlacementOffset()); offset != nullptr) {
auto valueNode = evaluateMathematicalExpression(offset);
SCOPE_EXIT( delete valueNode; );
ON_SCOPE_EXIT { delete valueNode; };
this->m_currOffset = std::visit([this, node, type = valueNode->getType()] (auto &&value) {
if (Token::isFloatingPoint(type))
@@ -608,7 +608,7 @@ namespace hex::lang {
if (auto offset = dynamic_cast<ASTNodeNumericExpression*>(node->getPlacementOffset()); offset != nullptr) {
auto valueNode = evaluateMathematicalExpression(offset);
SCOPE_EXIT( delete valueNode; );
ON_SCOPE_EXIT { delete valueNode; };
this->m_currOffset = std::visit([this, node, type = valueNode->getType()] (auto &&value) {
if (Token::isFloatingPoint(type))
@@ -628,7 +628,7 @@ namespace hex::lang {
else
this->getConsole().abortEvaluation("array size not a numeric expression");
SCOPE_EXIT( delete valueNode; );
ON_SCOPE_EXIT { delete valueNode; };
arraySize = std::visit([this, node, type = valueNode->getType()] (auto &&value) {
if (Token::isFloatingPoint(type))
@@ -701,7 +701,7 @@ namespace hex::lang {
s128 pointerOffset;
if (auto offset = dynamic_cast<ASTNodeNumericExpression*>(node->getPlacementOffset()); offset != nullptr) {
auto valueNode = evaluateMathematicalExpression(offset);
SCOPE_EXIT( delete valueNode; );
ON_SCOPE_EXIT { delete valueNode; };
pointerOffset = std::visit([this, node, type = valueNode->getType()] (auto &&value) {
if (Token::isFloatingPoint(type))

44
plugins/libimhex/source/lang/parser.cpp
View File

@@ -22,10 +22,10 @@ namespace hex::lang {
ASTNode* Parser::parseFunctionCall() {
auto functionName = getValue<std::string>(-2);
std::vector<ASTNode*> params;
ScopeExit paramCleanup([&]{
auto paramCleanup = SCOPE_GUARD {
for (auto &param : params)
delete param;
});
};
while (!MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE))) {
if (MATCHES(sequence(STRING)))
@@ -118,7 +118,7 @@ namespace hex::lang {
ASTNode* Parser::parseMultiplicativeExpression() {
auto node = this->parseUnaryExpression();
ScopeExit nodeCleanup([&]{ delete node; });
auto nodeCleanup = SCOPE_GUARD { delete node; };
while (MATCHES(oneOf(OPERATOR_STAR, OPERATOR_SLASH, OPERATOR_PERCENT))) {
auto op = getValue<Token::Operator>(-1);
@@ -134,7 +134,7 @@ namespace hex::lang {
ASTNode* Parser::parseAdditiveExpression() {
auto node = this->parseMultiplicativeExpression();
ScopeExit nodeCleanup([&]{ delete node; });
auto nodeCleanup = SCOPE_GUARD { delete node; };
while (MATCHES(variant(OPERATOR_PLUS, OPERATOR_MINUS))) {
auto op = getValue<Token::Operator>(-1);
@@ -150,7 +150,7 @@ namespace hex::lang {
ASTNode* Parser::parseShiftExpression() {
auto node = this->parseAdditiveExpression();
ScopeExit nodeCleanup([&]{ delete node; });
auto nodeCleanup = SCOPE_GUARD { delete node; };
while (MATCHES(variant(OPERATOR_SHIFTLEFT, OPERATOR_SHIFTRIGHT))) {
auto op = getValue<Token::Operator>(-1);
@@ -166,7 +166,7 @@ namespace hex::lang {
ASTNode* Parser::parseRelationExpression() {
auto node = this->parseShiftExpression();
ScopeExit nodeCleanup([&]{ delete node; });
auto nodeCleanup = SCOPE_GUARD{ delete node; };
while (MATCHES(sequence(OPERATOR_BOOLGREATERTHAN) || sequence(OPERATOR_BOOLLESSTHAN) || sequence(OPERATOR_BOOLGREATERTHANOREQUALS) || sequence(OPERATOR_BOOLLESSTHANOREQUALS))) {
auto op = getValue<Token::Operator>(-1);
@@ -182,7 +182,7 @@ namespace hex::lang {
ASTNode* Parser::parseEqualityExpression() {
auto node = this->parseRelationExpression();
ScopeExit nodeCleanup([&]{ delete node; });
auto nodeCleanup = SCOPE_GUARD { delete node; };
while (MATCHES(sequence(OPERATOR_BOOLEQUALS) || sequence(OPERATOR_BOOLNOTEQUALS))) {
auto op = getValue<Token::Operator>(-1);
@@ -198,7 +198,7 @@ namespace hex::lang {
ASTNode* Parser::parseBinaryAndExpression() {
auto node = this->parseEqualityExpression();
ScopeExit nodeCleanup([&]{ delete node; });
auto nodeCleanup = SCOPE_GUARD { delete node; };
while (MATCHES(sequence(OPERATOR_BITAND))) {
node = new ASTNodeNumericExpression(node, this->parseEqualityExpression(), Token::Operator::BitAnd);
@@ -213,7 +213,7 @@ namespace hex::lang {
ASTNode* Parser::parseBinaryXorExpression() {
auto node = this->parseBinaryAndExpression();
ScopeExit nodeCleanup([&]{ delete node; });
auto nodeCleanup = SCOPE_GUARD { delete node; };
while (MATCHES(sequence(OPERATOR_BITXOR))) {
node = new ASTNodeNumericExpression(node, this->parseBinaryAndExpression(), Token::Operator::BitXor);
@@ -228,7 +228,7 @@ namespace hex::lang {
ASTNode* Parser::parseBinaryOrExpression() {
auto node = this->parseBinaryXorExpression();
ScopeExit nodeCleanup([&]{ delete node; });
auto nodeCleanup = SCOPE_GUARD { delete node; };
while (MATCHES(sequence(OPERATOR_BITOR))) {
node = new ASTNodeNumericExpression(node, this->parseBinaryXorExpression(), Token::Operator::BitOr);
@@ -243,7 +243,7 @@ namespace hex::lang {
ASTNode* Parser::parseBooleanAnd() {
auto node = this->parseBinaryOrExpression();
ScopeExit nodeCleanup([&]{ delete node; });
auto nodeCleanup = SCOPE_GUARD { delete node; };
while (MATCHES(sequence(OPERATOR_BOOLAND))) {
node = new ASTNodeNumericExpression(node, this->parseBinaryOrExpression(), Token::Operator::BitOr);
@@ -258,7 +258,7 @@ namespace hex::lang {
ASTNode* Parser::parseBooleanXor() {
auto node = this->parseBooleanAnd();
ScopeExit nodeCleanup([&]{ delete node; });
auto nodeCleanup = SCOPE_GUARD { delete node; };
while (MATCHES(sequence(OPERATOR_BOOLXOR))) {
node = new ASTNodeNumericExpression(node, this->parseBooleanAnd(), Token::Operator::BitOr);
@@ -273,7 +273,7 @@ namespace hex::lang {
ASTNode* Parser::parseBooleanOr() {
auto node = this->parseBooleanXor();
ScopeExit nodeCleanup([&]{ delete node; });
auto nodeCleanup = SCOPE_GUARD { delete node; };
while (MATCHES(sequence(OPERATOR_BOOLOR))) {
node = new ASTNodeNumericExpression(node, this->parseBooleanXor(), Token::Operator::BitOr);
@@ -288,7 +288,7 @@ namespace hex::lang {
ASTNode* Parser::parseTernaryConditional() {
auto node = this->parseBooleanOr();
ScopeExit nodeCleanup([&]{ delete node; });
auto nodeCleanup = SCOPE_GUARD { delete node; };
while (MATCHES(sequence(OPERATOR_TERNARYCONDITIONAL))) {
auto second = this->parseBooleanOr();
@@ -341,13 +341,13 @@ namespace hex::lang {
auto condition = parseMathematicalExpression();
std::vector<ASTNode*> trueBody, falseBody;
ScopeExit cleanup([&]{
auto cleanup = SCOPE_GUARD {
delete condition;
for (auto &statement : trueBody)
delete statement;
for (auto &statement : falseBody)
delete statement;
});
};
if (MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE, SEPARATOR_CURLYBRACKETOPEN))) {
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
@@ -432,7 +432,7 @@ namespace hex::lang {
auto name = getValue<std::string>(-2);
ASTNode *size = nullptr;
ScopeExit sizeCleanup([&]{ delete size; });
auto sizeCleanup = SCOPE_GUARD { delete size; };
if (!MATCHES(sequence(SEPARATOR_SQUAREBRACKETCLOSE))) {
size = parseMathematicalExpression();
@@ -494,7 +494,7 @@ namespace hex::lang {
ASTNode* Parser::parseStruct() {
const auto structNode = new ASTNodeStruct();
const auto &typeName = getValue<std::string>(-2);
ScopeExit structGuard([&]{ delete structNode; });
auto structGuard = SCOPE_GUARD { delete structNode; };
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
structNode->addMember(parseMember());
@@ -509,7 +509,7 @@ namespace hex::lang {
ASTNode* Parser::parseUnion() {
const auto unionNode = new ASTNodeUnion();
const auto &typeName = getValue<std::string>(-2);
ScopeExit unionGuard([&]{ delete unionNode; });
auto unionGuard = SCOPE_GUARD { delete unionNode; };
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
unionNode->addMember(parseMember());
@@ -533,7 +533,7 @@ namespace hex::lang {
if (underlyingType->getEndian().has_value()) throwParseError("underlying type may not have an endian specification", -2);
const auto enumNode = new ASTNodeEnum(underlyingType);
ScopeExit enumGuard([&]{ delete enumNode; });
auto enumGuard = SCOPE_GUARD { delete enumNode; };
ASTNode *lastEntry = nullptr;
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
@@ -577,7 +577,7 @@ namespace hex::lang {
std::string typeName = getValue<std::string>(-2);
const auto bitfieldNode = new ASTNodeBitfield();
ScopeExit enumGuard([&]{ delete bitfieldNode; });
auto enumGuard = SCOPE_GUARD { delete bitfieldNode; };
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
if (MATCHES(sequence(IDENTIFIER, OPERATOR_INHERIT))) {
@@ -615,7 +615,7 @@ namespace hex::lang {
auto name = getValue<std::string>(-2);
ASTNode *size = nullptr;
ScopeExit sizeCleanup([&]{ delete size; });
auto sizeCleanup = SCOPE_GUARD { delete size; };
if (!MATCHES(sequence(SEPARATOR_SQUAREBRACKETCLOSE))) {
size = parseMathematicalExpression();

5
plugins/libimhex/source/lang/pattern_language.cpp
View File

@@ -81,7 +81,10 @@ namespace hex::lang {
return { };
}
SCOPE_EXIT( for(auto &node : ast.value()) delete node; );
ON_SCOPE_EXIT {
for(auto &node : ast.value())
delete node;
};
auto validatorResult = this->m_validator->validate(ast.value());
if (!validatorResult) {