mirror/ImHex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-02-10 22:38:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

patterns: Fixed enum entry scope resolution

Browse Source
This commit is contained in:
WerWolv
2021-09-25 14:52:17 +02:00
parent f5bd0b7971
commit 3850349eae
4 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1282,7 +1282,7 @@ namespace hex::pl {
};
Token::Literal literal;
if (dynamic_cast<PatternDataUnsigned*>(pattern)) {
if (dynamic_cast<PatternDataUnsigned*>(pattern) || dynamic_cast<PatternDataEnum*>(pattern)) {
u128 value = 0;
readValue(value, pattern);
literal = value;
@@ -1440,20 +1440,40 @@ namespace hex::pl {
class ASTNodeScopeResolution : public ASTNode {
public:
explicit ASTNodeScopeResolution(std::vector<std::string> path) : ASTNode(), m_path(std::move(path)) { }
explicit ASTNodeScopeResolution(ASTNode *type, std::string name) : ASTNode(), m_type(type), m_name(std::move(name)) { }
ASTNodeScopeResolution(const ASTNodeScopeResolution&) = default;
ASTNodeScopeResolution(const ASTNodeScopeResolution &other) {
this->m_type = other.m_type->clone();
this->m_name = other.m_name;
}
~ASTNodeScopeResolution() override {
delete this->m_type;
}
[[nodiscard]] ASTNode* clone() const override {
return new ASTNodeScopeResolution(*this);
}
const std::vector<std::string>& getPath() {
return this->m_path;
[[nodiscard]] ASTNode* evaluate(Evaluator *evaluator) const override {
auto type = this->m_type->evaluate(evaluator);
ON_SCOPE_EXIT { delete type; };
if (auto enumType = dynamic_cast<ASTNodeEnum*>(type)) {
for (auto &[name, value] : enumType->getEntries()) {
if (name == this->m_name)
return value->evaluate(evaluator);
}
} else {
LogConsole::abortEvaluation("invalid scope resolution. Cannot access this type");
}
LogConsole::abortEvaluation(hex::format("could not find constant '{}'", this->m_name), this);
}
private:
std::vector<std::string> m_path;
ASTNode *m_type;
std::string m_name;
};
class ASTNodeConditionalStatement : public ASTNode {
@@ -1828,7 +1848,6 @@ namespace hex::pl {
u32 paramIndex = 0;
for (const auto &[name, type] : this->m_params) {
hex::log::info("{}", name);
ctx->createVariable(name, type, params[paramIndex]);
ctx->setVariable(name, params[paramIndex]);

4
plugins/libimhex/source/pattern_language/evaluator.cpp
View File

@@ -25,9 +25,9 @@ namespace hex::pl {
else if (std::get_if<double>(&*value) != nullptr)
pattern = new PatternDataFloat(0, sizeof(double));
else if (std::get_if<bool>(&*value) != nullptr)
pattern = new PatternDataBoolean(0, sizeof(bool));
pattern = new PatternDataBoolean(0);
else if (std::get_if<char>(&*value) != nullptr)
pattern = new PatternDataCharacter(0, sizeof(char));
pattern = new PatternDataCharacter(0);
else if (std::get_if<PatternData*>(&*value) != nullptr)
pattern = std::get<PatternData*>(*value)->clone();
else if (std::get_if<std::string>(&*value) != nullptr)

2
plugins/libimhex/source/pattern_language/lexer.cpp
View File

@@ -375,7 +375,7 @@ namespace hex::pl {
tokens.emplace_back(VALUE_TOKEN(String, Token::Literal(s)));
offset += stringSize;
} else if (std::isalpha(c)) {
} else if (std::isalpha(c) || c == '_') {
std::string identifier = matchTillInvalid(&code[offset], [](char c) -> bool { return std::isalnum(c) || c == '_'; });
// Check for reserved keywords

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

@@ -77,7 +77,10 @@ namespace hex::pl {
typeName += "::";
continue;
} else {
return create(new ASTNodeScopeResolution({ typeName, getValue<Token::Identifier>(-1).get() }));
if (!this->m_types.contains(typeName))
throwParseError(hex::format("cannot access scope of invalid type '{}'", typeName), -1);
return create(new ASTNodeScopeResolution(this->m_types[typeName]->clone(), getValue<Token::Identifier>(-1).get()));
}
}
else