BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor consistency fix: Define built-in functions to have bodies.

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23985 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-11-11 04:59:32 +00:00
parent a4351c55e8
commit 359326b866
5 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
glslang/MachineIndependent/ParseHelper.cpp
View file

@ -751,6 +751,9 @@ TFunction* TParseContext::handleFunctionDeclarator(TSourceLoc loc, TFunction& fu
}
}
// All built-in functions are defined, even though they don't have a body.
if (symbolTable.atBuiltInLevel())
function.setDefined();
if (! symbolTable.insert(function))
error(loc, "redeclaration of existing name", function.getName().c_str(), "");
@ -764,12 +767,10 @@ TFunction* TParseContext::handleFunctionDeclarator(TSourceLoc loc, TFunction& fu
}
//
// Handle seeing a function prototype in the grammar. This includes what may
// become a full definition, as a full definition looks like a prototype
// followed by a body. The body is handled after this function
// returns, when present.
// Handle seeing the function prototype in front of a function definition in the grammar.
// The body is handled after this function returns.
//
TIntermAggregate* TParseContext::handleFunctionPrototype(TSourceLoc loc, TFunction& function)
TIntermAggregate* TParseContext::handleFunctionDefinition(TSourceLoc loc, TFunction& function)
{
currentCaller = function.getMangledName();
TSymbol* symbol = symbolTable.find(function.getMangledName());
@ -777,23 +778,18 @@ TIntermAggregate* TParseContext::handleFunctionPrototype(TSourceLoc loc, TFuncti
if (! prevDec)
error(loc, "can't find function", function.getName().c_str(), "");
//
// Note: 'prevDec' could be 'function' if this is the first time we've seen function
// as it would have just been put in the symbol table. Otherwise, we're looking up
// an earlier occurance.
//
if (prevDec && prevDec->isDefined()) {
//
// Then this function already has a body.
//
error(loc, "function already has a body", function.getName().c_str(), "");
}
if (prevDec) {
if (prevDec && ! prevDec->isDefined()) {
prevDec->setDefined();
//
// Remember the return type for later checking for RETURN statements.
//
currentFunctionType = &(prevDec->getType());
} else
currentFunctionType = new TType(EbtVoid);