Encapsulate warnings like errors. Add warning for missing #version.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22041 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-06-17 21:47:23 +00:00
parent a622cf2dc5
commit c59d0cd9e6
6 changed files with 55 additions and 45 deletions

View file

@ -355,7 +355,7 @@ static int CPPelse(int matchelse, yystypepp * yylvalpp)
// found the #else we are looking for
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
if (token != '\n') {
ShPpWarningToInfoLog("unexpected tokens following #else preprocessor directive - expected a newline");
ShPpWarningToInfoLog("unexpected tokens following #else directive - expected a newline");
while (token != '\n')
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
}
@ -558,7 +558,7 @@ static int CPPif(yystypepp * yylvalpp)
}
token = eval(token, MIN_PREC, &res, &err, yylvalpp);
if (token != '\n') {
ShPpWarningToInfoLog("unexpected tokens following the preprocessor directive - expected a newline");
ShPpWarningToInfoLog("unexpected tokens following directive - expected a newline");
while (token != '\n')
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
}
@ -584,7 +584,7 @@ static int CPPifdef(int defined, yystypepp * yylvalpp)
Symbol *s = LookUpSymbol(macros, name);
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
if (token != '\n') {
ShPpWarningToInfoLog("unexpected tokens following #ifdef preprocessor directive - expected a newline");
ShPpWarningToInfoLog("unexpected tokens following #ifdef - expected a newline");
while (token != '\n')
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
}
@ -824,7 +824,7 @@ int readCPPline(yystypepp * yylvalpp)
}
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
if (token != '\n') {
ShPpWarningToInfoLog("unexpected tokens following #else preprocessor directive - expected a newline");
ShPpWarningToInfoLog("unexpected tokens following #else - expected a newline");
while (token != '\n')
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
}