ast: Rename UnaryOp::kDereference to kIndirection This is what it is (currently) called in the spec Bug: tint:727 Change-Id: Ie24f42499ed20c0c45ef4e9474bc6bb6a19bfa36 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/51181 Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: David Neto <dneto@google.com>
diff --git a/src/ast/unary_op.cc b/src/ast/unary_op.cc index 1b60c5c..3e36f08 100644 --- a/src/ast/unary_op.cc +++ b/src/ast/unary_op.cc
@@ -23,8 +23,8 @@ out << "address-of"; break; } - case UnaryOp::kDereference: { - out << "dereference"; + case UnaryOp::kIndirection: { + out << "indirection"; break; } case UnaryOp::kNegation: {
diff --git a/src/ast/unary_op.h b/src/ast/unary_op.h index f4352e6..c2c0801 100644 --- a/src/ast/unary_op.h +++ b/src/ast/unary_op.h
@@ -23,7 +23,7 @@ /// The unary op enum class UnaryOp { kAddressOf, // &EXPR - kDereference, // *EXPR + kIndirection, // *EXPR kNegation, // -EXPR kNot, // !EXPR };
diff --git a/src/reader/wgsl/parser_impl.cc b/src/reader/wgsl/parser_impl.cc index 88618fe..9398034 100644 --- a/src/reader/wgsl/parser_impl.cc +++ b/src/reader/wgsl/parser_impl.cc
@@ -2325,7 +2325,7 @@ } else if (match(Token::Type::kBang)) { op = ast::UnaryOp::kNot; } else if (match(Token::Type::kStar)) { - op = ast::UnaryOp::kDereference; + op = ast::UnaryOp::kIndirection; } else if (match(Token::Type::kAnd)) { op = ast::UnaryOp::kAddressOf; } else {
diff --git a/src/reader/wgsl/parser_impl_unary_expression_test.cc b/src/reader/wgsl/parser_impl_unary_expression_test.cc index 047060d..5490765 100644 --- a/src/reader/wgsl/parser_impl_unary_expression_test.cc +++ b/src/reader/wgsl/parser_impl_unary_expression_test.cc
@@ -85,7 +85,7 @@ ASSERT_TRUE(e->Is<ast::UnaryOpExpression>()); auto* u = e->As<ast::UnaryOpExpression>(); - EXPECT_EQ(u->op(), ast::UnaryOp::kDereference); + EXPECT_EQ(u->op(), ast::UnaryOp::kIndirection); EXPECT_TRUE(u->expr()->Is<ast::IdentifierExpression>()); } @@ -113,7 +113,7 @@ ASSERT_TRUE(e->Is<ast::UnaryOpExpression>()); auto* u = e->As<ast::UnaryOpExpression>(); - EXPECT_EQ(u->op(), ast::UnaryOp::kDereference); + EXPECT_EQ(u->op(), ast::UnaryOp::kIndirection); EXPECT_TRUE(u->expr()->Is<ast::MemberAccessorExpression>()); }
diff --git a/src/transform/hlsl.cc b/src/transform/hlsl.cc index 65ed1ca..c712e9c 100644 --- a/src/transform/hlsl.cc +++ b/src/transform/hlsl.cc
@@ -129,7 +129,7 @@ return; } } - ctx.dst->Func(ctx.dst->Symbols().New("tint_unused_entry_point"), {}, + ctx.dst->Func(ctx.dst->Symbols().New("unused_entry_point"), {}, ctx.dst->ty.void_(), {}, {ctx.dst->Stage(ast::PipelineStage::kCompute)}); }
diff --git a/src/transform/hlsl_test.cc b/src/transform/hlsl_test.cc index c144225..b49878f 100644 --- a/src/transform/hlsl_test.cc +++ b/src/transform/hlsl_test.cc
@@ -282,7 +282,7 @@ auto* expect = R"( [[stage(compute)]] -fn tint_unused_entry_point() { +fn unused_entry_point() { } )";
diff --git a/src/transform/spirv.cc b/src/transform/spirv.cc index b5db367..20bdf68 100644 --- a/src/transform/spirv.cc +++ b/src/transform/spirv.cc
@@ -285,7 +285,7 @@ return; } } - ctx.dst->Func("_tint_unused_entry_point", {}, ctx.dst->ty.void_(), {}, + ctx.dst->Func(ctx.dst->Sym("unused_entry_point"), {}, ctx.dst->ty.void_(), {}, {ctx.dst->Stage(ast::PipelineStage::kCompute)}); }
diff --git a/src/transform/spirv_test.cc b/src/transform/spirv_test.cc index ca1fe7d..a3ca841 100644 --- a/src/transform/spirv_test.cc +++ b/src/transform/spirv_test.cc
@@ -693,7 +693,7 @@ auto* expect = R"( [[stage(compute)]] -fn _tint_unused_entry_point() { +fn unused_entry_point() { } )";
diff --git a/src/writer/hlsl/generator_impl.cc b/src/writer/hlsl/generator_impl.cc index 7b7ce20..ce0a78b 100644 --- a/src/writer/hlsl/generator_impl.cc +++ b/src/writer/hlsl/generator_impl.cc
@@ -2599,7 +2599,7 @@ std::ostream& out, ast::UnaryOpExpression* expr) { switch (expr->op()) { - case ast::UnaryOp::kDereference: + case ast::UnaryOp::kIndirection: case ast::UnaryOp::kAddressOf: // TODO(crbug.com/tint/183) - support pointers return EmitExpression(pre, out, expr->expr());
diff --git a/src/writer/hlsl/generator_impl_unary_op_test.cc b/src/writer/hlsl/generator_impl_unary_op_test.cc index 97ea2a4..e6c6441 100644 --- a/src/writer/hlsl/generator_impl_unary_op_test.cc +++ b/src/writer/hlsl/generator_impl_unary_op_test.cc
@@ -46,7 +46,7 @@ HlslGeneratorImplTest_UnaryOp, HlslUnaryOpTest, testing::Values(UnaryOpData{"", ast::UnaryOp::kAddressOf}, - UnaryOpData{"", ast::UnaryOp::kDereference}, + UnaryOpData{"", ast::UnaryOp::kIndirection}, UnaryOpData{"!", ast::UnaryOp::kNot}, UnaryOpData{"-", ast::UnaryOp::kNegation}));
diff --git a/src/writer/msl/generator_impl.cc b/src/writer/msl/generator_impl.cc index 79296e5..aa47e1f 100644 --- a/src/writer/msl/generator_impl.cc +++ b/src/writer/msl/generator_impl.cc
@@ -2151,12 +2151,12 @@ bool GeneratorImpl::EmitUnaryOp(ast::UnaryOpExpression* expr) { switch (expr->op()) { - case ast::UnaryOp::kDereference: - out_ << "*"; - break; case ast::UnaryOp::kAddressOf: out_ << "&"; break; + case ast::UnaryOp::kIndirection: + out_ << "*"; + break; case ast::UnaryOp::kNot: out_ << "!"; break;
diff --git a/src/writer/msl/generator_impl_unary_op_test.cc b/src/writer/msl/generator_impl_unary_op_test.cc index 69e5ff4..e43f31b 100644 --- a/src/writer/msl/generator_impl_unary_op_test.cc +++ b/src/writer/msl/generator_impl_unary_op_test.cc
@@ -44,7 +44,7 @@ MslGeneratorImplTest, MslUnaryOpTest, testing::Values(UnaryOpData{"&", ast::UnaryOp::kAddressOf}, - UnaryOpData{"*", ast::UnaryOp::kDereference}, + UnaryOpData{"*", ast::UnaryOp::kIndirection}, UnaryOpData{"!", ast::UnaryOp::kNot}, UnaryOpData{"-", ast::UnaryOp::kNegation}));
diff --git a/src/writer/wgsl/generator_impl.cc b/src/writer/wgsl/generator_impl.cc index 7317829..a9607b2 100644 --- a/src/writer/wgsl/generator_impl.cc +++ b/src/writer/wgsl/generator_impl.cc
@@ -709,12 +709,12 @@ bool GeneratorImpl::EmitUnaryOp(ast::UnaryOpExpression* expr) { switch (expr->op()) { - case ast::UnaryOp::kDereference: - out_ << "*"; - break; case ast::UnaryOp::kAddressOf: out_ << "&"; break; + case ast::UnaryOp::kIndirection: + out_ << "*"; + break; case ast::UnaryOp::kNot: out_ << "!"; break;
diff --git a/src/writer/wgsl/generator_impl_unary_op_test.cc b/src/writer/wgsl/generator_impl_unary_op_test.cc index 42d3a9d..62eb7f5 100644 --- a/src/writer/wgsl/generator_impl_unary_op_test.cc +++ b/src/writer/wgsl/generator_impl_unary_op_test.cc
@@ -48,7 +48,7 @@ WgslGeneratorImplTest, WgslUnaryOpTest, testing::Values(UnaryOpData{"&", ast::UnaryOp::kAddressOf}, - UnaryOpData{"*", ast::UnaryOp::kDereference}, + UnaryOpData{"*", ast::UnaryOp::kIndirection}, UnaryOpData{"!", ast::UnaryOp::kNot}, UnaryOpData{"-", ast::UnaryOp::kNegation}));