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

Shader: Fixes some errors and add unit tests

Browse Source
This commit is contained in:
SirLynix
2022-04-02 16:07:13 +02:00
parent 1c7a3a96e5
commit aa43db956c
5 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Nazara/Shader/ShaderLangErrors.cpp
View File

@@ -118,14 +118,14 @@ namespace Nz::ShaderLang
sourceFile = *m_sourceLocation.file;
if (m_sourceLocation.startLine != m_sourceLocation.endLine)
m_errorMessage = fmt::format("{}({} -> {},{} -> {}): {} error {}: {}", sourceFile, m_sourceLocation.startLine, m_sourceLocation.endLine, m_sourceLocation.startColumn, m_sourceLocation.endColumn, m_errorCategory, m_errorType, BuildErrorMessage());
m_errorMessage = fmt::format("{}({} -> {},{} -> {}): {} error: {}", sourceFile, m_sourceLocation.startLine, m_sourceLocation.endLine, m_sourceLocation.startColumn, m_sourceLocation.endColumn, m_errorType, BuildErrorMessage());
else if (m_sourceLocation.startColumn != m_sourceLocation.endColumn)
m_errorMessage = fmt::format("{}({},{} -> {}): {} error {}: {}", sourceFile, m_sourceLocation.startLine, m_sourceLocation.startColumn, m_sourceLocation.endColumn, m_errorCategory, m_errorType, BuildErrorMessage());
m_errorMessage = fmt::format("{}({},{} -> {}): {} error: {}", sourceFile, m_sourceLocation.startLine, m_sourceLocation.startColumn, m_sourceLocation.endColumn, m_errorType, BuildErrorMessage());
else
m_errorMessage = fmt::format("{}({}, {}): {} error {}: {}", sourceFile, m_sourceLocation.startLine, m_sourceLocation.startColumn, m_errorCategory, m_errorType, BuildErrorMessage());
m_errorMessage = fmt::format("{}({}, {}): {} error: {}", sourceFile, m_sourceLocation.startLine, m_sourceLocation.startColumn, m_errorType, BuildErrorMessage());
}
else
m_errorMessage = fmt::format("?: {} error {}: {}", m_errorCategory, m_errorType, BuildErrorMessage());
m_errorMessage = fmt::format("?: {} error: {}", m_errorType, BuildErrorMessage());
}
return m_errorMessage;

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

@@ -224,6 +224,7 @@ namespace Nz::ShaderLang
}
token.location.endColumn = SafeCast<UInt32>(currentPos - lastLineFeed) + 1;
token.location.endLine = currentLine;
if (floatingPoint)
{
@@ -244,17 +245,18 @@ namespace Nz::ShaderLang
{
tokenType = TokenType::IntegerValue;
// avoid std::string_view operator[] assertions (if &str[currentPos + 1] is out of the string)
const char* first = &str[start];
const char* last = first + (currentPos - start + 1);
long long value;
std::from_chars_result r = std::from_chars(&str[start], &str[currentPos + 1], value);
if (r.ptr != &str[currentPos + 1])
{
if (r.ec == std::errc::result_out_of_range)
throw LexerNumberOutOfRangeError{ token.location };
std::from_chars_result r = std::from_chars(first, last, value);
if (r.ptr == last && r.ec == std::errc{})
token.data = value;
else if (r.ec == std::errc::result_out_of_range)
throw LexerNumberOutOfRangeError{ token.location };
else
throw LexerBadNumberError{ token.location };
}
token.data = value;
}
break;
@@ -414,12 +416,13 @@ namespace Nz::ShaderLang
case '\n':
case '\r':
token.location.endColumn = SafeCast<UInt32>(currentPos - lastLineFeed) + 1;
token.location.endLine = currentLine;
throw LexerUnfinishedStringError{ token.location };
case '\\':
{
currentPos++;
char next = Peek();
char next = Peek(0);
switch (next)
{
case 'n': character = '\n'; break;
@@ -429,6 +432,7 @@ namespace Nz::ShaderLang
case '\\': character = '\\'; break;
default:
token.location.endColumn = SafeCast<UInt32>(currentPos - lastLineFeed) + 1;
token.location.endLine = currentLine;
throw LexerUnrecognizedCharError{ token.location };
}
break;
@@ -469,7 +473,11 @@ namespace Nz::ShaderLang
break;
}
else
{
token.location.endColumn = SafeCast<UInt32>(currentPos - lastLineFeed) + 1;
token.location.endLine = currentLine;
throw LexerUnrecognizedTokenError{ token.location };
}
}
}

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

@@ -285,7 +285,7 @@ namespace Nz::ShaderLang
}
if (!moduleVersion.has_value())
throw ParserMissingAttributeError{ moduleToken.location };
throw ParserMissingAttributeError{ moduleToken.location, ShaderAst::AttributeType::LangVersion };
if (!moduleId)
moduleId = Uuid::Generate();