AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Interface blocks no longer allow duplicate fields

Browse Source 
bug: skia:12793
Change-Id: Idccdab5ee8f1c7792bdfe98efd379d0199a65377
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/492397
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>
This commit is contained in:
Julia Lavrova 2022-01-07 10:18:31 -05:00 committed by SkCQ
parent fc5fc658c8
commit a856f40086
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/sksl/errors/MultipleFieldsInInterfaceBlocks.sksl
View File

@ -2,3 +2,6 @@ IB {
float f;
float f;
} ib;
IB1 { float f; };
IB2 { float f; };

17
src/sksl/SkSLDSLParser.cpp
View File

@ -902,6 +902,7 @@ bool DSLParser::interfaceBlock(const dsl::DSLModifiers& modifiers) {
}
this->nextToken();
SkTArray<dsl::Field> fields;
std::unordered_set<String> field_names;
while (!this->checkNext(Token::Kind::TK_RBRACE)) {
DSLModifiers fieldModifiers = this->modifiers();
skstd::optional<dsl::DSLType> type = this->type(&fieldModifiers);
@ -927,8 +928,20 @@ bool DSLParser::interfaceBlock(const dsl::DSLModifiers& modifiers) {
if (!this->expect(Token::Kind::TK_SEMICOLON, "';'")) {
return false;
}
fields.push_back(dsl::Field(fieldModifiers, std::move(actualType),
this->text(fieldName), this->position(fieldName)));
String key(this->text(fieldName));
if (field_names.find(key) == field_names.end()) {
fields.push_back(dsl::Field(fieldModifiers,
std::move(actualType),
this->text(fieldName),
this->position(fieldName)));
field_names.emplace(key);
} else {
this->error(typeName,
"field '" + key +
"' was already defined in the same interface block ('" +
this->text(typeName) + "')");
}
}
while (this->checkNext(Token::Kind::TK_COMMA));
}

8
tests/sksl/errors/MultipleFieldsInInterfaceBlocks.glsl
View File

@ -1,5 +1,5 @@
### Compilation failed:
IB {
float f;
float f;
} ib;
error: 1: field 'f' was already defined in the same interface block ('IB')
error: 7: symbol 'f' was already defined
2 errors