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 Variable::name().

Browse Source 
This CL removes the name getter from the Variable class. All usages are
updated to use the symbol.

Change-Id: I3e4d86d2124d39023cad6113c62230c1757ece71
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/36780
Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
dan sinclair
2021-01-11 16:24:32 +00:00
committed by dan sinclair
parent 197a1b943d
commit 396b02342f
25 changed files with 128 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,8 +42,8 @@ TEST_F(ParserImplTest, FunctionDecl) {
EXPECT_TRUE(f->return_type()->Is<ast::type::Void>());
ASSERT_EQ(f->params().size(), 2u);
EXPECT_EQ(f->params()[0]->name(), "a");
EXPECT_EQ(f->params()[1]->name(), "b");
EXPECT_EQ(f->params()[0]->symbol(), p->get_module().RegisterSymbol("a"));
EXPECT_EQ(f->params()[1]->symbol(), p->get_module().RegisterSymbol("b"));
ASSERT_NE(f->return_type(), nullptr);
EXPECT_TRUE(f->return_type()->Is<ast::type::Void>());

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

@@ -33,8 +33,8 @@ TEST_F(ParserImplTest, FunctionHeader) {
EXPECT_EQ(f->name, "main");
ASSERT_EQ(f->params.size(), 2u);
EXPECT_EQ(f->params[0]->name(), "a");
EXPECT_EQ(f->params[1]->name(), "b");
EXPECT_EQ(f->params[0]->symbol(), p->get_module().RegisterSymbol("a"));
EXPECT_EQ(f->params[1]->symbol(), p->get_module().RegisterSymbol("b"));
EXPECT_TRUE(f->return_type->Is<ast::type::Void>());
}

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

@@ -33,7 +33,7 @@ TEST_F(ParserImplTest, GlobalConstantDecl) {
ASSERT_NE(e.value, nullptr);
EXPECT_TRUE(e->is_const());
EXPECT_EQ(e->name(), "a");
EXPECT_EQ(e->symbol(), p->get_module().RegisterSymbol("a"));
ASSERT_NE(e->type(), nullptr);
EXPECT_TRUE(e->type()->Is<ast::type::F32>());

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

@@ -38,7 +38,7 @@ TEST_F(ParserImplTest, GlobalDecl_GlobalVariable) {
ASSERT_EQ(m.global_variables().size(), 1u);
auto* v = m.global_variables()[0];
EXPECT_EQ(v->name(), "a");
EXPECT_EQ(v->symbol(), p->get_module().RegisterSymbol("a"));
}
TEST_F(ParserImplTest, GlobalDecl_GlobalVariable_Invalid) {
@@ -64,7 +64,7 @@ TEST_F(ParserImplTest, GlobalDecl_GlobalConstant) {
ASSERT_EQ(m.global_variables().size(), 1u);
auto* v = m.global_variables()[0];
EXPECT_EQ(v->name(), "a");
EXPECT_EQ(v->symbol(), p->get_module().RegisterSymbol("a"));
}
TEST_F(ParserImplTest, GlobalDecl_GlobalConstant_Invalid) {

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

@@ -36,7 +36,7 @@ TEST_F(ParserImplTest, GlobalVariableDecl_WithoutConstructor) {
EXPECT_FALSE(e.errored);
ASSERT_NE(e.value, nullptr);
EXPECT_EQ(e->name(), "a");
EXPECT_EQ(e->symbol(), p->get_module().RegisterSymbol("a"));
EXPECT_TRUE(e->type()->Is<ast::type::F32>());
EXPECT_EQ(e->storage_class(), ast::StorageClass::kOutput);
@@ -59,7 +59,7 @@ TEST_F(ParserImplTest, GlobalVariableDecl_WithConstructor) {
EXPECT_FALSE(e.errored);
ASSERT_NE(e.value, nullptr);
EXPECT_EQ(e->name(), "a");
EXPECT_EQ(e->symbol(), p->get_module().RegisterSymbol("a"));
EXPECT_TRUE(e->type()->Is<ast::type::F32>());
EXPECT_EQ(e->storage_class(), ast::StorageClass::kOutput);
@@ -84,7 +84,7 @@ TEST_F(ParserImplTest, GlobalVariableDecl_WithDecoration) {
EXPECT_FALSE(e.errored);
ASSERT_NE(e.value, nullptr);
EXPECT_EQ(e->name(), "a");
EXPECT_EQ(e->symbol(), p->get_module().RegisterSymbol("a"));
ASSERT_NE(e->type(), nullptr);
EXPECT_TRUE(e->type()->Is<ast::type::F32>());
EXPECT_EQ(e->storage_class(), ast::StorageClass::kOutput);
@@ -114,7 +114,7 @@ TEST_F(ParserImplTest, GlobalVariableDecl_WithDecoration_MulitpleGroups) {
EXPECT_FALSE(e.errored);
ASSERT_NE(e.value, nullptr);
EXPECT_EQ(e->name(), "a");
EXPECT_EQ(e->symbol(), p->get_module().RegisterSymbol("a"));
ASSERT_NE(e->type(), nullptr);
EXPECT_TRUE(e->type()->Is<ast::type::F32>());
EXPECT_EQ(e->storage_class(), ast::StorageClass::kOutput);

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

@@ -38,7 +38,7 @@ TEST_F(ParserImplTest, ParamList_Single) {
ASSERT_FALSE(e.errored);
EXPECT_EQ(e.value.size(), 1u);
EXPECT_EQ(e.value[0]->name(), "a");
EXPECT_EQ(e.value[0]->symbol(), p->get_module().RegisterSymbol("a"));
EXPECT_EQ(e.value[0]->type(), i32);
EXPECT_TRUE(e.value[0]->is_const());
@@ -61,7 +61,7 @@ TEST_F(ParserImplTest, ParamList_Multiple) {
ASSERT_FALSE(e.errored);
EXPECT_EQ(e.value.size(), 3u);
EXPECT_EQ(e.value[0]->name(), "a");
EXPECT_EQ(e.value[0]->symbol(), p->get_module().RegisterSymbol("a"));
EXPECT_EQ(e.value[0]->type(), i32);
EXPECT_TRUE(e.value[0]->is_const());
@@ -70,7 +70,7 @@ TEST_F(ParserImplTest, ParamList_Multiple) {
ASSERT_EQ(e.value[0]->source().range.end.line, 1u);
ASSERT_EQ(e.value[0]->source().range.end.column, 2u);
EXPECT_EQ(e.value[1]->name(), "b");
EXPECT_EQ(e.value[1]->symbol(), p->get_module().RegisterSymbol("b"));
EXPECT_EQ(e.value[1]->type(), f32);
EXPECT_TRUE(e.value[1]->is_const());
@@ -79,7 +79,7 @@ TEST_F(ParserImplTest, ParamList_Multiple) {
ASSERT_EQ(e.value[1]->source().range.end.line, 1u);
ASSERT_EQ(e.value[1]->source().range.end.column, 11u);
EXPECT_EQ(e.value[2]->name(), "c");
EXPECT_EQ(e.value[2]->symbol(), p->get_module().RegisterSymbol("c"));
EXPECT_EQ(e.value[2]->type(), vec2);
EXPECT_TRUE(e.value[2]->is_const());

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

@@ -32,7 +32,7 @@ TEST_F(ParserImplTest, VariableStmt_VariableDecl) {
ASSERT_NE(e.value, nullptr);
ASSERT_TRUE(e->Is<ast::VariableDeclStatement>());
ASSERT_NE(e->variable(), nullptr);
EXPECT_EQ(e->variable()->name(), "a");
EXPECT_EQ(e->variable()->symbol(), p->get_module().RegisterSymbol("a"));
ASSERT_EQ(e->source().range.begin.line, 1u);
ASSERT_EQ(e->source().range.begin.column, 5u);
@@ -51,7 +51,7 @@ TEST_F(ParserImplTest, VariableStmt_VariableDecl_WithInit) {
ASSERT_NE(e.value, nullptr);
ASSERT_TRUE(e->Is<ast::VariableDeclStatement>());
ASSERT_NE(e->variable(), nullptr);
EXPECT_EQ(e->variable()->name(), "a");
EXPECT_EQ(e->variable()->symbol(), p->get_module().RegisterSymbol("a"));
ASSERT_EQ(e->source().range.begin.line, 1u);
ASSERT_EQ(e->source().range.begin.column, 5u);