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

Remove StructMember::name().

Browse Source 
This CL removes the name accessor from the struct member. Usages have
been replaced with symbol usages.

Change-Id: Idd9c5b34f0b5503ffee84e0c82d69aa65b1df7ea
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/36820
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
This commit is contained in:
dan sinclair
2021-01-11 16:24:32 +00:00
committed by dan sinclair
parent e76a86a22c
commit eb737c25db
11 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ TEST_F(ParserImplTest, StructBodyDecl_Parses) {
ASSERT_EQ(m.value.size(), 1u);
const auto* mem = m.value[0];
EXPECT_EQ(mem->name(), "a");
EXPECT_EQ(mem->symbol(), p->get_module().RegisterSymbol("a"));
EXPECT_EQ(mem->type(), i32);
EXPECT_EQ(mem->decorations().size(), 0u);
}

18
src/reader/wgsl/parser_impl_struct_decl_test.cc
View File

@@ -41,8 +41,10 @@ struct S {
ASSERT_NE(s.value, nullptr);
ASSERT_EQ(s->symbol(), p->get_module().RegisterSymbol("S"));
ASSERT_EQ(s->impl()->members().size(), 2u);
EXPECT_EQ(s->impl()->members()[0]->name(), "a");
EXPECT_EQ(s->impl()->members()[1]->name(), "b");
EXPECT_EQ(s->impl()->members()[0]->symbol(),
p->get_module().RegisterSymbol("a"));
EXPECT_EQ(s->impl()->members()[1]->symbol(),
p->get_module().RegisterSymbol("b"));
}
TEST_F(ParserImplTest, StructDecl_ParsesWithDecoration) {
@@ -63,8 +65,10 @@ TEST_F(ParserImplTest, StructDecl_ParsesWithDecoration) {
ASSERT_NE(s.value, nullptr);
ASSERT_EQ(s->symbol(), p->get_module().RegisterSymbol("B"));
ASSERT_EQ(s->impl()->members().size(), 2u);
EXPECT_EQ(s->impl()->members()[0]->name(), "a");
EXPECT_EQ(s->impl()->members()[1]->name(), "b");
EXPECT_EQ(s->impl()->members()[0]->symbol(),
p->get_module().RegisterSymbol("a"));
EXPECT_EQ(s->impl()->members()[1]->symbol(),
p->get_module().RegisterSymbol("b"));
ASSERT_EQ(s->impl()->decorations().size(), 1u);
EXPECT_TRUE(s->impl()->decorations()[0]->Is<ast::StructBlockDecoration>());
}
@@ -88,8 +92,10 @@ TEST_F(ParserImplTest, StructDecl_ParsesWithMultipleDecoration) {
ASSERT_NE(s.value, nullptr);
ASSERT_EQ(s->symbol(), p->get_module().RegisterSymbol("S"));
ASSERT_EQ(s->impl()->members().size(), 2u);
EXPECT_EQ(s->impl()->members()[0]->name(), "a");
EXPECT_EQ(s->impl()->members()[1]->name(), "b");
EXPECT_EQ(s->impl()->members()[0]->symbol(),
p->get_module().RegisterSymbol("a"));
EXPECT_EQ(s->impl()->members()[1]->symbol(),
p->get_module().RegisterSymbol("b"));
ASSERT_EQ(s->impl()->decorations().size(), 2u);
EXPECT_TRUE(s->impl()->decorations()[0]->Is<ast::StructBlockDecoration>());
EXPECT_TRUE(s->impl()->decorations()[1]->Is<ast::StructBlockDecoration>());

6
src/reader/wgsl/parser_impl_struct_member_test.cc
View File

@@ -39,7 +39,7 @@ TEST_F(ParserImplTest, StructMember_Parses) {
ASSERT_FALSE(m.errored);
ASSERT_NE(m.value, nullptr);
EXPECT_EQ(m->name(), "a");
EXPECT_EQ(m->symbol(), p->get_module().RegisterSymbol("a"));
EXPECT_EQ(m->type(), i32);
EXPECT_EQ(m->decorations().size(), 0u);
@@ -65,7 +65,7 @@ TEST_F(ParserImplTest, StructMember_ParsesWithDecoration) {
ASSERT_FALSE(m.errored);
ASSERT_NE(m.value, nullptr);
EXPECT_EQ(m->name(), "a");
EXPECT_EQ(m->symbol(), p->get_module().RegisterSymbol("a"));
EXPECT_EQ(m->type(), i32);
EXPECT_EQ(m->decorations().size(), 1u);
EXPECT_TRUE(m->decorations()[0]->Is<ast::StructMemberOffsetDecoration>());
@@ -96,7 +96,7 @@ TEST_F(ParserImplTest, StructMember_ParsesWithMultipleDecorations) {
ASSERT_FALSE(m.errored);
ASSERT_NE(m.value, nullptr);
EXPECT_EQ(m->name(), "a");
EXPECT_EQ(m->symbol(), p->get_module().RegisterSymbol("a"));
EXPECT_EQ(m->type(), i32);
EXPECT_EQ(m->decorations().size(), 2u);
EXPECT_TRUE(m->decorations()[0]->Is<ast::StructMemberOffsetDecoration>());