INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-13 00:08:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix techset parsing naming issues

Browse Source
This commit is contained in:
Jan
2022-03-27 16:21:06 +02:00
parent d8f490ec94
commit 99d5caf1f2
8 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ObjLoading/Techset/Parsing/TechsetFileParser.cpp
View File

@ -6,7 +6,7 @@ using namespace techset;
namespace techset
{
class SequenceTechniqueTypeName final : public Parser::sequence_t
class SequenceTechniqueTypeName final : public TechsetParser::sequence_t
{
static constexpr auto CAPTURE_TYPE_NAME = 1;
@ -22,7 +22,7 @@ namespace techset
}
protected:
void ProcessMatch(ParserState* state, SequenceResult<SimpleParserValue>& result) const override
void ProcessMatch(TechsetParserState* state, SequenceResult<SimpleParserValue>& result) const override
{
const auto& typeNameToken = result.NextCapture(CAPTURE_TYPE_NAME);
@ -34,7 +34,7 @@ namespace techset
}
};
class SequenceTechniqueName final : public Parser::sequence_t
class SequenceTechniqueName final : public TechsetParser::sequence_t
{
static constexpr auto CAPTURE_NAME = 1;
@ -53,7 +53,7 @@ namespace techset
}
protected:
void ProcessMatch(ParserState* state, SequenceResult<SimpleParserValue>& result) const override
void ProcessMatch(TechsetParserState* state, SequenceResult<SimpleParserValue>& result) const override
{
assert(!state->m_current_technique_types.empty());
@ -69,12 +69,12 @@ namespace techset
};
}
Parser::Parser(SimpleLexer* lexer, const char** validTechniqueTypeNames, const size_t validTechniqueTypeNameCount)
: AbstractParser(lexer, std::make_unique<ParserState>(validTechniqueTypeNames, validTechniqueTypeNameCount))
TechsetParser::TechsetParser(SimpleLexer* lexer, const char** validTechniqueTypeNames, const size_t validTechniqueTypeNameCount)
: AbstractParser(lexer, std::make_unique<TechsetParserState>(validTechniqueTypeNames, validTechniqueTypeNameCount))
{
}
const std::vector<Parser::sequence_t*>& Parser::GetTestsForState()
const std::vector<TechsetParser::sequence_t*>& TechsetParser::GetTestsForState()
{
static std::vector<sequence_t*> allTests({
new SequenceTechniqueTypeName(),
@ -87,7 +87,7 @@ const std::vector<Parser::sequence_t*>& Parser::GetTestsForState()
return m_state->m_current_technique_types.empty() ? techniqueTypeNameOnlyTests : allTests;
}
std::unique_ptr<TechsetDefinition> Parser::GetTechsetDefinition() const
std::unique_ptr<TechsetDefinition> TechsetParser::GetTechsetDefinition() const
{
return std::move(m_state->m_definition);
}