Skip to content

A
angle
Commit 8a17626d by Olli Etuaho Committed by Commit Bot
Options

Refactor: Return true when checks succeed in ParseContext

Instead of returning false when a check succeeds in ParseContext, return true. This is more intuitive and in line with conventions used elsewhere inside ANGLE. Also includes some minor other cleanup in ParseContext, like improved variable names and code structure especially when checking array element properties. This will make introducing arrays of arrays easier in the future. BUG=angleproject:911 TEST=angle_unittests Change-Id: I68233c01ccfbfef9529341af588f615efc2b503a Reviewed-on: https://chromium-review.googlesource.com/371238Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
parent 583c4d2a
Showing with 101 additions and 115 deletions
src/compiler/translator/ParseContext.cpp
......@@ -241,12 +241,8 @@ void TParseContext::checkPrecisionSpecified(const TSourceLoc &line,
}
}
//
// Both test and if necessary, spit out an error, to see if the node is really
// an l-value that can be operated on this way.
//
// Returns true if the was an error.
//
bool TParseContext::checkCanBeLValue(const TSourceLoc &line, const char *op, TIntermTyped *node)
{
TIntermSymbol *symNode = node->getAsSymbolNode();
......@@ -254,8 +250,6 @@ bool TParseContext::checkCanBeLValue(const TSourceLoc &line, const char *op, TIn
if (binaryNode)
{
bool errorReturn;
switch (binaryNode->getOp())
{
case EOpIndexDirect:
......@@ -264,35 +258,34 @@ bool TParseContext::checkCanBeLValue(const TSourceLoc &line, const char *op, TIn
case EOpIndexDirectInterfaceBlock:
return checkCanBeLValue(line, op, binaryNode->getLeft());
case EOpVectorSwizzle:
errorReturn = checkCanBeLValue(line, op, binaryNode->getLeft());
if (!errorReturn)
{
bool ok = checkCanBeLValue(line, op, binaryNode->getLeft());
if (ok)
{
int offset[4] = {0, 0, 0, 0};
int offsetCount[4] = {0, 0, 0, 0};
TIntermTyped *rightNode = binaryNode->getRight();
TIntermAggregate *aggrNode = rightNode->getAsAggregate();
TIntermAggregate *swizzleOffsets = binaryNode->getRight()->getAsAggregate();
for (TIntermSequence::iterator p = aggrNode->getSequence()->begin();
p != aggrNode->getSequence()->end(); p++)
for (const auto &offset : *swizzleOffsets->getSequence())
{
int value = (*p)->getAsTyped()->getAsConstantUnion()->getIConst(0);
offset[value]++;
if (offset[value] > 1)
int value = offset->getAsTyped()->getAsConstantUnion()->getIConst(0);
offsetCount[value]++;
if (offsetCount[value] > 1)
{
error(line, " l-value of swizzle cannot have duplicate components", op);
return true;
return false;
}
}
}
return errorReturn;
return ok;
}
default:
break;
}
error(line, " l-value required", op);
return true;
return false;
}
const char *symbol = 0;
......@@ -371,14 +364,14 @@ bool TParseContext::checkCanBeLValue(const TSourceLoc &line, const char *op, TIn
{
error(line, " l-value required", op);
return true;
return false;
}
//
// Everything else is okay, no error.
//
if (message == 0)
return false;
return true;
//
// If we get here, we have an error and a message.
......@@ -398,7 +391,7 @@ bool TParseContext::checkCanBeLValue(const TSourceLoc &line, const char *op, TIn
error(line, " l-value required", op, extraInfo.c_str());
}
return true;
return false;
}
// Both test, and if necessary spit out an error, to see if the node is really
......@@ -436,9 +429,6 @@ void TParseContext::checkIsAtGlobalLevel(const TSourceLoc &line, const char *tok
// which is when we are parsing built-ins.
// Also checks for "webgl_" and "_webgl_" reserved identifiers if parsing a
// webgl shader.
//
// Returns true if there was an error.
//
bool TParseContext::checkIsNotReserved(const TSourceLoc &line, const TString &identifier)
{
static const char *reservedErrMsg = "reserved built-in name";
......@@ -447,24 +437,24 @@ bool TParseContext::checkIsNotReserved(const TSourceLoc &line, const TString &id
if (identifier.compare(0, 3, "gl_") == 0)
{
error(line, reservedErrMsg, "gl_");
return true;
return false;
}
if (IsWebGLBasedSpec(mShaderSpec))
{
if (identifier.compare(0, 6, "webgl_") == 0)
{
error(line, reservedErrMsg, "webgl_");
return true;
return false;
}
if (identifier.compare(0, 7, "_webgl_") == 0)
{
error(line, reservedErrMsg, "_webgl_");
return true;
return false;
}
if (mShaderSpec == SH_CSS_SHADERS_SPEC && identifier.compare(0, 4, "css_") == 0)
{
error(line, reservedErrMsg, "css_");
return true;
return false;
}
}
if (identifier.find("__") != TString::npos)
......@@ -473,20 +463,16 @@ bool TParseContext::checkIsNotReserved(const TSourceLoc &line, const TString &id
"identifiers containing two consecutive underscores (__) are reserved as "
"possible future keywords",
identifier.c_str());
return true;
return false;
}
}
return false;
return true;
}
//
// Make sure there is enough data provided to the constructor to build
// something of the type of the constructor. Also returns the type of
// the constructor.
//
// Returns true if there was an error in construction.
//
bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
TIntermNode *argumentsNode,
const TFunction &function,
......@@ -544,14 +530,14 @@ bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
if (static_cast<size_t>(type.getArraySize()) != function.getParamCount())
{
error(line, "array constructor needs one argument per array element", "constructor");
return true;
return false;
}
}
if (arrayArg && op != EOpConstructStruct)
{
error(line, "constructing from a non-dereferenced array", "constructor");
return true;
return false;
}
if (matrixInMatrix && !type.isArray())
......@@ -560,14 +546,14 @@ bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
{
error(line, "constructing matrix from matrix can only take one argument",
"constructor");
return true;
return false;
}
}
if (overFull)
{
error(line, "too many arguments", "constructor");
return true;
return false;
}
if (op == EOpConstructStruct && !type.isArray() &&
......@@ -576,7 +562,7 @@ bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
error(line,
"Number of constructor parameters does not match the number of structure fields",
"constructor");
return true;
return false;
}
if (!type.isMatrix() || !matrixInMatrix)
......@@ -585,14 +571,14 @@ bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
(op == EOpConstructStruct && size < type.getObjectSize()))
{
error(line, "not enough data provided for construction", "constructor");
return true;
return false;
}
}
if (argumentsNode == nullptr)
{
error(line, "constructor does not have any arguments", "constructor");
return true;
return false;
}
TIntermAggregate *argumentsAgg = argumentsNode->getAsAggregate();
......@@ -603,12 +589,12 @@ bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
if (op != EOpConstructStruct && IsSampler(argTyped->getBasicType()))
{
error(line, "cannot convert a sampler", "constructor");
return true;
return false;
}
if (argTyped->getBasicType() == EbtVoid)
{
error(line, "cannot convert a void", "constructor");
return true;
return false;
}
}
......@@ -624,7 +610,7 @@ bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
if (!argType.sameElementType(type))
{
error(line, "Array constructor argument has an incorrect type", "Error");
return true;
return false;
}
}
}
......@@ -639,12 +625,12 @@ bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
{
error(line, "Structure constructor arguments do not match structure fields",
"Error");
return true;
return false;
}
}
}
return false;
return true;
}
// This function checks to see if a void variable has been declared and raise an error message for
......@@ -659,10 +645,10 @@ bool TParseContext::checkIsNonVoid(const TSourceLoc &line,
if (type == EbtVoid)
{
error(line, "illegal use of type 'void'", identifier.c_str());
return true;
return false;
}
return false;
return true;
}
// This function checks to see if the node (for the expression) contains a scalar boolean expression
......@@ -694,20 +680,18 @@ bool TParseContext::checkIsNotSampler(const TSourceLoc &line,
if (containsSampler(*pType.userDef))
{
error(line, reason, getBasicString(pType.type), "(structure contains a sampler)");
return true;
return false;
}
return false;
return true;
}
else if (IsSampler(pType.type))
{
error(line, reason, getBasicString(pType.type));
return true;
return false;
}
return false;
return true;
}
void TParseContext::checkDeclaratorLocationIsNotSpecified(const TSourceLoc &line,
......@@ -813,46 +797,55 @@ unsigned int TParseContext::checkIsValidArraySize(const TSourceLoc &line, TInter
}
// See if this qualifier can be an array.
//
// Returns true if there is an error.
//
bool TParseContext::checkIsValidQualifierForArray(const TSourceLoc &line, const TPublicType &type)
bool TParseContext::checkIsValidQualifierForArray(const TSourceLoc &line,
const TPublicType &elementQualifier)
{
if ((type.qualifier == EvqAttribute) || (type.qualifier == EvqVertexIn) ||
(type.qualifier == EvqConst && mShaderVersion < 300))
if ((elementQualifier.qualifier == EvqAttribute) ||
(elementQualifier.qualifier == EvqVertexIn) ||
(elementQualifier.qualifier == EvqConst && mShaderVersion < 300))
{
error(line, "cannot declare arrays of this qualifier",
TType(type).getCompleteString().c_str());
return true;
TType(elementQualifier).getQualifierString());
return false;
}
return false;
return true;
}
// See if this type can be an array.
//
// Returns true if there is an error.
//
bool TParseContext::checkIsValidTypeForArray(const TSourceLoc &line, const TPublicType &type)
// See if this element type can be formed into an array.
bool TParseContext::checkIsValidTypeForArray(const TSourceLoc &line, const TPublicType &elementType)
{
//
// Can the type be an array?
//
if (type.array)
if (elementType.array)
{
error(line, "cannot declare arrays of arrays", TType(type).getCompleteString().c_str());
return true;
error(line, "cannot declare arrays of arrays",
TType(elementType).getCompleteString().c_str());
return false;
}
// In ESSL1.00 shaders, structs cannot be varying (section 4.3.5). This is checked elsewhere.
// In ESSL3.00 shaders, struct inputs/outputs are allowed but not arrays of structs (section
// 4.3.4).
if (mShaderVersion >= 300 && type.type == EbtStruct && sh::IsVarying(type.qualifier))
if (mShaderVersion >= 300 && elementType.type == EbtStruct &&
sh::IsVarying(elementType.qualifier))
{
error(line, "cannot declare arrays of structs of this qualifier",
TType(type).getCompleteString().c_str());
return true;
TType(elementType).getCompleteString().c_str());
return false;
}
return true;
}
// Check if this qualified element type can be formed into an array.
bool TParseContext::checkIsValidTypeAndQualifierForArray(const TSourceLoc &indexLocation,
const TPublicType &elementType)
{
if (checkIsValidTypeForArray(indexLocation, elementType))
{
return checkIsValidQualifierForArray(indexLocation, elementType);
}
return false;
}
......@@ -911,7 +904,7 @@ bool TParseContext::declareVariable(const TSourceLoc &line,
{
if (TSymbol *builtInSymbol = symbolTable.findBuiltIn(identifier, mShaderVersion))
{
needsReservedCheck = checkCanUseExtension(line, builtInSymbol->getExtension());
needsReservedCheck = !checkCanUseExtension(line, builtInSymbol->getExtension());
}
}
else
......@@ -922,7 +915,7 @@ bool TParseContext::declareVariable(const TSourceLoc &line,
}
}
if (needsReservedCheck && checkIsNotReserved(line, identifier))
if (needsReservedCheck && !checkIsNotReserved(line, identifier))
return false;
(*variable) = new TVariable(&identifier, type);
......@@ -933,7 +926,7 @@ bool TParseContext::declareVariable(const TSourceLoc &line,
return false;
}
if (checkIsNonVoid(line, identifier, type.getBasicType()))
if (!checkIsNonVoid(line, identifier, type.getBasicType()))
return false;
return true;
......@@ -969,21 +962,21 @@ bool TParseContext::checkCanUseExtension(const TSourceLoc &line, const TString &
if (iter == extBehavior.end())
{
error(line, "extension", extension.c_str(), "is not supported");
return true;
return false;
}
// In GLSL ES, an extension's default behavior is "disable".
if (iter->second == EBhDisable || iter->second == EBhUndefined)
{
error(line, "extension", extension.c_str(), "is disabled");
return true;
return false;
}
if (iter->second == EBhWarn)
{
warning(line, "extension", extension.c_str(), "is being used");
return false;
return true;
}
return false;
return true;
}
// These checks are common for all declarations starting a declarator list, and declarators that
......@@ -1011,7 +1004,7 @@ void TParseContext::singleDeclarationErrorCheck(const TPublicType &publicType,
}
if (publicType.qualifier != EvqUniform &&
checkIsNotSampler(identifierLocation, publicType, "samplers must be uniform"))
!checkIsNotSampler(identifierLocation, publicType, "samplers must be uniform"))
{
return;
}
......@@ -1062,11 +1055,11 @@ bool TParseContext::checkWorkGroupSizeIsNotSpecified(const TSourceLoc &location,
{
error(location, "invalid layout qualifier:", getLocalSizeString(i),
"only valid when used with 'in' in a compute shader global layout declaration");
return true;
return false;
}
}
return false;
return true;
}
void TParseContext::functionCallLValueErrorCheck(const TFunction *fnCandidate,
......@@ -1078,7 +1071,7 @@ void TParseContext::functionCallLValueErrorCheck(const TFunction *fnCandidate,
if (qual == EvqOut || qual == EvqInOut)
{
TIntermTyped *argument = (*(fnCall->getSequence()))[i]->getAsTyped();
if (checkCanBeLValue(argument->getLine(), "assign", argument))
if (!checkCanBeLValue(argument->getLine(), "assign", argument))
{
error(argument->getLine(),
"Constant value cannot be passed for 'out' or 'inout' parameters.", "Error");
......@@ -1569,10 +1562,7 @@ TIntermAggregate *TParseContext::parseSingleArrayDeclaration(TPublicType &public
checkCanBeDeclaredWithoutInitializer(identifierLocation, identifier, &publicType);
if (!checkIsValidTypeForArray(indexLocation, publicType))
{
checkIsValidQualifierForArray(indexLocation, publicType);
}
checkIsValidTypeAndQualifierForArray(indexLocation, publicType);
TType arrayType(publicType);
......@@ -1628,10 +1618,7 @@ TIntermAggregate *TParseContext::parseSingleArrayInitDeclaration(
singleDeclarationErrorCheck(publicType, identifierLocation);
if (!checkIsValidTypeForArray(indexLocation, publicType))
{
checkIsValidQualifierForArray(indexLocation, publicType);
}
checkIsValidTypeAndQualifierForArray(indexLocation, publicType);
TPublicType arrayType(publicType);
......@@ -1740,8 +1727,7 @@ TIntermAggregate *TParseContext::parseArrayDeclarator(TPublicType &publicType,
checkCanBeDeclaredWithoutInitializer(identifierLocation, identifier, &publicType);
if (!checkIsValidTypeForArray(arrayLocation, publicType) &&
!checkIsValidQualifierForArray(arrayLocation, publicType))
if (checkIsValidTypeAndQualifierForArray(arrayLocation, publicType))
{
TType arrayType = TType(publicType);
unsigned int size = checkIsValidArraySize(arrayLocation, indexExpression);
......@@ -1818,10 +1804,7 @@ TIntermAggregate *TParseContext::parseArrayInitDeclarator(const TPublicType &pub
checkDeclaratorLocationIsNotSpecified(identifierLocation, publicType);
if (!checkIsValidTypeForArray(indexLocation, publicType))
{
checkIsValidQualifierForArray(indexLocation, publicType);
}
checkIsValidTypeAndQualifierForArray(indexLocation, publicType);
TPublicType arrayType(publicType);
......@@ -1926,7 +1909,7 @@ void TParseContext::parseGlobalLayoutQualifier(const TPublicType &typeQualifier)
else
{
if (checkWorkGroupSizeIsNotSpecified(typeQualifier.line, typeQualifier.layoutQualifier))
if (!checkWorkGroupSizeIsNotSpecified(typeQualifier.line, typeQualifier.layoutQualifier))
{
return;
}
......@@ -2288,7 +2271,7 @@ TIntermTyped *TParseContext::addConstructor(TIntermNode *arguments,
if (constType)
type.setQualifier(EvqConst);
if (checkConstructorArguments(line, arguments, *fnCall, op, type))
if (!checkConstructorArguments(line, arguments, *fnCall, op, type))
{
TIntermTyped *dummyNode = intermediate.setAggregateOperator(nullptr, op, line);
dummyNode->setType(type);
......@@ -2591,16 +2574,16 @@ const int kWebGLMaxStructNesting = 4;
} // namespace
bool TParseContext::structNestingErrorCheck(const TSourceLoc &line, const TField &field)
void TParseContext::checkIsBelowStructNestingLimit(const TSourceLoc &line, const TField &field)
{
if (!IsWebGLBasedSpec(mShaderSpec))
{
return false;
return;
}
if (field.type()->getBasicType() != EbtStruct)
{
return false;
return;
}
// We're already inside a structure definition at this point, so add
......@@ -2612,10 +2595,8 @@ bool TParseContext::structNestingErrorCheck(const TSourceLoc &line, const TField
<< " exceeds maximum allowed nesting level of " << kWebGLMaxStructNesting;
std::string reason = reasonStream.str();
error(line, reason.c_str(), field.name().c_str(), "");
return true;
return;
}
return false;
}
//
......@@ -3229,7 +3210,7 @@ TFieldList *TParseContext::addStructDeclaratorList(const TPublicType &typeSpecif
type->setStruct(typeSpecifier.userDef->getStruct());
}
structNestingErrorCheck(typeSpecifier.line, *(*fieldList)[i]);
checkIsBelowStructNestingLimit(typeSpecifier.line, *(*fieldList)[i]);
}
return fieldList;
......
src/compiler/translator/ParseContext.h
......@@ -130,6 +130,8 @@ class TParseContext : angle::NonCopyable
void unaryOpError(const TSourceLoc &line, const char *op, TString operand);
void binaryOpError(const TSourceLoc &line, const char *op, TString left, TString right);
// Check functions - the ones that return bool return false if an error was generated.
bool checkIsNotReserved(const TSourceLoc &line, const TString &identifier);
void checkPrecisionSpecified(const TSourceLoc &line, TPrecision precision, TBasicType type);
bool checkCanBeLValue(const TSourceLoc &line, const char *op, TIntermTyped *node);
......@@ -144,8 +146,8 @@ class TParseContext : angle::NonCopyable
// Returns a sanitized array size to use (the size is at least 1).
unsigned int checkIsValidArraySize(const TSourceLoc &line, TIntermTyped *expr);
bool checkIsValidQualifierForArray(const TSourceLoc &line, const TPublicType &type);
bool checkIsValidTypeForArray(const TSourceLoc &line, const TPublicType &type);
bool checkIsValidQualifierForArray(const TSourceLoc &line, const TPublicType &elementQualifier);
bool checkIsValidTypeForArray(const TSourceLoc &line, const TPublicType &elementType);
bool checkIsNonVoid(const TSourceLoc &line, const TString &identifier, const TBasicType &type);
void checkIsScalarBool(const TSourceLoc &line, const TIntermTyped *type);
void checkIsScalarBool(const TSourceLoc &line, const TPublicType &pType);
......@@ -322,7 +324,7 @@ class TParseContext : angle::NonCopyable
void enterStructDeclaration(const TSourceLoc &line, const TString &identifier);
void exitStructDeclaration();
bool structNestingErrorCheck(const TSourceLoc &line, const TField &field);
void checkIsBelowStructNestingLimit(const TSourceLoc &line, const TField &field);
TIntermSwitch *addSwitch(TIntermTyped *init, TIntermAggregate *statementList, const TSourceLoc &loc);
TIntermCase *addCase(TIntermTyped *condition, const TSourceLoc &loc);
......@@ -383,6 +385,9 @@ class TParseContext : angle::NonCopyable
const TString &identifier,
TPublicType *type);
bool checkIsValidTypeAndQualifierForArray(const TSourceLoc &indexLocation,
const TPublicType &elementType);
TIntermTyped *addBinaryMathInternal(
TOperator op, TIntermTyped *left, TIntermTyped *right, const TSourceLoc &loc);
TIntermTyped *createAssign(
......
src/compiler/translator/glslang.y
......@@ -1022,7 +1022,7 @@ type_specifier_no_prec
| type_specifier_nonarray LEFT_BRACKET constant_expression RIGHT_BRACKET {
$$ = $1;
if (!context->checkIsValidTypeForArray(@2, $1))
if (context->checkIsValidTypeForArray(@2, $1))
{
unsigned int size = context->checkIsValidArraySize(@2, $3);
$$.setArraySize(size);
......
src/compiler/translator/glslang_tab.cpp
......@@ -3768,7 +3768,7 @@ yyreduce:
{
(yyval.interm.type) = (yyvsp[-3].interm.type);
if (!context->checkIsValidTypeForArray((yylsp[-2]), (yyvsp[-3].interm.type)))
if (context->checkIsValidTypeForArray((yylsp[-2]), (yyvsp[-3].interm.type)))
{
unsigned int size = context->checkIsValidArraySize((yylsp[-2]), (yyvsp[-1].interm.intermTypedNode));
(yyval.interm.type).setArraySize(size);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment