Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-18 00:56:49 +01:00
Code Releases Wiki Activity

patterns: Fixed multiple parse and evaluate issues

Browse Source
This commit is contained in:
WerWolv 2021-06-22 16:04:47 +02:00
parent fde5b39495
commit 1e1cdb0ef0
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/libimhex/include/hex/lang/ast_node.hpp
View File

@ -569,7 +569,7 @@ namespace hex::lang {
class ASTNodeAttribute : public ASTNode { class ASTNodeAttribute : public ASTNode {
public: public:
explicit ASTNodeAttribute(std::string_view attribute, std::string_view value = { }) explicit ASTNodeAttribute(std::string_view attribute, std::optional<std::string_view> value = { })
: ASTNode(), m_attribute(attribute), m_value(value) { } : ASTNode(), m_attribute(attribute), m_value(value) { }
~ASTNodeAttribute() override = default; ~ASTNodeAttribute() override = default;

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

@ -113,7 +113,8 @@ namespace hex::lang {
PatternData *currPattern = nullptr; PatternData *currPattern = nullptr;
// Local variable access // Local variable access
currPattern = this->findPattern(*this->m_localVariables.back(), path); if (!this->m_localVariables.empty())
currPattern = this->findPattern(*this->m_localVariables.back(), path);
// If no local variable was found try local structure members // If no local variable was found try local structure members
if (this->m_currMembers.size() > 1) { if (this->m_currMembers.size() > 1) {

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

@ -365,7 +365,8 @@ namespace hex::lang {
std::vector<std::string> params; std::vector<std::string> params;
// Parse parameter list // Parse parameter list
while (MATCHES(sequence(IDENTIFIER))) { bool hasParams = MATCHES(sequence(IDENTIFIER));
while (hasParams) {
params.push_back(getValue<std::string>(-1)); params.push_back(getValue<std::string>(-1));
if (!MATCHES(sequence(SEPARATOR_COMMA))) { if (!MATCHES(sequence(SEPARATOR_COMMA))) {
@ -375,6 +376,10 @@ namespace hex::lang {
throwParseError("expected closing ')' after parameter list"); throwParseError("expected closing ')' after parameter list");
} }
} }
if (!hasParams) {
if (!MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE)))
throwParseError("expected closing ')' after parameter list");
}
if (!MATCHES(sequence(SEPARATOR_CURLYBRACKETOPEN))) if (!MATCHES(sequence(SEPARATOR_CURLYBRACKETOPEN)))
throwParseError("expected opening '{' after function definition"); throwParseError("expected opening '{' after function definition");