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

patterns: Fix function parsing

This commit is contained in:
WerWolv 2021-08-27 09:54:34 +02:00
parent 76f550d9e7
commit b7003d499c
2 changed files with 56 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ namespace hex::lang {
if (candidate != currMembers.end())
currPattern = *candidate;
else
this->getConsole().abortEvaluation(hex::format("no member found with identifier '{0}'", *stringPart));
return nullptr;
}
} else if (auto nodePart = std::get_if<ASTNode*>(&part); nodePart != nullptr) {
if (auto numericalExpressionNode = dynamic_cast<ASTNodeNumericExpression*>(*nodePart)) {
@ -144,7 +144,7 @@ namespace hex::lang {
identifier += ".";
}
identifier.pop_back();
this->getConsole().abortEvaluation(hex::format("no identifier with name '{}' was found", identifier));
this->getConsole().abortEvaluation(hex::format("no identifier with name '{}' found", identifier));
}
return currPattern;
@ -189,6 +189,30 @@ namespace hex::lang {
case 16: return new ASTNodeIntegerLiteral(hex::changeEndianess(*reinterpret_cast<s128*>(value), 16, signedPattern->getEndian()));
default: this->getConsole().abortEvaluation("invalid rvalue size");
}
} else if (auto boolPattern = dynamic_cast<PatternDataBoolean*>(currPattern); boolPattern != nullptr) {
u8 value[boolPattern->getSize()];
if (currPattern->isLocal())
std::memcpy(value, this->m_localStack.data() + boolPattern->getOffset(), boolPattern->getSize());
else
this->m_provider->read(boolPattern->getOffset(), value, boolPattern->getSize());
return new ASTNodeIntegerLiteral(hex::changeEndianess(*reinterpret_cast<u8*>(value), 1, boolPattern->getEndian()));
} else if (auto charPattern = dynamic_cast<PatternDataCharacter*>(currPattern); charPattern != nullptr) {
u8 value[charPattern->getSize()];
if (currPattern->isLocal())
std::memcpy(value, this->m_localStack.data() + charPattern->getOffset(), charPattern->getSize());
else
this->m_provider->read(charPattern->getOffset(), value, charPattern->getSize());
return new ASTNodeIntegerLiteral(hex::changeEndianess(*reinterpret_cast<char*>(value), 1, charPattern->getEndian()));
} else if (auto char16Pattern = dynamic_cast<PatternDataCharacter16*>(currPattern); char16Pattern != nullptr) {
u8 value[char16Pattern->getSize()];
if (currPattern->isLocal())
std::memcpy(value, this->m_localStack.data() + char16Pattern->getOffset(), char16Pattern->getSize());
else
this->m_provider->read(char16Pattern->getOffset(), value, char16Pattern->getSize());
return new ASTNodeIntegerLiteral(hex::changeEndianess(*reinterpret_cast<u16*>(value), 1, char16Pattern->getEndian()));
} else if (auto enumPattern = dynamic_cast<PatternDataEnum*>(currPattern); enumPattern != nullptr) {
u8 value[enumPattern->getSize()];
if (currPattern->isLocal())
@ -494,7 +518,13 @@ namespace hex::lang {
evaluator.createLocalVariable(paramNames[i], pattern);
evaluator.setLocalVariableValue(paramNames[i], &value, sizeof(value));
}, integerLiteralNode->getValue());
}
} else if (auto stringLiteralNode = dynamic_cast<ASTNodeStringLiteral*>(params[i]); stringLiteralNode != nullptr) {
auto string = stringLiteralNode->getString();
evaluator.createLocalVariable(paramNames[i], new PatternDataString(0, string.length()));
evaluator.setLocalVariableValue(paramNames[i], string.data(), string.length());
} else
evaluator.getConsole().abortEvaluation(hex::format("cannot create local variable {}, invalid type", paramNames[i]));
}
evaluator.m_currOffset = startOffset;

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

@ -106,13 +106,11 @@ namespace hex::lang {
return node;
} else if (MATCHES(sequence(IDENTIFIER))) {
auto originalPos = this->m_curr;
this->m_curr++;
parseScopeResolution();
bool isFunction = peek(SEPARATOR_ROUNDBRACKETOPEN);
this->m_curr = originalPos;
if (isFunction) {
this->m_curr++;
return TO_NUMERIC_EXPRESSION(parseFunctionCall());
}
else {
@ -384,7 +382,7 @@ namespace hex::lang {
while (hasParams) {
params.push_back(getValue<std::string>(-1));
if (!MATCHES(sequence(SEPARATOR_COMMA))) {
if (!MATCHES(sequence(SEPARATOR_COMMA, IDENTIFIER))) {
if (MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE)))
break;
else
@ -419,23 +417,7 @@ namespace hex::lang {
bool needsSemicolon = true;
ASTNode *statement;
if (peek(IDENTIFIER)) {
auto originalPos = this->m_curr;
this->m_curr++;
parseScopeResolution();
bool isFunction = peek(SEPARATOR_ROUNDBRACKETOPEN);
this->m_curr = originalPos;
if (isFunction) {
this->m_curr++;
statement = parseFunctionCall();
}
else
statement = parseMemberVariable(parseType());
}
else if (peek(KEYWORD_BE) || peek(KEYWORD_LE) || peek(VALUETYPE_ANY))
statement = parseMemberVariable(parseType());
else if (MATCHES(sequence(IDENTIFIER, OPERATOR_ASSIGNMENT)))
if (MATCHES(sequence(IDENTIFIER, OPERATOR_ASSIGNMENT)))
statement = parseFunctionVariableAssignment();
else if (MATCHES(sequence(KEYWORD_RETURN)))
statement = parseFunctionReturnStatement();
@ -445,6 +427,25 @@ namespace hex::lang {
} else if (MATCHES(sequence(KEYWORD_WHILE, SEPARATOR_ROUNDBRACKETOPEN))) {
statement = parseFunctionWhileLoop();
needsSemicolon = false;
} else if (MATCHES(sequence(IDENTIFIER))) {
auto originalPos = this->m_curr;
parseScopeResolution();
bool isFunction = peek(SEPARATOR_ROUNDBRACKETOPEN);
this->m_curr = originalPos;
if (isFunction) {
statement = parseFunctionCall();
}
else
statement = parseMemberVariable(parseType());
}
else if (peek(KEYWORD_BE) || peek(KEYWORD_LE) || peek(VALUETYPE_ANY)) {
auto type = parseType();
if (MATCHES(sequence(IDENTIFIER)))
statement = parseMemberVariable(type);
else
throwParseError("invalid variable declaration");
}
else
throwParseError("invalid sequence", 0);
@ -632,8 +633,6 @@ namespace hex::lang {
// (parseType) Identifier
ASTNode* Parser::parseMemberVariable(ASTNodeTypeDecl *type) {
if (type == nullptr) throwParseError("invalid type used in variable declaration", -1);
if (peek(SEPARATOR_COMMA)) {
std::vector<ASTNode*> variables;
@ -708,6 +707,8 @@ namespace hex::lang {
member = parseMemberVariable(type);
else if (MATCHES(sequence(OPERATOR_STAR, IDENTIFIER, OPERATOR_INHERIT)))
member = parseMemberPointerVariable(type);
else
throwParseError("invalid variable declaration");
}
else if (MATCHES(sequence(VALUETYPE_PADDING, SEPARATOR_SQUAREBRACKETOPEN)))
member = parsePadding();