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

patterns: Allow forward declaring of types

Browse Source
This commit is contained in:
WerWolv
2022-03-24 16:57:12 +01:00
parent c2803fe1e2
commit c09d85f46d
4 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/libimhex/source/pattern_language/parser.cpp
View File

@@ -706,10 +706,7 @@ namespace hex::pl {
// using Identifier = (parseType)
std::shared_ptr<ASTNodeTypeDecl> Parser::parseUsingDeclaration() {
auto name = parseNamespaceResolution();
if (!MATCHES(sequence(OPERATOR_ASSIGNMENT)))
throwParserError("expected '=' after type name of using declaration");
auto name = getNamespacePrefixedName(getValue<Token::Identifier>(-2).get());
auto type = parseType();
@@ -976,6 +973,16 @@ namespace hex::pl {
return typeDecl;
}
// using Identifier;
void Parser::parseForwardDeclaration() {
std::string typeName = getNamespacePrefixedName(getValue<Token::Identifier>(-1).get());
if (this->m_types.contains(typeName))
return;
this->m_types.insert({ typeName, create(new ASTNodeTypeDecl(typeName) )});
}
// (parseType) Identifier @ Integer
std::unique_ptr<ASTNode> Parser::parseVariablePlacement(const std::shared_ptr<ASTNodeTypeDecl> &type) {
bool inVariable = false;
@@ -1088,8 +1095,10 @@ namespace hex::pl {
std::vector<std::shared_ptr<ASTNode>> Parser::parseStatements() {
std::shared_ptr<ASTNode> statement;
if (MATCHES(sequence(KEYWORD_USING, IDENTIFIER)))
if (MATCHES(sequence(KEYWORD_USING, IDENTIFIER, OPERATOR_ASSIGNMENT)))
statement = parseUsingDeclaration();
else if (MATCHES(sequence(KEYWORD_USING, IDENTIFIER)))
parseForwardDeclaration();
else if (peek(IDENTIFIER)) {
auto originalPos = this->m_curr;
this->m_curr++;
@@ -1118,7 +1127,7 @@ namespace hex::pl {
return parseNamespace();
else throwParserError("invalid sequence", 0);
if (MATCHES(sequence(SEPARATOR_SQUAREBRACKETOPEN, SEPARATOR_SQUAREBRACKETOPEN)))
if (statement && MATCHES(sequence(SEPARATOR_SQUAREBRACKETOPEN, SEPARATOR_SQUAREBRACKETOPEN)))
parseAttribute(dynamic_cast<Attributable *>(statement.get()));
if (!MATCHES(sequence(SEPARATOR_ENDOFEXPRESSION)))
@@ -1128,19 +1137,28 @@ namespace hex::pl {
while (MATCHES(sequence(SEPARATOR_ENDOFEXPRESSION)))
;
if (!statement)
return { };
return hex::moveToVector(std::move(statement));
}
std::shared_ptr<ASTNodeTypeDecl> Parser::addType(const std::string &name, std::unique_ptr<ASTNode> &&node, std::optional<std::endian> endian) {
auto typeName = getNamespacePrefixedName(name);
if (this->m_types.contains(typeName))
throwParserError(hex::format("redefinition of type '{}'", typeName));
if (this->m_types.contains(typeName) && this->m_types.at(typeName)->isForwardDeclared()) {
this->m_types.at(typeName)->setType(std::move(node));
std::shared_ptr typeDecl = create(new ASTNodeTypeDecl(typeName, std::move(node), endian));
this->m_types.insert({ typeName, typeDecl });
return this->m_types.at(typeName);
} else {
if (this->m_types.contains(typeName))
throwParserError(hex::format("redefinition of type '{}'", typeName));
return typeDecl;
std::shared_ptr typeDecl = create(new ASTNodeTypeDecl(typeName, std::move(node), endian));
this->m_types.insert({ typeName, typeDecl });
return typeDecl;
}
}
// <(parseNamespace)...> EndOfProgram

3
lib/libimhex/source/pattern_language/validator.cpp
View File

@@ -33,7 +33,8 @@ namespace hex::pl {
if (!types.insert(typeDeclNode->getName().data()).second)
throwValidatorError(hex::format("redefinition of type '{0}'", typeDeclNode->getName().data()), typeDeclNode->getLineNumber());
this->validate(hex::moveToVector<std::shared_ptr<ASTNode>>(typeDeclNode->getType()->clone()));
if (!typeDeclNode->isForwardDeclared())
this->validate(hex::moveToVector<std::shared_ptr<ASTNode>>(typeDeclNode->getType()->clone()));
} else if (auto structNode = dynamic_cast<ASTNodeStruct *>(node.get()); structNode != nullptr) {
this->validate(structNode->getMembers());
} else if (auto unionNode = dynamic_cast<ASTNodeUnion *>(node.get()); unionNode != nullptr) {