mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PP: #include: add names to error messages, so that lexical analysis can be tested.

Browse Source
This commit is contained in:
John Kessenich
2017-01-05 12:18:34 -07:00
parent 64285c9e69
commit 28d3133581
5 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/Include/revision.h
View File

@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1742"
#define GLSLANG_REVISION "Overload400-PrecQual.1744"
#define GLSLANG_DATE "05-Jan-2017"

6
glslang/MachineIndependent/preprocessor/Pp.cpp
View File

@@ -596,9 +596,9 @@ int TPpContext::CPPinclude(TPpToken* ppToken)
token = scanToken(ppToken);
if (token != '\n') {
if (token == EndOfInput)
parseContext.ppError(ppToken->loc, "expected newline", "#include", "");
parseContext.ppError(ppToken->loc, "expected newline after header name:", "#include", "%s", filename.c_str());
else
parseContext.ppError(ppToken->loc, "extra content after header name", "#include", "");
parseContext.ppError(ppToken->loc, "extra content after header name:", "#include", "%s", filename.c_str());
} else {
TShader::Includer::IncludeResult* res = includer.include(filename.c_str(), includeType, currentSourceFile.c_str(), includeStack.size() + 1);
if (res && !res->file_name.empty()) {
@@ -619,7 +619,7 @@ int TPpContext::CPPinclude(TPpToken* ppToken)
std::string message =
res ? std::string(res->file_data, res->file_length)
: std::string("Could not process include directive");
parseContext.ppError(directiveLoc, message.c_str(), "#include", "");
parseContext.ppError(directiveLoc, message.c_str(), "#include", "for header name: %s", filename.c_str());
if (res) {
includer.releaseInclude(res);
}