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

reader/wgsl: Add deprecation warning for [[offset]] 

Bug: tint:626
Change-Id: I3e1074bbf104d73c3a2f71234ff7821d0481ad1a
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/47142
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
Ben Clayton 2021-04-08 18:11:27 +00:00 committed by Commit Bot service account
parent 571f2b7363
commit c76ec15b45
2 changed files with 134 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2964,6 +2964,9 @@ Maybe<ast::Decoration*> ParserImpl::decoration() {
} }
if (s == kOffsetDecoration) { if (s == kOffsetDecoration) {
deprecated(t.source(),
"[[offset]] has been replaced with [[size]] and [[align]]");
const char* use = "offset decoration"; const char* use = "offset decoration";
return expect_paren_block(use, [&]() -> Result { return expect_paren_block(use, [&]() -> Result {
auto val = expect_positive_sint(use); auto val = expect_positive_sint(use);

136
src/reader/wgsl/parser_impl_struct_member_decoration_test.cc
View File

@ -42,7 +42,10 @@ TEST_F(ParserImplTest, Decoration_Offset_MissingLeftParen) {
EXPECT_TRUE(deco.errored); EXPECT_TRUE(deco.errored);
EXPECT_EQ(deco.value, nullptr); EXPECT_EQ(deco.value, nullptr);
EXPECT_TRUE(p->has_error()); EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(), "1:8: expected '(' for offset decoration"); EXPECT_EQ(
p->error(),
R"(1:1: use of deprecated language feature: [[offset]] has been replaced with [[size]] and [[align]]
1:8: expected '(' for offset decoration)");
} }
TEST_F(ParserImplTest, Decoration_Offset_MissingRightParen) { TEST_F(ParserImplTest, Decoration_Offset_MissingRightParen) {
@ -52,7 +55,10 @@ TEST_F(ParserImplTest, Decoration_Offset_MissingRightParen) {
EXPECT_TRUE(deco.errored); EXPECT_TRUE(deco.errored);
EXPECT_EQ(deco.value, nullptr); EXPECT_EQ(deco.value, nullptr);
EXPECT_TRUE(p->has_error()); EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(), "1:9: expected ')' for offset decoration"); EXPECT_EQ(
p->error(),
R"(1:1: use of deprecated language feature: [[offset]] has been replaced with [[size]] and [[align]]
1:9: expected ')' for offset decoration)");
} }
TEST_F(ParserImplTest, Decoration_Offset_MissingValue) { TEST_F(ParserImplTest, Decoration_Offset_MissingValue) {
@ -62,8 +68,10 @@ TEST_F(ParserImplTest, Decoration_Offset_MissingValue) {
EXPECT_TRUE(deco.errored); EXPECT_TRUE(deco.errored);
EXPECT_EQ(deco.value, nullptr); EXPECT_EQ(deco.value, nullptr);
EXPECT_TRUE(p->has_error()); EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(), EXPECT_EQ(
"1:8: expected signed integer literal for offset decoration"); p->error(),
R"(1:1: use of deprecated language feature: [[offset]] has been replaced with [[size]] and [[align]]
1:8: expected signed integer literal for offset decoration)");
} }
TEST_F(ParserImplTest, Decoration_Offset_MissingInvalid) { TEST_F(ParserImplTest, Decoration_Offset_MissingInvalid) {
@ -73,8 +81,126 @@ TEST_F(ParserImplTest, Decoration_Offset_MissingInvalid) {
EXPECT_TRUE(deco.errored); EXPECT_TRUE(deco.errored);
EXPECT_EQ(deco.value, nullptr); EXPECT_EQ(deco.value, nullptr);
EXPECT_TRUE(p->has_error()); EXPECT_TRUE(p->has_error());
EXPECT_EQ(
p->error(),
R"(1:1: use of deprecated language feature: [[offset]] has been replaced with [[size]] and [[align]]
1:8: expected signed integer literal for offset decoration)");
}
TEST_F(ParserImplTest, Decoration_Size) {
auto p = parser("size(4)");
auto deco = p->decoration();
EXPECT_TRUE(deco.matched);
EXPECT_FALSE(deco.errored);
ASSERT_NE(deco.value, nullptr);
ASSERT_FALSE(p->has_error());
auto* member_deco = deco.value->As<ast::Decoration>();
ASSERT_NE(member_deco, nullptr);
ASSERT_TRUE(member_deco->Is<ast::StructMemberSizeDecoration>());
auto* o = member_deco->As<ast::StructMemberSizeDecoration>();
EXPECT_EQ(o->size(), 4u);
}
TEST_F(ParserImplTest, Decoration_Size_MissingLeftParen) {
auto p = parser("size 4)");
auto deco = p->decoration();
EXPECT_FALSE(deco.matched);
EXPECT_TRUE(deco.errored);
EXPECT_EQ(deco.value, nullptr);
EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(), "1:6: expected '(' for size decoration");
}
TEST_F(ParserImplTest, Decoration_Size_MissingRightParen) {
auto p = parser("size(4");
auto deco = p->decoration();
EXPECT_FALSE(deco.matched);
EXPECT_TRUE(deco.errored);
EXPECT_EQ(deco.value, nullptr);
EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(), "1:7: expected ')' for size decoration");
}
TEST_F(ParserImplTest, Decoration_Size_MissingValue) {
auto p = parser("size()");
auto deco = p->decoration();
EXPECT_FALSE(deco.matched);
EXPECT_TRUE(deco.errored);
EXPECT_EQ(deco.value, nullptr);
EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(), EXPECT_EQ(p->error(),
"1:8: expected signed integer literal for offset decoration"); "1:6: expected signed integer literal for size decoration");
}
TEST_F(ParserImplTest, Decoration_Size_MissingInvalid) {
auto p = parser("size(nan)");
auto deco = p->decoration();
EXPECT_FALSE(deco.matched);
EXPECT_TRUE(deco.errored);
EXPECT_EQ(deco.value, nullptr);
EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(),
"1:6: expected signed integer literal for size decoration");
}
TEST_F(ParserImplTest, Decoration_Align) {
auto p = parser("align(4)");
auto deco = p->decoration();
EXPECT_TRUE(deco.matched);
EXPECT_FALSE(deco.errored);
ASSERT_NE(deco.value, nullptr);
ASSERT_FALSE(p->has_error());
auto* member_deco = deco.value->As<ast::Decoration>();
ASSERT_NE(member_deco, nullptr);
ASSERT_TRUE(member_deco->Is<ast::StructMemberAlignDecoration>());
auto* o = member_deco->As<ast::StructMemberAlignDecoration>();
EXPECT_EQ(o->align(), 4u);
}
TEST_F(ParserImplTest, Decoration_Align_MissingLeftParen) {
auto p = parser("align 4)");
auto deco = p->decoration();
EXPECT_FALSE(deco.matched);
EXPECT_TRUE(deco.errored);
EXPECT_EQ(deco.value, nullptr);
EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(), "1:7: expected '(' for align decoration");
}
TEST_F(ParserImplTest, Decoration_Align_MissingRightParen) {
auto p = parser("align(4");
auto deco = p->decoration();
EXPECT_FALSE(deco.matched);
EXPECT_TRUE(deco.errored);
EXPECT_EQ(deco.value, nullptr);
EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(), "1:8: expected ')' for align decoration");
}
TEST_F(ParserImplTest, Decoration_Align_MissingValue) {
auto p = parser("align()");
auto deco = p->decoration();
EXPECT_FALSE(deco.matched);
EXPECT_TRUE(deco.errored);
EXPECT_EQ(deco.value, nullptr);
EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(),
"1:7: expected signed integer literal for align decoration");
}
TEST_F(ParserImplTest, Decoration_Align_MissingInvalid) {
auto p = parser("align(nan)");
auto deco = p->decoration();
EXPECT_FALSE(deco.matched);
EXPECT_TRUE(deco.errored);
EXPECT_EQ(deco.value, nullptr);
EXPECT_TRUE(p->has_error());
EXPECT_EQ(p->error(),
"1:7: expected signed integer literal for align decoration");
} }
} // namespace } // namespace