zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-21 00:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve forward declarations

Browse Source
This commit is contained in:
Jan 2021-02-19 01:11:06 +01:00
parent e51babaeb4
commit 2747e1f0f2
4 changed files with 104 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParser.cpp
View File

@ -13,7 +13,7 @@ const std::vector<HeaderParser::sequence_t*>& HeaderParser::GetTestsForState()
return m_state->GetBlock()->GetTestsForBlock();
}
void HeaderParser::SaveToRepository(IDataRepository* repository) const
bool HeaderParser::SaveToRepository(IDataRepository* repository) const
{
return m_state->SaveToRepository(repository);
}

2
src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParser.h
View File

@ -14,5 +14,5 @@ protected:
public:
HeaderParser(HeaderLexer* lexer, const IPackValueSupplier* packValueSupplier);
void SaveToRepository(IDataRepository* repository) const;
bool SaveToRepository(IDataRepository* repository) const;
};

101
src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParserState.cpp
View File

@ -1,5 +1,8 @@
#include "HeaderParserState.h"
#include <iostream>
#include "Domain/Definition/EnumDefinition.h"
#include "Parsing/Header/Block/HeaderBlockNone.h"
@ -9,7 +12,7 @@ HeaderParserState::HeaderParserState(const IPackValueSupplier* packValueSupplier
{
m_blocks.push(std::make_unique<HeaderBlockNone>());
for(auto i = 0u; i < BaseTypeDefinition::ALL_BASE_TYPES_COUNT; i++)
for (auto i = 0u; i < BaseTypeDefinition::ALL_BASE_TYPES_COUNT; i++)
AddBaseDataType(BaseTypeDefinition::ALL_BASE_TYPES[i]);
}
@ -43,9 +46,9 @@ void HeaderParserState::PopBlock()
void HeaderParserState::AddDataType(std::unique_ptr<DataDefinition> definition)
{
if(definition->GetType() == DataDefinitionType::ENUM)
if (definition->GetType() == DataDefinitionType::ENUM)
{
for(const auto& enumMember : dynamic_cast<EnumDefinition*>(definition.get())->m_members)
for (const auto& enumMember : dynamic_cast<EnumDefinition*>(definition.get())->m_members)
{
m_enum_members.insert(std::make_pair(enumMember->m_name, enumMember.get()));
}
@ -86,11 +89,88 @@ EnumMember* HeaderParserState::FindEnumMember(const std::string& enumMemberName)
return nullptr;
}
void HeaderParserState::SaveToRepository(IDataRepository* repository)
bool HeaderParserState::ResolveForwardDeclarations()
{
for(auto& definition : m_header_definitions)
for (auto& [_, forwardDeclaration] : m_forward_declarations)
{
switch(definition->GetType())
const auto* dataDefinition = FindType(forwardDeclaration->GetFullName());
if (dataDefinition == nullptr)
{
std::cout << "Forward declaration \"" << forwardDeclaration->GetFullName() << "\" was not defined" << std::endl;
return false;
}
forwardDeclaration->m_definition = dataDefinition;
}
return true;
}
bool HeaderParserState::ReplaceForwardDeclarationsInStruct(StructDefinition* structDefinition)
{
for (const auto& variable : structDefinition->m_members)
{
if (variable->m_type_declaration->m_type->GetType() == DataDefinitionType::FORWARD_DECLARATION)
variable->m_type_declaration->m_type = dynamic_cast<const ForwardDeclaration*>(variable->m_type_declaration->m_type)->m_definition;
}
return true;
}
bool HeaderParserState::ReplaceForwardDeclarationsInTypedef(TypedefDefinition* typedefDefinition)
{
if (typedefDefinition->m_type_declaration->m_type->GetType() == DataDefinitionType::FORWARD_DECLARATION)
typedefDefinition->m_type_declaration->m_type = dynamic_cast<const ForwardDeclaration*>(typedefDefinition->m_type_declaration->m_type)->m_definition;
return true;
}
bool HeaderParserState::ReplaceForwardDeclarationsInUnion(UnionDefinition* unionDefinition)
{
for (const auto& variable : unionDefinition->m_members)
{
if (variable->m_type_declaration->m_type->GetType() == DataDefinitionType::FORWARD_DECLARATION)
variable->m_type_declaration->m_type = dynamic_cast<const ForwardDeclaration*>(variable->m_type_declaration->m_type)->m_definition;
}
return true;
}
bool HeaderParserState::ReplaceForwardDeclarationsInDefinitions()
{
for (auto& definition : m_header_definitions)
{
switch (definition->GetType())
{
case DataDefinitionType::STRUCT:
if (!ReplaceForwardDeclarationsInStruct(dynamic_cast<StructDefinition*>(definition.get())))
return false;
break;
case DataDefinitionType::TYPEDEF:
if (!ReplaceForwardDeclarationsInTypedef(dynamic_cast<TypedefDefinition*>(definition.get())))
return false;
break;
case DataDefinitionType::UNION:
if (!ReplaceForwardDeclarationsInUnion(dynamic_cast<UnionDefinition*>(definition.get())))
return false;
break;
default:
break;
}
}
return true;
}
bool HeaderParserState::MoveDefinitionsToRepository(IDataRepository* repository)
{
for (auto& definition : m_header_definitions)
{
switch (definition->GetType())
{
case DataDefinitionType::ENUM:
repository->Add(std::unique_ptr<EnumDefinition>(dynamic_cast<EnumDefinition*>(definition.release())));
@ -112,4 +192,13 @@ void HeaderParserState::SaveToRepository(IDataRepository* repository)
break;
}
}
return true;
}
bool HeaderParserState::SaveToRepository(IDataRepository* repository)
{
return ResolveForwardDeclarations()
&& ReplaceForwardDeclarationsInDefinitions()
&& MoveDefinitionsToRepository(repository);
}

8
src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParserState.h
View File

@ -26,6 +26,12 @@ class HeaderParserState
std::unordered_map<std::string, std::unique_ptr<ForwardDeclaration>> m_forward_declarations;
void AddBaseDataType(const BaseTypeDefinition* baseType);
bool ResolveForwardDeclarations();
static bool ReplaceForwardDeclarationsInStruct(StructDefinition* structDefinition);
static bool ReplaceForwardDeclarationsInTypedef(TypedefDefinition* typedefDefinition);
static bool ReplaceForwardDeclarationsInUnion(UnionDefinition* unionDefinition);
bool ReplaceForwardDeclarationsInDefinitions();
bool MoveDefinitionsToRepository(IDataRepository* repository);
public:
const IPackValueSupplier* const m_pack_value_supplier;
@ -43,5 +49,5 @@ public:
const DataDefinition* FindType(const std::string& typeName);
EnumMember* FindEnumMember(const std::string& enumMemberName);
void SaveToRepository(IDataRepository* repository);
bool SaveToRepository(IDataRepository* repository);
};