mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Prevent line count changes within conditional blocks (because of conditional includes or @foreach expansion) ruining line numbering.

Browse Source
This commit is contained in:
AnyOldName3 2017-11-21 16:53:12 +00:00
parent 0f6f097cf2
commit 166ba22072
1 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
components/shader/shadermanager.cpp
View File

@ -21,6 +21,44 @@ namespace Shader
mPath = path; mPath = path;
} }
bool addLineDirectivesAfterConditionalBlocks(std::string& source)
{
for (size_t position = 0; position < source.length(); )
{
size_t foundPos = source.find("#endif", position);
foundPos = std::min(foundPos, source.find("#elif", position));
foundPos = std::min(foundPos, source.find("#else", position));
if (foundPos == std::string::npos)
break;
foundPos = source.find_first_of("\n\r", foundPos);
foundPos = source.find_first_not_of("\n\r", foundPos);
size_t lineDirectivePosition = source.rfind("#line", foundPos);
int lineNumber;
if (lineDirectivePosition != std::string::npos)
{
size_t lineNumberStart = lineDirectivePosition + std::string("#line ").length();
size_t lineNumberEnd = source.find_first_not_of("0123456789", lineNumberStart);
std::string lineNumberString = source.substr(lineNumberStart, lineNumberEnd - lineNumberStart);
lineNumber = std::stoi(lineNumberString) - 1;
}
else
{
lineDirectivePosition = 0;
lineNumber = 1;
}
lineNumber += std::count(source.begin() + lineDirectivePosition, source.begin() + foundPos, '\n');
source.replace(foundPos, 0, "#line " + std::to_string(lineNumber) + "\n");
position = foundPos;
}
return true;
}
bool parseIncludes(boost::filesystem::path shaderPath, std::string& source) bool parseIncludes(boost::filesystem::path shaderPath, std::string& source)
{ {
boost::replace_all(source, "\r\n", "\n"); boost::replace_all(source, "\r\n", "\n");
@ -54,14 +92,30 @@ namespace Shader
std::stringstream buffer; std::stringstream buffer;
buffer << includeFstream.rdbuf(); buffer << includeFstream.rdbuf();
std::string stringRepresentation = buffer.str();
addLineDirectivesAfterConditionalBlocks(stringRepresentation);
// insert #line directives so we get correct line numbers in compiler errors // insert #line directives so we get correct line numbers in compiler errors
int includedFileNumber = fileNumber++; int includedFileNumber = fileNumber++;
int lineNumber = std::count(source.begin(), source.begin() + foundPos, '\n'); size_t lineDirectivePosition = source.rfind("#line", foundPos);
int lineNumber;
if (lineDirectivePosition != std::string::npos)
{
size_t lineNumberStart = lineDirectivePosition + std::string("#line ").length();
size_t lineNumberEnd = source.find_first_not_of("0123456789", lineNumberStart);
std::string lineNumberString = source.substr(lineNumberStart, lineNumberEnd - lineNumberStart);
lineNumber = std::stoi(lineNumberString) - 1;
}
else
{
lineDirectivePosition = 0;
lineNumber = 1;
}
lineNumber += std::count(source.begin() + lineDirectivePosition, source.begin() + foundPos, '\n');
std::stringstream toInsert; std::stringstream toInsert;
toInsert << "#line 0 " << includedFileNumber << "\n" << buffer.str() << "\n#line " << lineNumber << " 0\n"; toInsert << "#line 0 " << includedFileNumber << "\n" << stringRepresentation << "\n#line " << lineNumber << " 0\n";
source.replace(foundPos, (end-foundPos+1), toInsert.str()); source.replace(foundPos, (end-foundPos+1), toInsert.str());
@ -248,7 +302,7 @@ namespace Shader
// parse includes // parse includes
std::string source = buffer.str(); std::string source = buffer.str();
if (!parseIncludes(boost::filesystem::path(mPath), source)) if (!addLineDirectivesAfterConditionalBlocks(source) || !parseIncludes(boost::filesystem::path(mPath), source))
return NULL; return NULL;
templateIt = mShaderTemplates.insert(std::make_pair(shaderTemplate, source)).first; templateIt = mShaderTemplates.insert(std::make_pair(shaderTemplate, source)).first;