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

patterns: Allow functions to be called inside structs

This commit is contained in:
WerWolv 2021-11-27 12:57:59 +01:00
parent 467e9d1463
commit ded452fdfc
2 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ namespace hex::pl {
[[nodiscard]] virtual std::vector<PatternData *> createPatterns(Evaluator *evaluator) const { return {}; }
using FunctionResult = std::pair<bool, std::optional<Token::Literal>>;
virtual FunctionResult execute(Evaluator *evaluator) { throw std::pair<u32, std::string>(this->getLineNumber(), "cannot execute non-function statement"); }
virtual FunctionResult execute(Evaluator *evaluator) const { throw std::pair<u32, std::string>(this->getLineNumber(), "cannot execute non-function statement"); }
private:
u32 m_lineNumber = 1;
@ -565,7 +565,7 @@ namespace hex::pl {
return this->m_body;
}
FunctionResult execute(Evaluator *evaluator) override {
FunctionResult execute(Evaluator *evaluator) const override {
u64 loopIterations = 0;
while (evaluateCondition(evaluator)) {
@ -755,7 +755,7 @@ namespace hex::pl {
return { pattern };
}
FunctionResult execute(Evaluator *evaluator) override {
FunctionResult execute(Evaluator *evaluator) const override {
evaluator->createVariable(this->getName(), this->getType());
return { false, { } };
@ -1144,7 +1144,7 @@ namespace hex::pl {
return patterns;
}
FunctionResult execute(Evaluator *evaluator) override {
FunctionResult execute(Evaluator *evaluator) const override {
for (auto &variable : this->m_variables) {
auto variableDecl = dynamic_cast<ASTNodeVariableDecl*>(variable);
@ -1775,7 +1775,7 @@ namespace hex::pl {
return this->m_falseBody;
}
FunctionResult execute(Evaluator *evaluator) override {
FunctionResult execute(Evaluator *evaluator) const override {
auto &body = evaluateCondition(evaluator) ? this->m_trueBody : this->m_falseBody;
auto variables = *evaluator->getScope(0).scope;
@ -1848,6 +1848,13 @@ namespace hex::pl {
return this->m_params;
}
[[nodiscard]] std::vector<PatternData*> createPatterns(Evaluator *evaluator) const override {
this->execute(evaluator);
return { };
}
[[nodiscard]] ASTNode* evaluate(Evaluator *evaluator) const override {
std::vector<Token::Literal> evaluatedParams;
for (auto param : this->m_params) {
@ -1897,7 +1904,7 @@ namespace hex::pl {
return nullptr;
}
FunctionResult execute(Evaluator *evaluator) override {
FunctionResult execute(Evaluator *evaluator) const override {
delete this->evaluate(evaluator);
return { false, { } };
@ -1987,7 +1994,7 @@ namespace hex::pl {
return this->m_rvalue;
}
FunctionResult execute(Evaluator *evaluator) override {
FunctionResult execute(Evaluator *evaluator) const override {
auto literal = dynamic_cast<ASTNodeLiteral*>(this->getRValue()->evaluate(evaluator));
ON_SCOPE_EXIT { delete literal; };
@ -2024,7 +2031,7 @@ namespace hex::pl {
return this->m_rvalue;
}
FunctionResult execute(Evaluator *evaluator) override {
FunctionResult execute(Evaluator *evaluator) const override {
auto returnValue = this->getReturnValue();
if (returnValue == nullptr)
@ -2172,7 +2179,7 @@ namespace hex::pl {
return result;
}
FunctionResult execute(Evaluator *evaluator) override {
FunctionResult execute(Evaluator *evaluator) const override {
FunctionResult result;
auto variables = *evaluator->getScope(0).scope;

36
plugins/libimhex/source/pattern_language/parser.cpp
View File

@ -837,16 +837,34 @@ namespace hex::pl {
if (peek(KEYWORD_BE) || peek(KEYWORD_LE) || peek(VALUETYPE_ANY) || peek(IDENTIFIER)) {
// Some kind of variable definition
auto type = parseType();
bool isFunction = false;
if (MATCHES(sequence(IDENTIFIER, SEPARATOR_SQUAREBRACKETOPEN)) && sequence<Not>(SEPARATOR_SQUAREBRACKETOPEN))
member = parseMemberArrayVariable(type);
else if (MATCHES(sequence(IDENTIFIER)))
member = parseMemberVariable(type);
else if (MATCHES(sequence(OPERATOR_STAR, IDENTIFIER, OPERATOR_INHERIT)))
member = parseMemberPointerVariable(type);
else
throwParseError("invalid variable declaration");
if (peek(IDENTIFIER)) {
auto originalPos = this->m_curr;
this->m_curr++;
parseNamespaceResolution();
isFunction = peek(SEPARATOR_ROUNDBRACKETOPEN);
this->m_curr = originalPos;
if (isFunction) {
this->m_curr++;
member = parseFunctionCall();
}
}
if (!isFunction) {
auto type = parseType();
if (MATCHES(sequence(IDENTIFIER, SEPARATOR_SQUAREBRACKETOPEN)) && sequence<Not>(SEPARATOR_SQUAREBRACKETOPEN))
member = parseMemberArrayVariable(type);
else if (MATCHES(sequence(IDENTIFIER)))
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();