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

ShaderLang: Improve lexer

This commit is contained in:
Jérôme Leclercq 2021-03-11 23:20:22 +01:00
parent da81a5b871
commit 5598487e87
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Nazara/Shader/ShaderLangLexer.cpp
View File

@ -100,6 +100,7 @@ namespace Nz::ShaderLang
{
if (Peek() == '>')
{
currentPos++;
tokenType = TokenType::FunctionReturn;
break;
}
@ -225,7 +226,10 @@ namespace Nz::ShaderLang
{
char next = Peek();
if (next == '[')
{
currentPos++;
tokenType = TokenType::OpenAttribute;
}
else
tokenType = TokenType::OpenSquareBracket;
@ -236,7 +240,10 @@ namespace Nz::ShaderLang
{
char next = Peek();
if (next == ']')
{
currentPos++;
tokenType = TokenType::ClosingAttribute;
}
else
tokenType = TokenType::ClosingSquareBracket;
@ -255,26 +262,28 @@ namespace Nz::ShaderLang
case '(': tokenType = TokenType::OpenParenthesis; break;
case ')': tokenType = TokenType::ClosingParenthesis; break;
default: break;
}
if (!tokenType)
{
if (IsAlphaNum(c))
default:
{
std::size_t start = currentPos;
while (IsAlphaNum(Peek()))
currentPos++;
std::string identifier(str.substr(start, currentPos - start + 1));
if (auto it = reservedKeywords.find(identifier); it == reservedKeywords.end())
if (IsAlphaNum(c))
{
tokenType = TokenType::Identifier;
token.data = std::move(identifier);
std::size_t start = currentPos;
while (IsAlphaNum(Peek()))
currentPos++;
std::string identifier(str.substr(start, currentPos - start + 1));
if (auto it = reservedKeywords.find(identifier); it == reservedKeywords.end())
{
tokenType = TokenType::Identifier;
token.data = std::move(identifier);
}
else
tokenType = it->second;
break;
}
else
tokenType = it->second;
throw UnrecognizedToken{};
}
}