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

Change warning to error for use of double underscore.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@21765 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-05-29 22:40:31 +00:00
parent 8d00fd0e29
commit 0f359f0e35
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glslang/MachineIndependent/IntermTraverse.cpp
View File

@ -55,8 +55,9 @@
// //
void TIntermMethod::traverse(TIntermTraverser* it) void TIntermMethod::traverse(TIntermTraverser* it)
{ {
// TODO: functionality: current tree should always resolve all methods as constants // Tree should always resolve all methods as constants
// 4.3 will leave some length methods as methods
// TODO: 4.3 functionality: some .length() will stay as methods
} }
void TIntermSymbol::traverse(TIntermTraverser* it) void TIntermSymbol::traverse(TIntermTraverser* it)

9
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -452,14 +452,13 @@ bool TParseContext::reservedErrorCheck(int line, const TString& identifier)
if (!symbolTable.atBuiltInLevel()) { if (!symbolTable.atBuiltInLevel()) {
if (identifier.substr(0, 3) == TString("gl_")) { if (identifier.substr(0, 3) == TString("gl_")) {
error(line, "reserved built-in name", "gl_", ""); error(line, "reserved built-in name", "gl_", "");
return true; return true;
} }
if (identifier.find("__") != TString::npos) { if (identifier.find("__") != TString::npos) {
//error(line, "Two consecutive underscores are reserved for future use.", identifier.c_str(), "", ""); error(line, "Two consecutive underscores are reserved for future use.", identifier.c_str(), "", "");
//return true;
// TODO: semantics: make this an error return true;
infoSink.info.message(EPrefixWarning, "Two consecutive underscores are reserved for future use.", line);
return false;
} }
} }