encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tint/reader/wgsl: Improve errors when parsing extensions 

If the extension name doesn't parse, then generate an error message that includes the list of possible values, and a suggestion if there was a close match.

Change-Id: I0eb2a682ca5a0717bb31d2716824663924ccd8f2
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/105324
Commit-Queue: Ben Clayton <bclayton@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
This commit is contained in:
Ben Clayton 2022-10-11 19:34:19 +00:00 committed by Dawn LUCI CQ
parent 760eee9e92
commit ecd7f7ee7f
2 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/tint/reader/wgsl/parser_impl.cc
View File

@ -371,40 +371,36 @@ Maybe<Void> ParserImpl::enable_directive() {
} }
// Match the extension name. // Match the extension name.
Expect<std::string> name = {""};
auto& t = peek(); auto& t = peek();
if (t.IsIdentifier()) { if (handle_error(t)) {
synchronized_ = true; // The token might itself be an error.
next(); return Failure::kErrored;
name = {t.to_str(), t.source()}; }
} else if (t.Is(Token::Type::kF16)) {
// `f16` is a valid extension name and also a keyword if (t.Is(Token::Type::kParenLeft)) {
synchronized_ = true;
next();
name = {"f16", t.source()};
} else if (t.Is(Token::Type::kParenLeft)) {
// A common error case is writing `enable(foo);` instead of `enable foo;`. // A common error case is writing `enable(foo);` instead of `enable foo;`.
synchronized_ = false; synchronized_ = false;
return add_error(t.source(), "enable directives don't take parenthesis"); return add_error(t.source(), "enable directives don't take parenthesis");
} else if (handle_error(t)) { }
// The token might itself be an error.
return Failure::kErrored; auto extension = ast::Extension::kInvalid;
if (t.Is(Token::Type::kF16)) {
// `f16` is a valid extension name and also a keyword
synchronized_ = true;
next();
extension = ast::Extension::kF16;
} else { } else {
// Failed to match an extension name. auto ext = expect_enum("extension", ast::ParseExtension, ast::kExtensionStrings);
synchronized_ = false; if (ext.errored) {
return add_error(t.source(), "invalid extension name"); return Failure::kErrored;
}
extension = ext.value;
} }
if (!expect("enable directive", Token::Type::kSemicolon)) { if (!expect("enable directive", Token::Type::kSemicolon)) {
return Failure::kErrored; return Failure::kErrored;
} }
builder_.AST().AddEnable(create<ast::Enable>(t.source(), extension));
auto extension = ast::ParseExtension(name.value);
if (extension == ast::Extension::kInvalid) {
return add_error(name.source, "unsupported extension: '" + name.value + "'");
}
builder_.AST().AddEnable(create<ast::Enable>(name.source, extension));
return kSuccess; return kSuccess;
}); });

25
src/tint/reader/wgsl/parser_impl_enable_directive_test.cc
View File

@ -61,7 +61,21 @@ TEST_F(EnableDirectiveTest, InvalidIdentifier) {
p->enable_directive(); p->enable_directive();
// Error when unknown extension found // Error when unknown extension found
EXPECT_TRUE(p->has_error()); EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(), "1:8: unsupported extension: 'NotAValidExtensionName'"); EXPECT_EQ(p->error(), R"(1:8: expected extension
Possible values: 'chromium_disable_uniformity_analysis', 'chromium_experimental_dp4a', 'chromium_experimental_push_constant', 'f16')");
auto program = p->program();
auto& ast = program.AST();
EXPECT_EQ(ast.Enables().Length(), 0u);
EXPECT_EQ(ast.GlobalDeclarations().Length(), 0u);
}
TEST_F(EnableDirectiveTest, InvalidIdentifierSuggest) {
auto p = parser("enable f15;");
p->enable_directive();
// Error when unknown extension found
EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(), R"(1:8: expected extension. Did you mean 'f16'?
Possible values: 'chromium_disable_uniformity_analysis', 'chromium_experimental_dp4a', 'chromium_experimental_push_constant', 'f16')");
auto program = p->program(); auto program = p->program();
auto& ast = program.AST(); auto& ast = program.AST();
EXPECT_EQ(ast.Enables().Length(), 0u); EXPECT_EQ(ast.Enables().Length(), 0u);
@ -108,7 +122,8 @@ TEST_F(EnableDirectiveTest, InvalidTokens) {
auto p = parser("enable <f16;"); auto p = parser("enable <f16;");
p->translation_unit(); p->translation_unit();
EXPECT_TRUE(p->has_error()); EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(), "1:8: invalid extension name"); EXPECT_EQ(p->error(), R"(1:8: expected extension
Possible values: 'chromium_disable_uniformity_analysis', 'chromium_experimental_dp4a', 'chromium_experimental_push_constant', 'f16')");
auto program = p->program(); auto program = p->program();
auto& ast = program.AST(); auto& ast = program.AST();
EXPECT_EQ(ast.Enables().Length(), 0u); EXPECT_EQ(ast.Enables().Length(), 0u);
@ -118,7 +133,8 @@ TEST_F(EnableDirectiveTest, InvalidTokens) {
auto p = parser("enable =;"); auto p = parser("enable =;");
p->translation_unit(); p->translation_unit();
EXPECT_TRUE(p->has_error()); EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(), "1:8: invalid extension name"); EXPECT_EQ(p->error(), R"(1:8: expected extension
Possible values: 'chromium_disable_uniformity_analysis', 'chromium_experimental_dp4a', 'chromium_experimental_push_constant', 'f16')");
auto program = p->program(); auto program = p->program();
auto& ast = program.AST(); auto& ast = program.AST();
EXPECT_EQ(ast.Enables().Length(), 0u); EXPECT_EQ(ast.Enables().Length(), 0u);
@ -128,7 +144,8 @@ TEST_F(EnableDirectiveTest, InvalidTokens) {
auto p = parser("enable vec4;"); auto p = parser("enable vec4;");
p->translation_unit(); p->translation_unit();
EXPECT_TRUE(p->has_error()); EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(), "1:8: invalid extension name"); EXPECT_EQ(p->error(), R"(1:8: expected extension
Possible values: 'chromium_disable_uniformity_analysis', 'chromium_experimental_dp4a', 'chromium_experimental_push_constant', 'f16')");
auto program = p->program(); auto program = p->program();
auto& ast = program.AST(); auto& ast = program.AST();
EXPECT_EQ(ast.Enables().Length(), 0u); EXPECT_EQ(ast.Enables().Length(), 0u);