sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shader/ShaderLangParser: small refactor

This commit is contained in:
Jérôme Leclercq 2022-03-02 13:15:12 +01:00
parent 99e07e6e1e
commit 0c3607579e
2 changed files with 53 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Nazara/Shader/ShaderLangParser.hpp
View File

@ -96,6 +96,7 @@ namespace Nz::ShaderLang
void ParseModuleStatement(std::vector<ShaderAst::ExprValue> attributes);
ShaderAst::StatementPtr ParseOptionDeclaration();
ShaderAst::StatementPtr ParseReturnStatement();
ShaderAst::StatementPtr ParseRootStatement(std::vector<ShaderAst::ExprValue> attributes = {});
ShaderAst::StatementPtr ParseSingleStatement();
ShaderAst::StatementPtr ParseStatement();
std::vector<ShaderAst::StatementPtr> ParseStatementList();

128
src/Nazara/Shader/ShaderLangParser.cpp
View File

@ -118,87 +118,16 @@ namespace Nz::ShaderLang
std::vector<ShaderAst::ExprValue> attributes;
auto EnsureModule = [this]() -> ShaderAst::Module&
for (;;)
{
ShaderAst::StatementPtr statement = ParseRootStatement();
if (!m_context->module)
throw UnexpectedToken{ "unexpected token before module declaration" };
return *m_context->module;
};
if (!statement)
break;
bool reachedEndOfStream = false;
while (!reachedEndOfStream)
{
const Token& nextToken = Peek();
switch (nextToken.type)
{
case TokenType::Const:
{
if (!attributes.empty())
throw UnexpectedToken{};
const auto& module = EnsureModule();
module.rootNode->statements.push_back(ParseConstStatement());
break;
}
case TokenType::EndOfStream:
if (!attributes.empty())
throw UnexpectedToken{};
reachedEndOfStream = true;
break;
case TokenType::External:
{
const auto& module = EnsureModule();
module.rootNode->statements.push_back(ParseExternalBlock(std::move(attributes)));
attributes.clear();
break;
}
case TokenType::OpenSquareBracket:
assert(attributes.empty());
attributes = ParseAttributes();
break;
case TokenType::Module:
if (attributes.empty())
throw UnexpectedToken{};
ParseModuleStatement(std::move(attributes));
attributes.clear();
break;
case TokenType::Option:
{
if (!attributes.empty())
throw UnexpectedToken{};
const auto& module = EnsureModule();
module.rootNode->statements.push_back(ParseOptionDeclaration());
break;
}
case TokenType::FunctionDeclaration:
{
const auto& module = EnsureModule();
module.rootNode->statements.push_back(ParseFunctionDeclaration(std::move(attributes)));
attributes.clear();
break;
}
case TokenType::Struct:
{
const auto& module = EnsureModule();
module.rootNode->statements.push_back(ParseStructDeclaration(std::move(attributes)));
attributes.clear();
break;
}
default:
throw UnexpectedToken{};
}
m_context->module->rootNode->statements.push_back(std::move(statement));
}
return std::move(context.module);
@ -739,6 +668,53 @@ namespace Nz::ShaderLang
return ShaderBuilder::Return(std::move(expr));
}
ShaderAst::StatementPtr Parser::ParseRootStatement(std::vector<ShaderAst::ExprValue> attributes)
{
const Token& nextToken = Peek();
switch (nextToken.type)
{
case TokenType::Const:
if (!attributes.empty())
throw UnexpectedToken{};
return ParseConstStatement();
case TokenType::EndOfStream:
if (!attributes.empty())
throw UnexpectedToken{};
return {};
case TokenType::External:
return ParseExternalBlock(std::move(attributes));
case TokenType::OpenSquareBracket:
assert(attributes.empty());
return ParseRootStatement(ParseAttributes());
case TokenType::Module:
ParseModuleStatement(std::move(attributes));
return ParseRootStatement();
case TokenType::Option:
{
if (!attributes.empty())
throw UnexpectedToken{};
return ParseOptionDeclaration();
}
case TokenType::FunctionDeclaration:
return ParseFunctionDeclaration(std::move(attributes));
case TokenType::Struct:
return ParseStructDeclaration(std::move(attributes));
default:
throw UnexpectedToken{};
}
}
ShaderAst::StatementPtr Parser::ParseSingleStatement()
{
std::vector<ShaderAst::ExprValue> attributes;