Add semantic checks for order of qualification and repetition within a class of qualifiers.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22145 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-06-24 21:22:03 +00:00
parent f5c1075031
commit 01fc0645cb
9 changed files with 89 additions and 43 deletions

View file

@ -1487,7 +1487,7 @@ fully_specified_type
if ($2.arraySizes && parseContext.arrayQualifierError($2.line, $1))
$2.arraySizes = 0;
parseContext.mergeQualifiers($2.line, $2, $1, true);
parseContext.mergeQualifiers($2.line, $2.qualifier, $1.qualifier, true);
parseContext.precisionQualifierCheck($2.line, $2);
$$ = $2;
@ -1575,7 +1575,7 @@ type_qualifier
if ($$.basicType == EbtVoid)
$$.basicType = $2.basicType;
parseContext.mergeQualifiers($$.line, $$, $2, false);
parseContext.mergeQualifiers($$.line, $$.qualifier, $2.qualifier, false);
}
;
@ -2487,7 +2487,7 @@ struct_declaration
$$ = $3;
parseContext.voidErrorCheck($2.line, (*$3)[0].type->getFieldName(), $2);
parseContext.mergeQualifiers($2.line, $2, $1, true);
parseContext.mergeQualifiers($2.line, $2.qualifier, $1.qualifier, true);
parseContext.precisionQualifierCheck($2.line, $2);
for (unsigned int i = 0; i < $$->size(); ++i)