encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-21 18:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename case statement conditions to selectors.

Browse Source 
The name conditions isn't quite correct for the case statement. This CL
updates the code to use selectors instead of conditions.

Change-Id: I98b8050b11e2328f97e4443469572ab47d7c1555
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/22520
Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
dan sinclair
2020-06-02 17:18:56 +00:00
committed by dan sinclair
parent cb48e79fa5
commit 1d69915155
9 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/reader/wgsl/parser_impl.cc
View File

@@ -1813,14 +1813,14 @@ std::unique_ptr<ast::CaseStatement> ParserImpl::switch_body() {
auto stmt = std::make_unique<ast::CaseStatement>();
stmt->set_source(source);
if (t.IsCase()) {
auto cond = case_selectors();
auto selectors = case_selectors();
if (has_error())
return nullptr;
if (cond.empty()) {
set_error(peek(), "unable to parse case conditional");
if (selectors.empty()) {
set_error(peek(), "unable to parse case selectors");
return nullptr;
}
stmt->set_conditions(std::move(cond));
stmt->set_selectors(std::move(selectors));
}
t = next();

2
src/reader/wgsl/parser_impl_statement_test.cc
View File

@@ -146,7 +146,7 @@ TEST_F(ParserImplTest, Statement_Switch_Invalid) {
auto e = p->statement();
ASSERT_TRUE(p->has_error());
ASSERT_EQ(e, nullptr);
EXPECT_EQ(p->error(), "1:18: unable to parse case conditional");
EXPECT_EQ(p->error(), "1:18: unable to parse case selectors");
}
TEST_F(ParserImplTest, Statement_Loop) {

4
src/reader/wgsl/parser_impl_switch_body_test.cc
View File

@@ -38,7 +38,7 @@ TEST_F(ParserImplTest, SwitchBody_Case_InvalidConstLiteral) {
auto e = p->switch_body();
ASSERT_TRUE(p->has_error());
ASSERT_EQ(e, nullptr);
EXPECT_EQ(p->error(), "1:6: unable to parse case conditional");
EXPECT_EQ(p->error(), "1:6: unable to parse case selectors");
}
TEST_F(ParserImplTest, SwitchBody_Case_MissingConstLiteral) {
@@ -46,7 +46,7 @@ TEST_F(ParserImplTest, SwitchBody_Case_MissingConstLiteral) {
auto e = p->switch_body();
ASSERT_TRUE(p->has_error());
ASSERT_EQ(e, nullptr);
EXPECT_EQ(p->error(), "1:5: unable to parse case conditional");
EXPECT_EQ(p->error(), "1:5: unable to parse case selectors");
}
TEST_F(ParserImplTest, SwitchBody_Case_MissingColon) {

2
src/reader/wgsl/parser_impl_switch_stmt_test.cc
View File

@@ -102,7 +102,7 @@ TEST_F(ParserImplTest, SwitchStmt_InvalidBody) {
auto e = p->switch_stmt();
ASSERT_TRUE(p->has_error());
ASSERT_EQ(e, nullptr);
EXPECT_EQ(p->error(), "2:7: unable to parse case conditional");
EXPECT_EQ(p->error(), "2:7: unable to parse case selectors");
}
} // namespace